Changeset 31823

Timestamp:

2017-07-26T20:00:53+12:00 (7 years ago)

Author:

ak19

Message:

Another bugfix to GLI's downloadjob display: on Linux, the number of files already downloaded weren't being displayed, whereas this worked on Windows. Wget seems to use backtick or single quote character to bookend names of files already downloaded. We used to only process the backtick before.

File:

• main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java

@@ -1110 +1110 @@
             // If line contains "/s) - `" set currently 
             // downloading url to "Download Complete".
-            else if(line.lastIndexOf("/s) - `") != -1) {
-                String current_file_downloading = line.substring(line.indexOf("`") + 1, line.lastIndexOf("'"));
+            // Currently: on windows ` marks start quote of downloaded file, but on linux ' marks it
+            else if(line.lastIndexOf("/s) - `") != -1 || line.lastIndexOf("/s) - '") != -1) {
+                String startChar = (line.lastIndexOf("/s) - `") != -1) ? "`" : "'";
+                String current_file_downloading = line.substring(line.indexOf(startChar) + 1, line.lastIndexOf("'"));
                 if(!ignore_for_robots) {
                 DebugStream.println("Not ignore for robots");