Changeset 6590

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.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• WGet.java (modified) (1 diff)
• collection/Job.java (modified) (4 diffs)
• file/FileSystemModel.java (modified) (4 diffs)
• file/WorkspaceTreeModel.java (modified) (1 diff)
• gui/CollectionPane.java (modified) (2 diffs)
• gui/GProgressBar.java (modified) (1 diff)
• gui/MirrorPane.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/WGet.java

@@ -257 +257 @@
     // Create the job and fill in the details from gatherer.config.
     Gatherer.println("About to create a new job");
-    // If it was decided not to download page requisites, then create the destination by basing it on the given destination, but appending the url host. If page requisites is used then WGet will do this for us
+    // If it was decided not to download page requisites, then create the destination by basing it on the given destination, but appending the url host and paths. If page requisites is used then WGet will do this for us
     if(!page_requisites) {
-        destination = destination + url.getHost();
+        System.err.println("Initially destination: " + destination);
+        String almost_the_entire_path = url.getPath();
+        int index = -1;
+        if((index = almost_the_entire_path.lastIndexOf("/")) != -1) {
+        almost_the_entire_path = almost_the_entire_path.substring(0, index);
+        }
+        destination = destination + url.getHost() + almost_the_entire_path + "/";
+        System.err.println("Finale destination:    " + destination);
     }
     Job new_job = new Job(Gatherer.config.get("mirroring.debug", false), no_parents, other_hosts, page_requisites, Gatherer.config.get("mirroring.quiet", false), url, depth, destination, Gatherer.config.proxy_pass, Gatherer.config.proxy_user, this, simple);

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;

trunk/gli/src/org/greenstone/gatherer/file/FileSystemModel.java

@@ -58 +58 @@
     FileNode first_node = (FileNode)path.getPathComponent(0);
     if(current.equals(first_node)) {
-        ///atherer.println("First path component matches root node.");
+        Gatherer.println("First path component matches root node.");
         // For each path with this tree path
         for(int i = 1; current != null && i < path.getPathCount(); i++) {
         // Retrieve the stale path
-        FileNode stale_node = (FileNode) path.getPathComponent(i);
-        ///atherer.print("Searching for '" + stale_node + "': ");
+        Object stale_object = path.getPathComponent(i);
+        FileNode stale_node = null;
+        if(stale_object instanceof FileNode) {
+            stale_node = (FileNode) stale_object;
+        }
+        Gatherer.print("Searching for '" + stale_node + "': ");
         // Locate the fresh node by searching current's children. Remember to ensure that current is mapped.
         current.map();
@@ -71 +75 @@
         for(int j = 0; !found && j < current.getChildCount(); j++) {
             FileNode child_node = (FileNode) current.getChildAt(j);
-            ///atherer.print(child_node + " ");
-            if(stale_node.equals(child_node)) {
+            Gatherer.print(child_node + " ");
+            if((stale_node != null && stale_node.equals(child_node)) || stale_object.toString().equals(child_node.toString())) {
             found = true;
             current = child_node;
-            ///atherer.println("Found!");
+            Gatherer.println("Found!");
             }
             child_node = null;
@@ -82 +86 @@
         for(int j = 0; !found && j < current.size(); j++) {
             FileNode child_node = (FileNode) current.get(j);
-            ///atherer.print(child_node + " ");
-            if(stale_node.equals(child_node)) {
+            Gatherer.print(child_node + " ");
+            if((stale_node != null && stale_node.equals(child_node)) || stale_object.toString().equals(child_node.toString())) {
             found = true;
             current = child_node;
-            ///atherer.println("Found!");
+            Gatherer.println("Found!");
             }
             child_node = null;
@@ -93 +97 @@
         if(!found) {
             current = null;
-            ///atherer.println("Not Found!");
+            Gatherer.println("Not Found!");
         }
         // Repeat as necessary
         }
     }
-    ///atherer.println("Returning node: " + new TreePath(current.getPath()));
+    Gatherer.println("Returning node: " + new TreePath(current.getPath()));
     return current;
     }

trunk/gli/src/org/greenstone/gatherer/file/WorkspaceTreeModel.java

@@ -91 +91 @@
 
     loadWebCacheMappings();
+        
     }
 

trunk/gli/src/org/greenstone/gatherer/gui/CollectionPane.java

@@ -73 +73 @@
     /** The tree showing the files within the collection. */
     private DragTree collection_tree         =  null;
-    /** The tree showing the available source workspace. */
-    private WorkspaceTree workspace_tree     =  null;
     /** The threaded queue that handles the actually movement of files, so that the gui remains responsive. */
     private FileQueue file_queue          =  null;
@@ -127 +125 @@
     /** The initial size of the trees. */
     static private Dimension TREE_SIZE   = new Dimension(400, 430);
+
+    /** The tree showing the available source workspace. */
+    public WorkspaceTree workspace_tree  =  null;
 
     /* Constructor.

trunk/gli/src/org/greenstone/gatherer/gui/GProgressBar.java

@@ -254 +254 @@
     }
     progress.setValue(progress.getMaximum());
-    Dictionary.setText(progress, "Mirroring.Job.Mirror_Complete");
+    /** @todo - put into dictionary */
+    progress.setString("Mirroring.Job.Mirror_Complete");
+    //Dictionary.setText(progress, "Mirroring.Job.Mirror_Complete");
 
     action.setIcon(Utility.getImage("vcrfastforward.gif"));

trunk/gli/src/org/greenstone/gatherer/gui/MirrorPane.java

@@ -136 +136 @@
     url_pane.add(url_textfield, BorderLayout.CENTER);
 
-    depth_pane.setLayout(new BorderLayout());
-    depth_pane.add(depth_label, BorderLayout.CENTER);
-    depth_pane.add(depth_combobox, BorderLayout.EAST);
+    depth_pane.setLayout(new GridLayout(1,3));
+    depth_pane.add(depth_label);
+    depth_pane.add(new JPanel());
+    depth_pane.add(depth_combobox);
 
     details_pane.setLayout(new GridLayout(6,1,0,5));