FS path changes arising from post-PR669 discussion with Josh

components/blitz/resources/ome/services/blitz-repositories.xml

@@ -26,8 +26,10 @@
   </bean>
 
   <bean id="repositoryDao" class="ome.services.blitz.repo.RepositoryDaoImpl">
-    <constructor-arg ref="repoPrincipal"/>
-    <constructor-arg ref="executor"/>
+    <constructor-arg index="0" ref="repoPrincipal"/>
+    <constructor-arg index="1" ref="roles"/>
+    <constructor-arg index="2" ref="executor"/>
+    <constructor-arg index="3" ref="statefulExecutor"/>
   </bean>
 
   <bean id="processContainer" class="ome.services.blitz.repo.ProcessContainer">

components/blitz/src/ome/formats/importer/ImportCandidates.java

@@ -417,8 +417,9 @@ protected ImportContainer singleFile(File file, ImportConfig config)
                 String[] domains = reader.getReader().getDomains();
                 boolean isSPW = Arrays.asList(domains).contains(FormatTools.HCS_DOMAIN);
 
-                ImportContainer ic = new ImportContainer(file,
-                        null, null, format, usedFiles, isSPW);
+                final String readerClassName = reader.unwrap().getClass().getCanonicalName();
+                ImportContainer ic = new ImportContainer(file, null, null,
+                        readerClassName, usedFiles, isSPW);
                 ic.setDoThumbnails(config.doThumbnails.get());
                 String configImageName = config.userSpecifiedName.get();
                 if (configImageName == null)

components/blitz/src/ome/formats/importer/ImportContainer.java

@@ -27,9 +27,12 @@
 import static omero.rtypes.rstring;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 
+import ome.services.blitz.repo.path.ClientFilePathTransformer;
+import ome.services.blitz.repo.path.FsFile;
 import omero.grid.ImportSettings;
 import omero.model.Annotation;
 import omero.model.Fileset;
@@ -216,7 +219,8 @@ public void setUserPixels(Double[] userPixels)
         this.userPixels = userPixels;
     }
 
-    public void fillData(ImportConfig config, ImportSettings settings, Fileset fs) {
+    public void fillData(ImportConfig config, ImportSettings settings, Fileset fs, 
+            ClientFilePathTransformer sanitizer) throws IOException {
         // TODO: These should possible be a separate option like
         // ImportUserSettings rather than mis-using ImportContainer.
         settings.doThumbnails = rbool(getDoThumbnails());
@@ -238,10 +242,10 @@ public void fillData(ImportConfig config, ImportSettings settings, Fileset fs) {
         }
 
         // Fill used paths
-        FilesetEntry entry = null;
         for (String usedFile : getUsedFiles()) {
-            entry = new FilesetEntryI();
-            entry.setClientPath(rstring(usedFile));
+            final FilesetEntry entry = new FilesetEntryI();
+            final FsFile fsPath = sanitizer.getFsFileFromClientFile(new File(usedFile), Integer.MAX_VALUE);
+            entry.setClientPath(rstring(fsPath.toString()));
             fs.addFilesetEntry(entry);
         }
 

components/blitz/src/ome/formats/importer/ImportLibrary.java

@@ -36,6 +36,8 @@
 import ome.formats.OMEROMetadataStoreClient;
 import ome.formats.importer.util.ErrorHandler;
 import ome.formats.model.InstanceProvider;
+import ome.services.blitz.repo.path.ClientFilePathTransformer;
+import ome.services.blitz.repo.path.MakePathComponentSafe;
 import ome.util.Utils;
 
 import omero.ServerError;
@@ -85,6 +87,9 @@ public class ImportLibrary implements IObservable
     /** The class used to identify the screen target.*/
     private static final String SCREEN_CLASS = "omero.model.Screen";
 
+    private static final ClientFilePathTransformer sanitizer = 
+            new ClientFilePathTransformer(new MakePathComponentSafe());
+
     private final ArrayList<IObserver> observers = new ArrayList<IObserver>();
 
     private final OMEROMetadataStoreClient store;
@@ -197,9 +202,10 @@ public List<String> deleteFilesFromRepository(ImportContainer container)
     /**
      * Provide initial configuration to the server in order to create the
      * {@link ImportProcessPrx} which will manage state server-side.
+     * @throws IOException if the used files' absolute path could not be found
      */
     public ImportProcessPrx createImport(final ImportContainer container)
-        throws ServerError {
+        throws ServerError, IOException {
         checkManagedRepo();
         String[] usedFiles = container.getUsedFiles();
         File target = container.getFile();
@@ -213,7 +219,7 @@ public ImportProcessPrx createImport(final ImportContainer container)
 
         final ImportSettings settings = new ImportSettings();
         final Fileset fs = new FilesetI();
-        container.fillData(new ImportConfig(), settings, fs);
+        container.fillData(new ImportConfig(), settings, fs, sanitizer);
         return repo.importFileset(fs, settings);
 
     }

components/blitz/src/ome/services/blitz/repo/CheckedPath.java

@@ -43,7 +43,9 @@
  * a null {@link CheckedPath} object is passed into the constructor the caller
  * indicates that the path is the root path, hence {@link CheckedPath#isRoot}
  * will not be called.
- * @author m.t.b.carroll@dundee.ac.uk and others
+ * 
+ * @author josh at glencoesoftware.com
+ * @author m.t.b.carroll@dundee.ac.uk
  */
 public class CheckedPath {