Changeset 5319

Timestamp:

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

Author:

jmt12

Message:

Rewrote to match WGet, and also debugged proxy problems. Also fixed difference between page requisite destination folders

File:

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

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

@@ -38 +38 @@
 import java.awt.event.*;
 import java.io.*;
+import java.net.*;
 import java.util.*;
 import javax.swing.tree.*;
@@ -88 +89 @@
     /**
      */
-    public Job(TreeModel model, boolean clobber, boolean debug, boolean no_parents, boolean other_hosts, boolean page_requisites, boolean quiet, GURL initial, int depth, String destination, String proxy_pass, String proxy_user, WGet mummy, boolean simple) {
+    public Job(TreeModel model, boolean clobber, boolean debug, boolean no_parents, boolean other_hosts, boolean page_requisites, boolean quiet, URL initial, int depth, String destination, String proxy_pass, String proxy_user, WGet mummy, boolean simple) {
     this.model = model;
 
@@ -97 +98 @@
     this.page_requisites = page_requisites;
     this.quiet = quiet;
-    this.initial = initial;
+    this.initial = new GURL(initial);
     this.depth = depth;
     this.destination = destination;
@@ -208 +209 @@
     }
 
-    if(proxy_user != null) {
-        command = command + "--proxy-user=" + proxy_user 
-        + " --proxy-passwd=" + proxy_pass + " ";
+    // Determine if we have to use a proxy.
+    if(Gatherer.config.get("general.use_proxy", true)) {
+        String proxy_host = Gatherer.config.getString("general.proxy_host", true);
+        String proxy_port = Gatherer.config.getString("general.proxy_port", true);
+        // Find out whether the user has already authenticated themselves
+        String user_pass = null;
+        String address = proxy_host + ":" + proxy_port;
+        System.err.println("Searching for authentication for: " + address);
+        int count = 0;
+        while(count < 3 && (user_pass = (String) Gatherer.authentications.get(address)) == null) {
+        Authenticator.requestPasswordAuthentication(proxy_host, null, Integer.parseInt(proxy_port), "http://", Gatherer.dictionary.get("WGet.Prompt"), "HTTP");
+        count++;
+        }
+        if(count >= 3) {
+        state = STOPPED;
+        return;
+        }
+        System.err.println("login@pass: " + user_pass);
+        if(user_pass.indexOf("@") != -1) {
+        // Write the use proxy command
+        command = command + "-e httpproxy=" + proxy_host + ":" + proxy_port + "/ --proxy-user=" + user_pass.substring(0, user_pass.indexOf("@")) + " --proxy-passwd=" + user_pass.substring(user_pass.indexOf("@") + 1) + " -Y on ";
+
+        }
+        else {
+        Gatherer.println("Unknown user/pass");
+        }
     }
           
@@ -225 +249 @@
 
     if(previous_state == Job.COMPLETE) {
-        progress.mirrorBegun(true);
+        progress.mirrorBegun(true, true);
     }
     else {
-        progress.mirrorBegun(false);
+        progress.mirrorBegun(false, true);
     }         
 
@@ -258 +282 @@
             if(!ignore_for_robots) {
             // Add download
-            String new_url = 
-                line.substring(line.indexOf("`") + 1,
-                       line.lastIndexOf("'"));
+            String new_url = line.substring(line.indexOf("`") + 1, line.lastIndexOf("'"));
             // Remove the destination guff
             if(destination != null) {
@@ -291 +313 @@
             line.substring(line.indexOf("`") + 1,
                        line.lastIndexOf("'"));
+            // For some strange reason this won't compile
+            //   src/org/greenstone/gatherer/collection/Job.java:311: cannot resolve symbol
+            //   symbol  : class CAKE  
+            //   location: class org.greenstone.gatherer.collection.Job
+            /* ***********************************************************
+            CAKE CAKE CAKE CAKE I WANT CAKE GIVE ME CAKE NOW!!
+            *********************************************************** */
             // Remove the destination guff
             if(destination != null) {
@@ -348 +377 @@
     // downloaded will be correct.
     if(previous_state == Job.COMPLETE) {
-        progress.mirrorBegun(true);
+        progress.mirrorBegun(true, false);
     }
     else {
-        progress.mirrorBegun(false);
+        progress.mirrorBegun(false, false);
     }