Ticket #4212: mythweb_video.22.patch

mythweb/classes/Video.php

@@ -66 +66 @@
     // Figure out the URL
         $this->url = '#';
         if (file_exists('data/video/'))
+        {
+            $mythvideo_dir_ar = split(":", $mythvideo_dir);
+            $i = 1;
+            foreach ($mythvideo_dir_ar as &$path) {
+                $path = '#^' . $path . '/?#';
+                $video_path[$i - 1] = "video$i/";
+                $i++;
+            }
+            unset($path);
+            $video_path[0] = 'video/';
+
             $this->url = implode('/', array_map('rawurlencode',
                                              array_map('utf8tolocal',
-                                             explode('/',
-                                             'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
-                                       ))));
+                                             explode('/', 'data/' . 
+                                               preg_replace($mythvideo_dir_ar, $video_path, $this->filename) ))));
+        }
+
         $genre = $db->query('SELECT videometadatagenre.idgenre
                                FROM videometadatagenre
                               WHERE videometadatagenre.idvideo = ?',

mythweb/modules/video/handler.php

@@ -32 +32 @@
         }
 
 // Make sure the video directory exists
-    if (file_exists('data/video')) {
+    $mythvideo_dir_ar = split(":", $mythvideo_dir);
+    $i = 1;
+
+    foreach ($mythvideo_dir_ar as $path) {
+    $datapath = 'data/video' . ($i == 1 ? "" : "$i");
+
+    if (file_exists($datapath)) {
     // File is not a directory or a symlink
-        if (!is_dir('data/video') && !is_link('data/video')) {
-            custom_error('An invalid file exists at data/video.  Please remove it in'
+        if (!is_dir($datapath) && !is_link($datapath)) {
+            custom_error("An invalid file exists at $datapath.  Please remove it in"
                         .' order to use the video portions of MythWeb.');
         }
     }
 // Create the symlink, if possible.
     else {
-        if ($mythvideo_dir) {
+        if ($path) {
         // You can't symlink on windows
             if (strtoupper(substr(php_uname('s'), 0, 3)) != 'WIN') {
-                $ret = @symlink($mythvideo_dir, 'data/video');
+                $ret = @symlink($path, $datapath);
                 if (!$ret) {
-                    custom_error("Could not create a symlink to $mythvideo_dir, the local MythVideo"
+                    custom_error("Could not create a symlink to $path, the local MythVideo"
                                 .' directory for this hostname ('.hostname.').  Please create a'
-                                .' symlink to your MythVideo directory at data/video in order to'
+                                ." symlink to your MythVideo directory at $datapath in order to"
                                 .' use the video portions of MythWeb.');
                 }
             }
@@ -60 +66 @@
                         .' to point to the correct location.');
         }
     }
+    $i++; }
 
 // Make sure the video covers directory exists
     if (file_exists('data/video_covers')) {