|
@@ -21,6 +21,7 @@ sub delTor($);
|
|
|
sub guessExt($);
|
|
sub guessExt($);
|
|
|
sub processFile($$);
|
|
sub processFile($$);
|
|
|
sub unrar($$);
|
|
sub unrar($$);
|
|
|
|
|
+sub localSeriesCleanup($);
|
|
|
sub seriesCleanup($);
|
|
sub seriesCleanup($);
|
|
|
sub readDir($$);
|
|
sub readDir($$);
|
|
|
|
|
|
|
@@ -277,7 +278,7 @@ sub getDest($$$$) {
|
|
|
while (<SHOWS>) {
|
|
while (<SHOWS>) {
|
|
|
chomp;
|
|
chomp;
|
|
|
my $orig = $_;
|
|
my $orig = $_;
|
|
|
- my $clean = seriesCleanup($_);
|
|
|
|
|
|
|
+ my $clean = localSeriesCleanup($_);
|
|
|
push(@shows, $clean);
|
|
push(@shows, $clean);
|
|
|
$showsCan{$clean} = $orig;
|
|
$showsCan{$clean} = $orig;
|
|
|
}
|
|
}
|
|
@@ -565,6 +566,12 @@ sub unrar($$) {
|
|
|
return @newFiles;
|
|
return @newFiles;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+sub localSeriesCleanup($) {
|
|
|
|
|
+ my ($name) = @_;
|
|
|
|
|
+ $name =~ s/\.//g;
|
|
|
|
|
+ return seriesCleanup($name);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
sub seriesCleanup($) {
|
|
sub seriesCleanup($) {
|
|
|
my ($name) = @_;
|
|
my ($name) = @_;
|
|
|
$name =~ s/\b(?:and|\&)\b/ /ig;
|
|
$name =~ s/\b(?:and|\&)\b/ /ig;
|