Changeset 5317

Timestamp:

2003-08-28T12:36:27+12:00 (21 years ago)

Author:

jmt12

Message:

Rewrote how jobs were added, to prevent stupid queue job then change options caused indeterminate download state

File:

• trunk/gli/src/org/greenstone/gatherer/WGet.java (modified) (10 diffs)

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

@@ -38 +38 @@
 import java.awt.*;
 import java.io.*;
+import java.net.*;
 import java.util.*;
 import javax.swing.*;
@@ -43 +44 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.Job;
-import org.greenstone.gatherer.util.GURL;
 /** This class provides access to the functionality of the WGet program, either by calling it via a shell script or by the JNI. It maintains a queue of pending jobs, and the component for showing these tasks to the user.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -50 +50 @@
 public class WGet
     extends Thread {
+
     /** <i>true</i> if there is a task currently being carried out, <i>false</i> otherwise. */
     private boolean busy = false;
@@ -56 +57 @@
     /** <i>true</i> if successfully completed tasks should be automatically removed from the job queue. */
     private boolean remove_complete_jobs = true;
-    /** The panel that the task list will be shown it. */
+
+    private JPanel filler_pane = null;
+    /** The panel that the task list will be shown in. */
     private JPanel list_pane;
     /** The job currently underway. */
@@ -77 +80 @@
     job = null;
     job_queue = new Vector();
+    filler_pane = new JPanel();
     list_pane = new JPanel();
     list_pane.setLayout(new BoxLayout(list_pane, BoxLayout.Y_AXIS));
-    //list_pane.setLayout(new GridLayout(1,1));
+    //list_pane.setLayout(new GridLayout(height_count,1));
     list_scroll = new JScrollPane(list_pane);
     //list_scroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
@@ -173 +177 @@
     if(delete_me.hasSignalledStop()) {
         list_pane.remove(delete_me.getProgressBar());
+        job_queue.remove(delete_me);
+        // Unfortunately removing a task gets a bit more complicated as we have to resize the filler
+        list_pane.remove(filler_pane);
+        if(job_queue.size() > 0) {
+        Dimension progress_bar_size = delete_me.getProgressBar().getPreferredSize();
+        Dimension list_pane_size = list_pane.getSize();
+        int height = list_pane_size.height - (job_queue.size() * progress_bar_size.height);
+        progress_bar_size = null;
+        if(height > 0) {
+            filler_pane.setPreferredSize(new Dimension(list_pane_size.width, height));
+            list_pane.add(filler_pane);
+        }
+        list_pane_size = null;
+        }
         list_pane.updateUI();
-        job_queue.remove(delete_me);
     }
     else {
@@ -227 +244 @@
 
     /** Creates a new mirroring job on the queue given the target url and the destination (private, public). All other details are harvested from the config file, but these two must be  captured from the GUI's current state.
-      * @param url A <strong>GURL</strong> which points to the root url for the mirroring.
-      * @param model The <strong>GTreeModel</strong> that any new records should be added to.
-      * @param destination The destination file as a <strong>String</strong>.
+      * @param url a URL which points to the root url for the mirroring
+      * @param model the GTreeModel that any new records should be added to
+      * @param destination the destination file as a String
       * @see org.greenstone.gatherer.Configuration
       * @see org.greenstone.gatherer.Gatherer
@@ -236 +253 @@
       * @see org.greenstone.gatherer.util.GURL
       */
-    public void newJob(GURL url, TreeModel model, String destination) {
-    if(url.valid()) {
-                // Create the job and fill in the details from gatherer.config.
-        Gatherer.println("About to create a new job");
-        Job new_job = new Job(model, Gatherer.config.get("mirroring.overwrite", false), Gatherer.config.get("mirroring.debug", false), Gatherer.config.get("mirroring.no_parents", false), Gatherer.config.get("mirroring.other_hosts", false), Gatherer.config.get("mirroring.page_requisites", false), Gatherer.config.get("mirroring.quiet", false), url, Gatherer.config.getInt("mirroring.depth", false), destination, Gatherer.config.proxy_pass, Gatherer.config.proxy_user, this, simple);
-                // Add to job_queue job list.
-        job_queue.add(new_job);
-                // Now add it to the visual component, job list.
-        list_pane.add(new_job.getProgressBar());
-                //list_pane.setAlignmentX(Component.LEFT_ALIGNMENT);
-        list_pane.updateUI();
-        new_job = null;
-        synchronized(this) {
-        notify(); // Just incase its sleeping.
-        }
+    public void newJob(TreeModel model, boolean overwrite, boolean no_parents, boolean other_hosts, boolean page_requisites, URL url, int depth, String destination) {
+    // 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(!page_requisites) {
+        destination = destination + url.getHost();
+    }
+    Job new_job = new Job(model, overwrite, 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);
+    // Add to job_queue job list.
+    job_queue.add(new_job);
+    // Now add it to the visual component, job list.
+    list_pane.remove(filler_pane);
+    Dimension progress_bar_size = new_job.getProgressBar().getPreferredSize();
+    Dimension list_pane_size = list_pane.getSize();
+    int height = list_pane_size.height - (job_queue.size() * progress_bar_size.height);
+    progress_bar_size = null;
+    list_pane.add(new_job.getProgressBar());
+    if(height > 0) {
+        filler_pane.setPreferredSize(new Dimension(list_pane_size.width, height));
+        list_pane.add(filler_pane);
+    }
+    list_pane_size = null;
+    //list_pane.setAlignmentX(Component.LEFT_ALIGNMENT);
+    list_pane.updateUI();
+    new_job = null;
+    synchronized(this) {
+        notify(); // Just incase its sleeping.
     }
     }
@@ -287 +316 @@
         // If there are jobs job_queue and we have more room.
         if(job_queue.size() > 0) {
-        // Get the first job that isn't stopped.
-        for(Enumeration e = job_queue.elements(); e.hasMoreElements();) {
-            job = (Job) e.nextElement();
+        int index = 0;
+        while(index < job_queue.size()) {
+            // Get the first job that isn't stopped.
+            job = (Job) job_queue.get(index);
             if(job.getState() == Job.RUNNING) {
             Gatherer.println("Job " + job.toString() + " Begun.");
@@ -303 +333 @@
             busy = false;
             Gatherer.println("Job " + job.toString() + " complete.");
-                // And if the user has requested that complete jobs
-                // be removed, then remove it from the list.
-            if(remove_complete_jobs) {
-                deleteJob(job);
-            }
+            // And if the user has requested that complete jobs
+                // be removed, then remove it from the list.
+            deleteJob(job);
             job = null;
             }
+            index++;
         }
         }