Small fixes: compensate for Synology task scheduler problem and corre…

…ct libmerge return code
rupor-github · Nov 26, 2016 · ca8c1bb · ca8c1bb
1 parent 798b6fc
commit ca8c1bb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/libget2/main.go b/libget2/main.go
@@ -495,7 +495,10 @@ func main() {
 	}
 	newArchives := len(links)
 	if newArchives > 0 {
+
+		// We may want to "merge" updates
 		code = 2
+
 		fmt.Printf("\nProcessed %d new archive(s)\n", newArchives)
 	} else {
 		fmt.Printf("\nProcessed no new archive(s)\n")

diff --git a/libmerge/main.go b/libmerge/main.go
@@ -317,7 +317,6 @@ func main() {
 						}
 						newName := fmt.Sprintf("fb2-%06d-%06d.zip", firstBook, lastBook)
 						fmt.Printf("\t--> Finalizing archive: %s\n", newName)
-						code = 2
 
 						newName = filepath.Join(last.dir, newName)
 						if err := os.Rename(tmpOut, newName); err != nil {
@@ -332,6 +331,9 @@ func main() {
 						last.end = lastBook
 						fmt.Printf("\t--> New last archive: %s\n", newName)
 
+						// We may want to rebuild inpx - have new "last" archive ready
+						code = 2
+
 						f, err = ioutil.TempFile(last.dir, "merge-")
 						if err != nil {
 							log.Fatalf("Unable to create temp file: %v", err)
@@ -368,7 +370,6 @@ func main() {
 
 		newName := fmt.Sprintf("fb2-%06d-%06d.merging", firstBook, lastBook)
 		fmt.Printf("\t--> Finalizing archive: %s\n", newName)
-		code = 2
 
 		newName = filepath.Join(last.dir, newName)
 		if err := os.Rename(tmpOut, newName); err != nil {

diff --git a/misc/libget2.conf b/misc/libget2.conf
@@ -3,6 +3,7 @@
         [
                 {
                         "name":         "is_flibusta",
+                        "nameLib":      "flibusta",
                         "pattern":      "(?i)<a\\s+href=\"(f(?:\\.fb2)*\\.[0-9]+-[0-9]+\\.zip)\">",
                         "patternSQL":   "(?i)<a\\s+href=\"(lib\\.lib\\w+\\.sql\\.gz)\">",
                         "url":          "http:\/\/flibusta.is\/daily\/",
@@ -15,7 +16,7 @@
                         "patternSQL":   "(?i)<a\\s+href=\"(lib\\.lib\\w+\\.sql\\.gz)\">",
                         "url":          "http:\/\/flibusta.is\/daily\/",
                         "urlSQL":       "http:\/\/flibusta.is\/sql\/",
-						"proxy":        "socks5://192.168.50.10:9050"
+						            "proxy":        "socks5://192.168.50.10:9050"
                 },
                 {
                         "name":         "librusec",

diff --git a/scripts/fb2_flibusta.sh b/scripts/fb2_flibusta.sh
@@ -1,4 +1,14 @@
 #!/bin/bash
+
+# Synology task scheduler has a problem running scripts under non-root user
+
+if [ "$2" != "" ]; then
+	user_dir=`eval echo "~$2"`
+	if [ "${user_dir}" != "" ]; then
+    	cd ${user_dir}
+	fi
+fi
+
 # -----------------------------------------------------------------------------
 # Following variables could be changed
 # -----------------------------------------------------------------------------