ben/handbrake-cluster-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated SourceLister to use DvdDirectoryIterator

Browse Source 
Greatly simplified the code to list DVD source directories using
iterator class.
This commit is contained in:
Ben Roberts
2010-08-22 22:58:31 +01:00
parent 3c9129657d
commit 0ca5a716d6
1 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/HandBrakeCluster/Rips/SourceLister.class.php
View File

@@ -16,34 +16,9 @@ class HandBrakeCluster_Rips_SourceLister {
throw new HandBrakeCluster_Exception_InvalidSourceDirectory($this->base_directory); throw new HandBrakeCluster_Exception_InvalidSourceDirectory($this->base_directory);
} }
// Define a queue of directories to scan, starting with the base directory, $iterator = new HandBrakeCluster_Utility_DvdDirectoryIterator(new HandBrakeCluster_Utility_VisibleFilesIterator(new DirectoryIterator($this->base_directory)));
// and keep going until they have all been scanned foreach ($iterator as /** @var SplFileInfo */ $source_vts) {
$scan_directories = array($this->base_directory); $this->sources[] = HandBrakeCluster_Rips_Source::load($source_vts->getPathname(), false);
while ($scan_directories) {
$dir = dir(array_shift($scan_directories));
while (($entry = $dir->read()) !== false) {
if ($entry == '.' || $entry == '..' || $entry == 'lost+found') {
continue;
}
// Skip any non-directories
$source = $dir->path . DIRECTORY_SEPARATOR . $entry;
if (!is_dir($source)) {
continue;
}
// Accept this dir as a source if it contains a VIDEO_TS dir,
// otherwise add the dir to the queue to scan deeper
$source_vts = $source . DIRECTORY_SEPARATOR . 'VIDEO_TS';
if (is_dir($source_vts)) {
$this->sources[] = HandBrakeCluster_Rips_Source::load($source_vts, false);
} else {
$scan_directories[] = $source;
}
}
$dir->close();
} }
} }