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

Prevent archives being extracted multiple times

Browse Source
This commit is contained in:
Ben Roberts
2012-08-27 00:35:35 +01:00
parent 1d4461dbc9
commit 954fdc534b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,8 +204,8 @@ class DownloadDispatcher_Source_Plugin_TV extends DownloadDispatcher_Source_Plug
foreach ($iterator as /** @var SplFileInfo */ $existing_file) { foreach ($iterator as /** @var SplFileInfo */ $existing_file) {
$existing_episode = $this->episode($existing_file->getFilename()); $existing_episode = $this->episode($existing_file->getFilename());
if ($existing_episode == $episode) { if ($existing_episode == $episode) {
// Only reject duplicates with the same extension, so we can keep meta data or high/low def copies // Only reject duplicates for media files with the same extension, so we can keep meta data or high/low def copies
if ($this->filetype($file) == $this->filetype($existing_file->getFilename())) { if (DownloadDispatcher_Utility_MediaFile::isArchivefile($file) || $this->filetype($file) == $this->filetype($existing_file->getFilename())) {
throw new DownloadDispatcher_Exception_DuplicateContent($file); throw new DownloadDispatcher_Exception_DuplicateContent($file);
} }
} }

4
source/lib/DownloadDispatcher/Utility/MediaFile.class.php
View File

@@ -14,6 +14,10 @@ class DownloadDispatcher_Utility_MediaFile {
return preg_match('/(?<!(?:\.|-)sample)\.(srt|smi)$/i', $filename); return preg_match('/(?<!(?:\.|-)sample)\.(srt|smi)$/i', $filename);
} }
public static function isArchiveFile($filename) {
return preg_match('/(?<!(?:\.|-)sample)\.(rar)$/i', $filename);
}
} }