Zachary Kotlarek 7 лет назад
Родитель
Сommit
bb16d6d6cd
4 измененных файлов с 10 добавлено и 1 удалено
  1. 8 0
      yt/subscribe.pl
  2. 1 0
      yt/update.sh
  3. BIN
      yt/youtube-dl
  4. 1 1
      yt/ytDupCheck

+ 8 - 0
yt/subscribe.pl

@@ -853,6 +853,14 @@ sub saveSubscriptions($$) {
 			next;
 		}
 
+		# Skip the weird dual Ask a Ninja thing, which vascilates
+		if ($id eq 'UCpYQ53cR1p2VzFijrXYz4WQ') {
+			if ($DEBUG) {
+				print STDERR 'Ignoring weird Ask a Ninja subscription: ' . $file . "\n";
+			}
+			next;
+		}
+
 		# Anything else should be in the list
 		if (!$subs->{$id}) {
 			my (undef(), undef(), $hour) = localtime(time);

+ 1 - 0
yt/update.sh

@@ -16,6 +16,7 @@ echo $$ > "${PID_FILE}"
 # Execute
 find "${MEDIA_PATH}/YouTube" -maxdepth 1 -mindepth 1 -type d \
 	-exec ~/bin/video/yt/subscribe.pl {} \; 2>&1 | \
+	grep -v 'giving up after 10 retries' | \
 	grep -v 'Did not get any data blocks' | \
 	grep -v 'The read operation timed out'
 


+ 1 - 1
yt/ytDupCheck

@@ -67,7 +67,7 @@ for k in *; do
 
 				# Automatically correct S0 drift
 				if [ $s -eq 0 ]; then
-					~/bin/video/yt/s0rename.sh "${i}"
+					~/bin/video/yt/s0rename.sh "S${s}E${e}"
 				fi
 			fi
 		fi