Merge branch 'master' of github.com:profplump/UberZach-Video

findTorrent.pl

@@ -1588,7 +1588,7 @@ sub initSources() {
 		my @proxies = ('isohunt.to/torrents/?ihq=', 'isohunters.net/torrents/?ihq=');
 		my $source = findProxy(\@proxies, 'Last\s+\d+\s+files\s+indexed');
 		if ($source) {
-			$source->{'weight'}         = 0.25;
+			$source->{'weight'}         = 0.75;
 			$source->{'quote'}          = 1;
 			$source->{'search_exclude'} = 1;
 			$source->{'search_suffix'}  = '';

yt/subscribe.pl

@@ -25,6 +25,7 @@ my $YTDL_BIN      = $ENV{'HOME'} . '/bin/video/yt/youtube-dl';
 my @YTDL_ARGS     = ('--force-ipv4', '--socket-timeout', '10', '--no-playlist', '--max-downloads', '1', '--age-limit', '99');
 my @YTDL_QUIET    = ('--quiet', '--no-warnings');
 my @YTDL_DEBUG    = ('--verbose');
+my $CHATTR        = '/usr/bin/chattr';
 my $BATCH_SIZE    = 50;
 my $MAX_INDEX     = 25000;
 my $FETCH_LIMIT   = 50;
@@ -217,7 +218,7 @@ if ($ENV{'NO_RENAME'}) {
 
 # Environmental parameters (functional)
 my $SUDO_CHATTR = 1;
-if ($ENV{'NO_CHATTR'} || !can_run('sudo') || !can_run('chattr')) {
+if ($ENV{'NO_CHATTR'} || !can_run('sudo') || !can_run($CHATTR)) {
 	$SUDO_CHATTR = 0;
 }
 if ($ENV{'MAX_INDEX'} && $ENV{'MAX_INDEX'} =~ /(\d+)/) {
@@ -638,7 +639,7 @@ sub findFiles($) {
 						}
 						warn("\tDeleting: " . $file . "\n");
 						if ($SUDO_CHATTR) {
-							system('sudo', 'chattr', '-i', $file);
+							system('sudo', $CHATTR, '-i', Cwd::abs_path($file));
 						}
 						unlink($file);
 						next;
@@ -654,7 +655,7 @@ sub findFiles($) {
 						}
 						warn("\tDeleting: " . $del . "\n");
 						if ($SUDO_CHATTR) {
-							system('sudo', 'chattr', '-i', $del);
+							system('sudo', $CHATTR, '-i', Cwd::abs_path($del));
 						}
 						unlink($del);
 						next;
@@ -1325,7 +1326,7 @@ sub renameVideo($$$$$$) {
 				die($NAME . ': Rename: Target exists: ' . $videoNew . "\n");
 			}
 			if ($SUDO_CHATTR) {
-				system('sudo', 'chattr', '-i', $video);
+				system('sudo', $CHATTR, '-i', Cwd::abs_path($video));
 			}
 			rename($video, $videoNew)
 			  or die($NAME . ': Unable to rename: ' . $video . ': ' . $! . "\n");
@@ -1347,7 +1348,7 @@ sub renameVideo($$$$$$) {
 
 		# Write a new NFO and unlink the old one
 		if ($SUDO_CHATTR) {
-			system('sudo', 'chattr', '-i', $nfo);
+			system('sudo', $CHATTR, '-i', Cwd::abs_path($nfo));
 		}
 		saveString($nfoNew, $nfoData);
 		if ($nfo ne $nfoNew) {

yt/ytDupCheck

@@ -14,7 +14,7 @@ for k in *; do
 	fi
 
 	cd "${BASE_DIR}/${k}"
-	for i in S[0-9]*E[0-9]*.[a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9]; do
+	for i in S[0-9]*E[0-9]*.*; do
 		s="`echo "${i}" | cut -d 'S' -f 2 | cut -d 'E' -f 1`"
 		e="`echo "${i}" | cut -d 'E' -f 2 | cut -d ' ' -f 1`"
 		ext="`echo "${i}" | awk -F '.' '{print $NF}'`"
@@ -34,7 +34,7 @@ for k in *; do
 		if [ "${ext}" == "nfo" ]; then
 			# Missing video
 			n="`echo "${i}" | sed 's%\.'"${ext}"'$%%'`"
-			if [ `ls "${n}".[a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9] | grep -v "${i}" | wc -l` -ne 1 ]; then
+			if [ `ls "${n}".* | grep -v "${i}" | wc -l` -ne 1 ]; then
 				echo "Missing video: ${k}/${i}"
 			fi
 		else
@@ -45,12 +45,12 @@ for k in *; do
 			fi
 
 			# Duplicate by type-id
-			if [ `ls S[0-9]*E[0-9]*" - ${id}."[a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9] | grep -v '\.nfo$' | wc -l` -gt 1 ]; then
+			if [ `ls S[0-9]*E[0-9]*" - ${id}."* | grep -v '\.nfo$' | wc -l` -gt 1 ]; then
 				echo "Duplicate video by type-id: ${k}/${i}"
 			fi
 
 			# Duplicate by type-season
-			if [ `ls "S${s}E${e} - "*.[a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9] | grep -v '\.nfo$' | wc -l` -gt 1 ]; then
+			if [ `ls "S${s}E${e} - "*.* | grep -v '\.nfo$' | wc -l` -gt 1 ]; then
 				echo "Duplicate video by type-season: ${k}/${i}"
 			fi
 		fi