Changeset 3564

Timestamp:

Jul 17, 2007, 11:28:22 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #675, #676 and #677

File:

• trunk/src/core/net/sf/basedb/util/AutoDetectFileFormat.java (modified) (2 diffs)

trunk/src/core/net/sf/basedb/util/AutoDetectFileFormat.java

@@ -91 +91 @@
     Map<PluginDefinition, List<PluginConfiguration>> plugins = 
       new LinkedHashMap<PluginDefinition, List<PluginConfiguration>>();
-      
+    
     List<PluginDefinition> pluginDefs = null;
     if (pluginDef == null)
@@ -108 +108 @@
     for (PluginDefinition plugin : pluginDefs)
     {
-      ItemQuery<PluginConfiguration> configQuery = plugin.getPluginConfigurations();
-      configQuery.order(Orders.asc(Hql.property("name")));
-      configQuery.include(Include.MINE, Include.SHARED, Include.IN_PROJECT, Include.OTHERS);
-
       List<PluginConfiguration> configs = new LinkedList<PluginConfiguration>();
-      for (PluginConfiguration config : configQuery.list(dc))
+      if (!plugin.requiresConfiguration())
       {
-        AutoDetectingImporter importer = plugin.newInstance(AutoDetectingImporter.class,
-          null, sc, config, null);
-        if (currentItem == null || ((InteractivePlugin)importer).isInContext(context, currentItem) == null)
+        if (checkImportable(sc, plugin, null, file, context, currentItem))
         {
-          InputStream in = file.getDownloadStream(0);
-          if (importer.isImportable(in))
+          configs.add(null);
+        }
+      }
+      if (plugin.supportsConfigurations())
+      {
+        ItemQuery<PluginConfiguration> configQuery = plugin.getPluginConfigurations();
+        configQuery.order(Orders.asc(Hql.property("name")));
+        configQuery.include(Include.MINE, Include.SHARED, Include.IN_PROJECT, Include.OTHERS);
+        for (PluginConfiguration config : configQuery.list(dc))
+        {
+          if (checkImportable(sc, plugin, config, file, context, currentItem))
           {
             configs.add(config);
           }
+        }
+      }
+      if (configs.size() > 0) plugins.put(plugin, configs);
+    }
+    return plugins;
+  }
+  
+  private static boolean checkImportable(SessionControl sc, PluginDefinition plugin, 
+    PluginConfiguration config, File file, GuiContext context, Object currentItem)
+  {
+    AutoDetectingImporter importer = null;
+    boolean canBeUsed = false;
+    try
+    {
+      importer = plugin.newInstance(AutoDetectingImporter.class, null, sc, config, null);
+      boolean isInContext = true;
+      if (plugin.isInteractive())
+      {
+        try
+        {
+          InteractivePlugin ip = (InteractivePlugin)importer;
+          isInContext = ip.isInContext(context, currentItem) == null;
+        }
+        catch (Throwable t)
+        {
+          isInContext = false;
+        }
+      }
+      if (isInContext)
+      {
+        InputStream in = file.getDownloadStream(0);
+        try
+        {
+          canBeUsed = importer.isImportable(in);
+        }
+        catch (Throwable t)
+        {
+          canBeUsed = false;
+        }
+        finally
+        {
           try
           {
             in.close();
           }
-          catch (Exception ex)
+          catch (Throwable t)
           {}
         }
-      }
-      if (configs.size() > 0)
-      {
-        plugins.put(plugin, configs);
-      }
-      else
-      {
-        AutoDetectingImporter importer = plugin.newInstance(AutoDetectingImporter.class,
-          null, sc, null, null);
-        if (currentItem == null || ((InteractivePlugin)importer).isInContext(context, currentItem) == null)
-        {
-          InputStream in = file.getDownloadStream(0);
-          if (importer.isImportable(in))
-          {
-            plugins.put(plugin, null);
-          }
-          try
-          {
-            in.close();
-          }
-          catch (Exception ex)
-          {}
-        }
-      }
+      }     
     }
-    return plugins;
+    finally
+    {
+      if (importer != null) importer.done();
+    }
+    return canBeUsed;
   }
+  
 }