Просмотр исходного кода

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

Zachary Kotlarek 12 лет назад
Родитель
Сommit
7e5d883ed2
2 измененных файлов с 11 добавлено и 2 удалено
  1. 10 1
      Fetch.pm
  2. 1 1
      encode.pl

+ 10 - 1
Fetch.pm

@@ -531,6 +531,15 @@ sub fetch() {
 		}
 	}
 
+	# Always add the 'Accept-Encoding' header
+	# But allow headers() to override the value
+	if (!defined($self->{'headers'}{'Accept-Encoding'}) || length($self->{'headers'}{'Accept-Encoding'}) < 1) {
+		$request->header('Accept-Encoding' => HTTP::Message::decodable);
+		if ($DEBUG) {
+			print STDERR 'Setting Accept-Encoding header: ' . HTTP::Message::decodable . "\n";
+		}
+	}
+
 	# Append any extra headers
 	foreach my $key (keys(%{ $self->{'headers'} })) {
 		$request->header($key => $self->{'headers'}{$key});
@@ -572,7 +581,7 @@ sub fetch() {
 	($self->{'status_code'}) = $response->status_line =~ /^(\d+)\s/;
 
 	# Grab the content for future use
-	$self->{'content'} = $response->content();
+	$self->{'content'} = $response->decoded_content();
 
 	# Save the output (save() does its own validity checks)
 	$self->Fetch::save('nocheck' => $nocheck);

+ 1 - 1
encode.pl

@@ -16,7 +16,7 @@ my $STEREO_ONLY         = 0;
 my $VIDEO_ONLY          = 0;
 my $HEIGHT              = undef();
 my $WIDTH               = undef();
-my $AUDIO_EXCLUDE_REGEX = '\b(?:Chinese|Deutsch|Espanol|Francais|Italiano|Japanese|Korean|Polish|Portugues|Thai)\b';
+my $AUDIO_EXCLUDE_REGEX = '\b(?:Chinese|Czech|Deutsch|Espanol|Francais|Italiano|Japanese|Korean|Magyar|Polish|Portugues|Thai|Turkish)\b';
 my $SUB_INCLUDE_REGEX   = '\b(?:English|Unknown|Closed\s+Captions)\b';
 my $FORCE_MP4           = 0;
 my $OUT_DIR             = undef();