Bug (logging) in libmerge

Author: rupor-github

CMakeLists.txt

@@ -14,7 +14,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 # Project version number
 set(PRJ_VERSION_MAJOR 8)
-set(PRJ_VERSION_MINOR 61)
+set(PRJ_VERSION_MINOR 62)
 configure_file("${PROJECT_SOURCE_DIR}/cmake/version.h.in" "${PROJECT_BINARY_DIR}/version.h")
 include_directories("${PROJECT_BINARY_DIR}")
 

libmerge/main.go

@@ -287,7 +287,7 @@ func main() {
 		name := filepath.Join(u.dir, u.info.Name())
 		rc, err := zip.OpenReader(name)
 		if err != nil {
-			log.Print("\tError opening update file %s, skipping: %v", filepath.Join(u.dir, u.info.Name()), err)
+			log.Printf("\tError opening update file %s, skipping: %v", filepath.Join(u.dir, u.info.Name()), err)
 			continue
 		}
 		fmt.Printf("\tProcessing update: %s\n", filepath.Join(u.dir, u.info.Name()))

scripts/fb2_flibusta.ps1

@@ -35,7 +35,8 @@ $host.UI.RawUI.BufferSize = new-object System.Management.Automation.Host.Size(51
 
 $name    = "flibusta"
 $retries = 10
-$timeout = 90
+$timeout = 300
+$chunksize = 1
 
 $mydir   = Get-ScriptDirectory
 $wdir    = Join-Path $archive_path ($name + (get-date -format "_yyyyMMdd_HHmmss"))
@@ -58,7 +59,7 @@ Wake-Synology
 
 Write-Output "Downloading $name ..."
 
-& $mydir/libget2 --verbose --library is_$name --retry $retries --timeout $timeout --continue --to $udir --tosql $wdir --config $mydir/libget2.conf 2>&1 | Write-Host
+& $mydir/libget2 --verbose --library is_$name --retry $retries --timeout $timeout --chunksize $chunksize --continue --to $udir --tosql $wdir --config $mydir/libget2.conf 2>&1 | Write-Host
 
 if( $LASTEXITCODE -eq 1 ) { Write-Error "LIBGET error!"; Power-Balanced; exit 0 }
 if( $LASTEXITCODE -eq 0 ) { Write-Output "No archive updates..."; Power-Balanced; exit 0 }

scripts/fb2_flibusta.sh

@@ -15,7 +15,8 @@ fi
 
 name="flibusta"
 retries=10
-timeout=90
+timeout=300
+chunksize = 1
 
 # -----------------------------------------------------------------------------
 # Main body
@@ -40,6 +41,7 @@ ${mydir}/libget2 \
 	--library is_${name} \
 	--retry ${retries} \
 	--timeout ${timeout} \
+	--chunksize ${chunksize} \
 	--continue --to ${udir} \
 	--tosql ${wdir} \
 	--config ${mydir}/libget2.conf
@@ -79,6 +81,7 @@ ${mydir}/lib2inpx \
 	--db-name=${name} \
 	--process=fb2 \
 	--read-fb2=all \
+	--prefer-fb2=complement \
 	--out-dir=${odir} \
 	--quick-fix \
 	--clean-when-done \

scripts/fb2_index.sh

@@ -35,6 +35,7 @@ ${mydir}/lib2inpx \
 	--db-name=${name} \
 	--process=fb2 \
 	--read-fb2=all \
+	--prefer-fb2=complement \
 	--out-dir=${odir} \
 	--quick-fix \
 	--clean-when-done \