Changeset 6590 for trunk/gli/src/org/greenstone/gatherer/collection

Timestamp:

2004-01-22T16:19:34+13:00 (20 years ago)

Author:

jmt12

Message:

Started effecting the changes requested by Ian and David. So far I've removed the complex arguments, and have ensured that the path is correct for downloads without page requisites. I've also tried to get the workspace tree to update properly, and it is much closer than before but it is now temporarily displaying the same node twice.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/Job.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/Job.java

@@ -45 +45 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.WGet;
+import org.greenstone.gatherer.file.FileNode;
+import org.greenstone.gatherer.file.FileSystemModel;
+import org.greenstone.gatherer.file.WorkspaceTreeModel;
 import org.greenstone.gatherer.gui.GProgressBar;
 import org.greenstone.gatherer.util.GURL;
+import org.greenstone.gatherer.util.SynchronizedTreeModelTools;
 import org.greenstone.gatherer.util.Utility;
 /**
@@ -163 +167 @@
     ///ystem.out.println("addLink("+url+", "+type+")");
     if(!encountered_urls.contains(raw_url)) {
-                // Add it to the urls we've seen.
+        // Add it to the urls we've seen.
         encountered_urls.add(raw_url);
-                // Add it the to links for the current GURL.
-
-                // Add it to the progress file count.
+        // Add it the to links for the current GURL.
+
+        // Add it to the progress file count.
         progress.increaseFileCount();
         return true;
@@ -280 +284 @@
             }
         }
-        // If line contains "saved [<size>]" set currently 
+        // If line contains "/s) - `" set currently 
         // downloading url to "Download Complete".
-        else if(line.lastIndexOf(") - `") != -1) {
+        else if(line.lastIndexOf("/s) - `") != -1) {
+            String current_file_downloading = line.substring(line.indexOf("`") + 1, line.lastIndexOf("'"));
             if(!ignore_for_robots) {
+            System.err.println("Not ignore for robots");
             // Download complete
-            downloadComplete();
+            downloadComplete(current_file_downloading);
             }
             else {
+            System.err.println("Ignore for robots");
             ignore_for_robots = false;
             }
@@ -445 +452 @@
     public void downloadComplete() {
     progress.downloadComplete();
-    /* @todo
-       model.add(url.getURL(), destination);
-    */
+    url = null;
+    current_url = null;
+    }
+
+    public void downloadComplete(String current_file_downloading) {
+    progress.downloadComplete();
+    ///ystem.err.println("Current File: " + current_file_downloading);
+    //WorkspaceTreeModel.refreshWebCacheMappings();
+    if(Gatherer.g_man.collection_pane.workspace_tree != null) {
+        FileSystemModel tree_model = (FileSystemModel) Gatherer.g_man.collection_pane.workspace_tree.getModel();
+        File new_file = new File(current_file_downloading);
+        File parent_file = new_file.getParentFile();
+        String download_cache = Utility.getCacheDir().getAbsolutePath();
+        ArrayList raw_path = new ArrayList();
+        while(parent_file != null && !parent_file.getAbsolutePath().equals(download_cache)) {
+        raw_path.add(0, parent_file.getName());
+        parent_file = parent_file.getParentFile();
+        }
+        download_cache = null;
+        // Add download cache name 
+        /** @todo - add to dictionary */
+        raw_path.add(0, "Mirror Cache");
+        // And the root node
+        raw_path.add(0, tree_model.getRoot());
+        TreePath destination_path = new TreePath(raw_path.toArray());
+        raw_path = null;
+        // Retrieve the destination node
+        FileNode destination_node = (FileNode) tree_model.getNode(destination_path);
+        // destination_path = null;
+        FileNode new_file_node = new FileNode(new_file);
+        SynchronizedTreeModelTools.insertNodeInto(tree_model, destination_node, new_file_node);
+        System.err.println("Ready to insert new FileNode.");
+        System.err.println("Model:            " + tree_model);
+        System.err.println("Destination path: " + destination_path);
+        System.err.println("Destination node: " + destination_node);
+        System.err.println("New node:         " + new_file_node);
+
+        new_file_node = null;
+        destination_node = null;
+        tree_model = null;
+    }
     url = null;
     current_url = null;