Tidy up episode number insertion

jcsteh · Dec 1, 2014 · b5ba41c · b5ba41c
1 parent 7971c42
commit b5ba41c
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/get_iplayer b/get_iplayer
@@ -5895,8 +5895,8 @@ sub get_metadata {
 					# insert episode number in $episode
 					my $episode_regex = 'Episode\s+'.main::regex_numbers();
 					my $date_regex = '^(\d{2}\/\d{2}\/\d{4}|\d{4}\-\d{2}\-\d{2})';
-					if ( $episodenum && $episode !~ /^(.+:\s+)?\d+\./ && $episode !~ $episode_regex && $episode !~ $date_regex) {
-						$episode =~ s/^(.+:\s+)?(.*)$/$1$episodenum. $2/;
+					if ( $episodenum && $episode !~ /^\d+\./ && $episode !~ /$episode_regex/ && $episode !~ /$date_regex/ ) {
+						$episode =~ s/^(.*)$/$episodenum. $1/;
 					}
 					# minimum episode number = 1 if not a film and series number == 0
 					$episodenum = 1 if ( $seriesnum == 0 && $episodenum == 0 && $prog_type eq 'tv' && $categories !~ "Films" );
@@ -6217,8 +6217,8 @@ sub get_metadata_fallback {
 		# Re-insert the episode number if the episode text doesn't have it
 		my $episode_regex = 'Episode\s+'.main::regex_numbers();
 		my $date_regex = '^(\d{2}\/\d{2}\/\d{4}|\d{4}\-\d{2}\-\d{2})';
-		if ( $prog->{episodenum} && $prog->{episode} !~ /^(.+:\s+)?\d+\./ && $prog->{episode} !~ $episode_regex && $prog->{episode} !~ $date_regex ) {
-			$prog->{episode} =~ s/^(.+:\s+)?(.*)$/$1$prog->{episodenum}. $2/;
+		if ( $prog->{episodenum} && $prog->{episode} !~ /^\d+\./ && $prog->{episode} !~ /$episode_regex/ && $prog->{episode} !~ /$date_regex/ ) {
+			$prog->{episode} =~ s/^(.*)$/$episodenum. $1/;
 		}
 
 		# minimum episode number = 1 if not a film and series number == 0
@@ -7604,8 +7604,8 @@ sub get_links_aod {
 			# insert episode number in $episode
 			my $episode_regex = 'Episode\s+'.main::regex_numbers();
 			my $date_regex = '^(\d{2}\/\d{2}\/\d{4}|\d{4}\-\d{2}\-\d{2})';
-			if ( $episodenum && $episode !~ /^(.+:\s+)?\d+\./ && $episode !~ $episode_regex && $episode !~ $date_regex ) {
-				$episode =~ s/^(.+:\s+)?(.*)$/$1$episodenum. $2/;
+			if ( $episodenum && $episode !~ /^\d+\./ && $episode !~ /$episode_regex/ && $episode !~ /$date_regex/ ) {
+				$episode =~ s/^(.*)$/$episodenum. $1/;
 			}
 			# Extract channel
 			$channel = $channels{$channel_id};
@@ -7746,8 +7746,8 @@ sub get_links_ion {
 				# insert episode number in $episode
 				my $episode_regex = 'Episode\s+'.main::regex_numbers();
 				my $date_regex = '^(\d{2}\/\d{2}\/\d{4}|\d{4}\-\d{2}\-\d{2})';
-				if ( $episodenum && $episode !~ /^(.+:\s+)?\d+\./ && $episode !~ $episode_regex && $episode !~ $date_regex) {
-					$episode =~ s/^(.+:\s+)?(.*)$/$1$episodenum. $2/;
+				if ( $episodenum && $episode !~ /^\d+\./ && $episode !~ /$episode_regex/ && $episode !~ /$date_regex/) {
+					$episode =~ s/^(.*)$/$episodenum. $1/;
 				}
 				# Extract channel
 				$channel = $1 if $entry =~ m{<masterbrand_title>(.*?)</masterbrand_title>};
@@ -8032,8 +8032,8 @@ sub get_links_schedule_page {
 		# insert episode number in $episode
 		my $episode_regex = 'Episode\s+'.main::regex_numbers();
 		my $date_regex = '^(\d{2}\/\d{2}\/\d{4}|\d{4}\-\d{2}\-\d{2})';
-		if ( $episodenum && $episode !~ /^(.+:\s+)?\d+\./ && $episode !~ $episode_regex && $episode !~ $date_regex) {
-			$episode =~ s/^(.+:\s+)?(.*)$/$1$episodenum. $2/;
+		if ( $episodenum && $episode !~ /^\d+\./ && $episode !~ /$episode_regex/ && $episode !~ /$date_regex/ ) {
+			$episode =~ s/^(.*)$/$episodenum. $1/;
 		}
 		main::logger "DEBUG: '$pid, $name - $episode, $channel'\n" if $opt->{debug};
 		# Merge and Skip if this pid is a duplicate