r812 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro - Wikitty-commits

15 Apr 2011

Author: mfortun
Date: 2011-04-15 17:03:00 +0200 (Fri, 15 Apr 2011)
New Revision: 812

Url: http://nuiton.org/repositories/revision/wikitty/812

Log:
* remove unused method
* complete constructor with application config 

Modified:
   trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java
   trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java

Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java
===================================================================

--- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java	2011-04-15 12:50:48 UTC (rev 811)
+++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java	2011-04-15 15:03:00 UTC (rev 812)
@@ -24,23 +24,16 @@
  */
 package org.nuiton.wikitty.publication.synchro;
 
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Properties;
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.ApplicationConfig;
 import org.nuiton.util.ArgumentsParserException;
-import org.nuiton.util.CollectionUtil;
-import org.nuiton.util.FileUtil;
 import org.nuiton.wikitty.WikittyProxy;
-import org.nuiton.wikitty.WikittyService;
 import org.nuiton.wikitty.WikittyServiceFactory;
 import org.nuiton.wikitty.WikittyUtil;
 import org.nuiton.wikitty.entities.Wikitty;
@@ -49,7 +42,6 @@
 import org.nuiton.wikitty.publication.entities.WikittyPubData;
 import org.nuiton.wikitty.publication.entities.WikittyPubText;
 import org.nuiton.wikitty.search.Criteria;
-import org.nuiton.wikitty.search.PagedResult;
 import org.nuiton.wikitty.search.Search;
 
 /**

Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java
===================================================================
--- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java	2011-04-15 12:50:48 UTC (rev 811)
+++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java	2011-04-15 15:03:00 UTC (rev 812)
@@ -28,7 +28,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileReader;
-import java.io.FileWriter;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -74,18 +74,16 @@
 
     static public String META_CURRENT_LABEL = "current.label";
 
-    static public String META_SUFFIX_KEY_ID = "id";
-
-    static public String META_SUFFIX_KEY_CHECKSUM = "checksum";
-
     /*
      * in the WIKITTY_FILE_META_PROP ERTIES_FILE the keys for version are:
      * filename + META_SUFFIX_KEY_VERSION we save the id too because with this
      * solution un case of delete we can easily read the id and make operation
      * on the wikitty
      */
-    static public String META_SUFFIX_KEY_VERSION = "version";
+    static public String META_PREFIX_KEY_VERSION = "version.";
 
+    static public String META_PREFIX_KEY_CHECKSUM = "checksum.";
+
     static public String WIKITTY_FILE_META_PROPERTIES_FILE = "meta.properties";
 
     /*
@@ -94,12 +92,8 @@
      */
     static public String WIKITTY_ID_PROPERTIES_FILE = "ids.properties";
 
-    static public String WIKITTYPUBLICATION_PROPERTIES_FILE = "ws.properties";
-
     static public String PROPERTY_DIRECTORY = ".wp";
 
-    static public String DEFAULT_PROPERTY_NAME_SEP = ".";
-
     /**
      * Constructor with the working directory
      * 
@@ -107,12 +101,30 @@
      *            the home directory
      */
 
-
     public WikittyPublicationFileSystem(ApplicationConfig app) {
         /*
-         * TODO mfortun-2011-04-14 use application config to initialize
-         * correctly the attribut homeFile, recursion and label
+         * load informations from the application config to correctly initialize
+         * this
          */
+        try {
+            String url = app.getOption("wikitty.service.server.url");
+            URI uri = new URI(url);
+
+            this.label = uri.getFragment();
+
+            this.homeFile = new File(uri.getPath());
+
+            if (homeFile == null || !homeFile.exists()) {
+                File cur = FileUtil.getCurrentDirectory();
+                homeFile = new File(cur.getAbsolutePath());
+            }
+
+            this.recursion = app
+                    .getOptionAsBoolean(WikittyPublication.IS_RECURSION_OPTION);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public File getHomeFile() {
@@ -159,7 +171,7 @@
 
     @Override
     public String login(String login, String password) {
-       return "chausette";
+        return "chausette";
 
     }
 
@@ -260,6 +272,7 @@
                     path = path.replace(File.separator + File.separator,
                             File.separator + ".");
 
+                    File wikittyParenFile = new File(path);
                     // create the propertie directory if necessary
                     File propertieDirectory = new File(path + File.separator
                             + WikittyPublicationFileSystem.PROPERTY_DIRECTORY);
@@ -267,24 +280,7 @@
                             || !propertieDirectory.isDirectory()) {
                         propertieDirectory.mkdir();
                     }
-                    // load/create meta propertie file
-                    File propertieFile = new File(
-                            propertieDirectory.getCanonicalPath()
-                                    + File.separator
-                                    + WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE);
-                    if (!propertieFile.exists()) {
-                        propertieFile.createNewFile();
-                    }
 
-                    // load/create id propertie file
-                    File idPropertieFile = new File(
-                            propertieDirectory.getCanonicalPath()
-                                    + File.separator
-                                    + WikittyPublicationFileSystem.WIKITTY_ID_PROPERTIES_FILE);
-                    if (!idPropertieFile.exists()) {
-                        idPropertieFile.createNewFile();
-                    }
-
                     String name = "";
                     String extension = "";
 
@@ -329,30 +325,29 @@
                         String localMd5 = StringUtil.asHex(byt);
 
                         // load meta properties
-                        Properties metaProperties = new Properties();
-                        metaProperties.load(new FileReader(propertieFile));
+                        PropertiesExtended metaProperties = getWikittyPublicationProperties(
+                                wikittyParenFile,
+                                WIKITTY_FILE_META_PROPERTIES_FILE);
                         // update
                         metaProperties
                                 .setProperty(
                                         WikittyPublicationFileSystem.META_CURRENT_LABEL,
                                         ourDir);
 
-                        metaProperties.setProperty(name + "." + extension
-                                + ".version", w.getVersion());
-                        metaProperties.setProperty(name + "." + extension
-                                + ".id", w.getId());
-                        metaProperties.setProperty(name + "." + extension
-                                + ".checksum", localMd5);
+                        metaProperties.setProperty(META_PREFIX_KEY_VERSION
+                                + wikittyFile.getName(), w.getVersion());
+
+                        metaProperties.setProperty(META_PREFIX_KEY_CHECKSUM
+                                + wikittyFile.getName(), localMd5);
                         // save
-                        metaProperties.store(new FileWriter(propertieFile), "");
+                        metaProperties.store();
                         // load id properties
-                        Properties idProperties = new Properties();
-                        idProperties.load(new FileReader(idPropertieFile));
+                        PropertiesExtended idProperties = getWikittyPublicationProperties(
+                                wikittyParenFile, WIKITTY_ID_PROPERTIES_FILE);
                         // update
-                        idProperties.setProperty(w.getId(), name + "."
-                                + extension);
+                        idProperties.setProperty(w.getId(), wikittyFile.getName());
                         // save
-                        idProperties.store(new FileWriter(idPropertieFile), "");
+                        idProperties.store();
                     }
                 }
             }
@@ -470,17 +465,13 @@
                     String mimeType = mimeTypeForExtension(extension);
 
                     // load properties
-                    Properties props = new Properties();
-                    File propsFile = new File(
-                            path
-                                    + File.separator
-                                    + WikittyPublicationFileSystem.PROPERTY_DIRECTORY
-                                    + File.separator
-                                    + WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE);
-                    props.load(new FileReader(propsFile));
-                    // re set the id
-                    wikitty.setVersion(props.getProperty(completeName
-                            + WikittyPublicationFileSystem.META_SUFFIX_KEY_ID));
+                    File wikittyParentDir = new File(path);
+                    PropertiesExtended props = getWikittyPublicationProperties(
+                            wikittyParentDir, WIKITTY_FILE_META_PROPERTIES_FILE);
+                    // re set the version
+                    wikitty.setVersion(props
+                            .getProperty(WikittyPublicationFileSystem.META_PREFIX_KEY_VERSION
+                                    + completeName));
 
                     // set the current label
                     WikittyLabelHelper
@@ -547,13 +538,11 @@
 
                     // update
                     propsProperties
-                            .remove(fileName
-                                    + WikittyPublicationFileSystem.META_SUFFIX_KEY_CHECKSUM);
-                    propsProperties.remove(fileName
-                            + WikittyPublicationFileSystem.META_SUFFIX_KEY_ID);
+                            .remove(WikittyPublicationFileSystem.META_PREFIX_KEY_CHECKSUM
+                                    + fileName);
                     propsProperties
-                            .remove(fileName
-                                    + WikittyPublicationFileSystem.META_SUFFIX_KEY_VERSION);
+                            .remove(WikittyPublicationFileSystem.META_PREFIX_KEY_VERSION
+                                    + fileName);
 
                     // resave
                     propsProperties.store();
@@ -799,33 +788,7 @@
         return result;
     }
 
-    /**
-     * Method that create the list of file needed to commit, delete, update
-     * import. It harvest file in order to transform them into wikitties
-     * 
-     * @param starts
-     *            harvested directory
-     * @param recursivly
-     *            boolean id the directory have to be harvest
-     * @return list of harvested file
-     */
-    static public List<File> listFile(File starts, boolean recursivly) {
-        List<File> result = new ArrayList<File>();
-        if (!starts.isDirectory()) {
-            result.add(starts);
-        }
-        for (File child : starts.listFiles()) {
-            if (child.isDirectory() && recursivly
-                    && !child.getName().equals(PROPERTY_DIRECTORY)) {
-                // Directory don't have to be harvest
-                // result.add(child);
-                result.addAll(listFile(child, recursivly));
-            } else if (!child.isDirectory()) {
-                result.add(child);
-            }
-        }
-        return result;
-    }
+   
 
     /**
      * Method that create a list of the properties directory
@@ -855,44 +818,6 @@
 
     /**
      * 
-     * Use to search in the file system the directory that containt the .wp dir
-     * that containt the properties file for the wikitty service's adresse
-     * 
-     * @param start
-     * @return File the directory container of the master property file
-     * @throws Exception
-     */
-    static protected File searchWikittyPublicationHomeDir(File start)
-            throws Exception {
-
-        if (start != null && start.exists() && start.isDirectory()) {
-            // on va retourner le dossier .wp home
-
-            // method récursiv qui remonte dans les parents pour retrouver.
-
-            File propertyDirectory = new File(start.getCanonicalPath()
-                    + File.separator + PROPERTY_DIRECTORY);
-
-            if (propertyDirectory.exists()) {
-                File propertie = new File(propertyDirectory.getCanonicalPath()
-                        + File.separator + WIKITTYPUBLICATION_PROPERTIES_FILE);
-                if (propertie.exists()) {
-                    return propertyDirectory;
-                }
-            }
-
-            return searchWikittyPublicationHomeDir(start.getParentFile());
-        } else {
-            // Exception
-            /*
-             * TODO mfortun-2011-04-06 write/set the appropriate exception here
-             */
-            return null;
-        }
-    }
-
-    /**
-     * 
      * @param starts
      * @param recursivly
      * @return

    

r812 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro

mfortun＠users.nuiton.org

tags

participants (1)