Trap exceptions from movie::create() and mark those movies as corrupt.

Signed-off-by: Marc Poulhiès <dkm@kataplop.net>

1 files changed, 13 insertions, 7 deletions

diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 01e07eba..33cfc158 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -432,13 +432,19 @@ class g2_import_Core {
     case "GalleryMovieItem":
       // @todo we should transcode other types into FLV
       if (in_array($g2_item->getMimeType(), array("video/mp4", "video/x-flv"))) {
-        $item = movie::create(
-          $parent,
-          $g2_path,
-          $g2_item->getPathComponent(),
-          $g2_item->getTitle(),
-          self::extract_description($g2_item),
-          self::map($g2_item->getOwnerId()));
+        try {
+          $item = movie::create(
+            $parent,
+            $g2_path,
+            $g2_item->getPathComponent(),
+            $g2_item->getTitle(),
+            self::extract_description($g2_item),
+            self::map($g2_item->getOwnerId()));
+        } catch (Exception $e) {
+          Kohana::log("alert", "Corrupt movie $g2_path\n" .
+                      $e->getMessage() . "\n" . $e->getTraceAsString());
+          $corrupt = 1;
+        }
       }
       break;