ben/download-dispatcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak TV plugin to handle TV shows with numeric titles

Browse Source
This commit is contained in:
Ben Roberts
2014-06-18 10:22:22 +01:00
parent 32f144d0fa
commit 2050e05373
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/lib/DownloadDispatcher/Source/Plugin/TV.class.php
View File

@@ -97,14 +97,14 @@ class DownloadDispatcher_Source_Plugin_TV extends DownloadDispatcher_Source_Plug
} }
$normalised_file = $this->normalise($file); $normalised_file = $this->normalise($file);
if (array_key_exists($normalised_file, $this->output_dir_cache)) { if (array_key_exists('.'.$normalised_file, $this->output_dir_cache)) {
$season = $this->season($file); $season = $this->season($file);
if (!$season) { if (!$season) {
$season = $this->season($dir); $season = $this->season($dir);
} }
$full_output_dir = "{$this->output_dir}/{$this->output_dir_cache[$normalised_file]}/Season {$season}"; $full_output_dir = "{$this->output_dir}/{$this->output_dir_cache['.'.$normalised_file]}/Season {$season}";
if (is_dir($full_output_dir)) { if (is_dir($full_output_dir)) {
return $full_output_dir; return $full_output_dir;
} }
@@ -132,7 +132,7 @@ class DownloadDispatcher_Source_Plugin_TV extends DownloadDispatcher_Source_Plug
foreach ($series_iterator as $series) { foreach ($series_iterator as $series) {
$series_name = $series->getBasename(); $series_name = $series->getBasename();
$normalised_series = $this->normalise($series_name); $normalised_series = $this->normalise($series_name);
$this->output_dir_cache[$normalised_series] = $series_name; $this->output_dir_cache['.'.$normalised_series] = $series_name;
} }
// Post-process in any manual directory mappings // Post-process in any manual directory mappings
@@ -182,7 +182,9 @@ class DownloadDispatcher_Source_Plugin_TV extends DownloadDispatcher_Source_Plug
return null; return null;
}; };
if (preg_match('/(?:(?:[\s\.](?:19|20)\d{2})?[\s\.])?(?:\d+(\d{2})(?!\d|[\s\.](?:\d+x\d+|s\d[._-]?+ep?\d+))|\[?\s*\d+x(\d+)\s*\]?|s(?:eason ?)?\d+e(?:pisode ?)?(\d+)|^(\d{1,2}))/i', $name, $matches)) { if (preg_match('/(?:(?:[\s\.](?:19|20)\d{2})?[\s\.])?(?:\d+(\d{2})(?!\d|[\s\.](?:\d+x\d+|s\d[._-]?+ep?\d+))|\[?\s*\d+x(\d+)\s*\]?|s(?:eason ?)?\d+e(?:pisode ?)?(\d+))/i', $name, $matches)) {
return $set_episode($matches);
} elseif (preg_match('/^(\d+))/i', $name, $matches)) {
return $set_episode($matches); return $set_episode($matches);
} else { } else {
return 0; return 0;