diff --git a/config b/config index 92ec2f0..f6198cb 100644 --- a/config +++ b/config @@ -18,7 +18,7 @@ function funcConfigPre { # These values are set at the beginning of the script logLevel=2 # level, which messages shall be written into the log. echoLevel=5 # level, which messages shall be written to stdout. - torrentDb="/home/deluged/torrents.db" # File with file names and labels (see at github: OTR-TorrentDb) (optional) + labelDb="/home/deluged/labeldb/labelsOfTorrents.db" # File with file names and labels (see at github: Torrent-Label-DB) (optional) # Add label to directory mapping. (optional) # 1st arg: Label # 2nd arg: Each movie with this label will be moved to this subdirectory of $outDir @@ -48,7 +48,7 @@ function funcConfigPost { cmdCut="/home/deluged/multicutmkv.sh" # path to multicut - cmdCutArgs="-o $tempDir -t $tempDir" + cmdCutArgs="-q -o $tempDir -t $tempDir" diff --git a/otrDecodeAll b/otrDecodeAll index e521aee..3f9a4a3 100755 --- a/otrDecodeAll +++ b/otrDecodeAll @@ -251,11 +251,11 @@ function funcUnlock { } function funcGetLabel { - if [ -n "$torrentDb" -a -r "$torrentDb" ]; then - label="$(LC_ALL=C fgrep -m 1 "$filename" $torrentDb | grep -o ' [a-zA-Z0-9_-]*$' | grep -o '[a-zA-Z0-9_-]*$')" + if [ -n "$labelDb" -a -r "$labelDb" ]; then + label="$(LC_ALL=C fgrep -m 1 "$filename" $labelDb | grep -o ' [a-zA-Z0-9_-]*$' | grep -o '[a-zA-Z0-9_-]*$')" funcLog 5 "label: $label" else - funcLog 5 "no/incorrect torrentDb given" + funcLog 5 "no/incorrect labelDb given" label="N\\A" fi } @@ -371,7 +371,7 @@ function funcProcessFiles { funcLog 4 "Label did not match filter. Skipping"; continue; fi - if [ -z "$label" -a "$label" != "N\\A" ]; then # Empty label and torrentDb does exist --> skip + if [ -z "$label" -a "$label" != "N\\A" ]; then # Empty label and labelDb does exist --> skip funcLog 1 "No label specified for this movie. Skipping" continue; fi