Changeset 27527

Timestamp:

2013-06-04T09:45:11+12:00 (11 years ago)

Author:

jmt12

Message:

Calling the isHDFS() in FileUtils rather than the non-existant one in utils

File:

• gs2-extensions/video-and-audio/trunk/src/perllib/plugins/SimpleVideoPlugin.pm (modified) (9 diffs)

gs2-extensions/video-and-audio/trunk/src/perllib/plugins/SimpleVideoPlugin.pm

@@ -33 +33 @@
 use MetadataRead;
 use util;
+use FileUtils;
 
 use strict;
@@ -156 +157 @@
   # to be run on it.
   my $separate_io = $self->{'separateIO'};
-  if (&util::isHDFS($file))
+  if (&FileUtils::isHDFS($file))
   {
     $separate_io = 'true';
@@ -166 +167 @@
   if ($separate_io eq 'true')
   {
-    $process_dir = &util::filename_cat('/tmp', 'gsimport-' . $filename);
-    if (!&util::dir_exists($process_dir))
+    $process_dir = &FileUtils::filenameConcatenate('/tmp', 'gsimport-' . $filename);
+    if (!&FileUtils::directoryExists($process_dir))
     {
       mkdir($process_dir, 0775);
     }
   }
-  my $logs_dir = &util::filename_cat($process_dir, "logs");
-  if (!&util::dir_exists($logs_dir))
+  my $logs_dir = &FileUtils::filenameConcatenate($process_dir, "logs");
+  if (!&FileUtils::directoryExists($logs_dir))
   {
     mkdir($logs_dir, 0775);
   }
-  my $convert_log_path = &util::filename_cat($logs_dir, 'convert-' . $filename . '.log');
-  my $pass_log_path = &util::filename_cat($logs_dir, 'convert-' . $filename . '-pass');
-  my $tmp_dir = &util::filename_cat($process_dir, "cached");
-  if (!&util::dir_exists($tmp_dir))
+  my $convert_log_path = &FileUtils::filenameConcatenate($logs_dir, 'convert-' . $filename . '.log');
+  my $pass_log_path = &FileUtils::filenameConcatenate($logs_dir, 'convert-' . $filename . '-pass');
+  my $tmp_dir = &FileUtils::filenameConcatenate($process_dir, "cached");
+  if (!&FileUtils::directoryExists($tmp_dir))
   {
     mkdir($tmp_dir, 0775);
   }
-  $tmp_dir = &util::filename_cat($tmp_dir, $filename);
-  if (!&util::dir_exists($tmp_dir))
+  $tmp_dir = &FileUtils::filenameConcatenate($tmp_dir, $filename);
+  if (!&FileUtils::directoryExists($tmp_dir))
   {
     mkdir($tmp_dir, 0775);
@@ -192 +193 @@
   # If we are separating IO, then we also start by copying the file to
   # the process directory (local tmp) as well
-  my $ivideo_path = &util::filename_cat($base_dir, $file);
+  my $ivideo_path = $file;
+  if (!&FileUtils::isFilenameAbsolute($file) && $base_dir ne '')
+  {
+    $ivideo_path = &FileUtils::filenameConcatenate($base_dir, $file);
+  }
   if ($separate_io eq 'true')
   {
-    print STDERR "[B1:" . time() . "] Creating local copy of file\n";
-    my $local_ivideo_path = &util::filename_cat($process_dir, $filename . ".ts");
-    &util::cp($ivideo_path, $local_ivideo_path);
+    print STDERR "[B1:" . time() . "] Creating local copy of file: " . $ivideo_path . "\n";
+    my $local_ivideo_path = &FileUtils::filenameConcatenate($process_dir, $filename . ".ts");
+    &FileUtils::copyFiles($ivideo_path, $local_ivideo_path);
     $ivideo_path = $local_ivideo_path;
     print STDERR "[B2:" . time() . "] Complete\n";
@@ -224 +229 @@
   # - generate a path for our temporary converted video file
   print STDERR "[D1:" . time() . "] Converting video to streamble format\n";
-  my $ovideo_path = &util::filename_cat($tmp_dir, 'gsv.mp4');
-  if (&util::file_exists($ovideo_path))
+  my $ovideo_path = &FileUtils::filenameConcatenate($tmp_dir, 'gsv.mp4');
+  if (&FileUtils::fileExists($ovideo_path))
   {
     print " - Found existing converted video in cache\n";
@@ -281 +286 @@
       `$cmd`;
     }
-    while ($attempt_count < 5 && !&util::file_exists($ovideo_path))
-  }
-  if (!&util::file_exists($ovideo_path))
+    while ($attempt_count < 5 && !&FileUtils::fileExists($ovideo_path))
+  }
+  if (!&FileUtils::fileExists($ovideo_path))
   {
     die("Fatal Error! Failed to convert video: " . $ovideo_path . "\nReason:" . $! . "\n");
@@ -291 +296 @@
   # 3. Extract keyframes using hive
   print STDERR "[E1:" . time() . "] Extract keyframes\n";
-  my $oshots_path = &util::filename_cat($tmp_dir, 'shots.xml');
-  if (&util::file_exists($oshots_path))
+  my $oshots_path = &FileUtils::filenameConcatenate($tmp_dir, 'shots.xml');
+  if (&FileUtils::fileExists($oshots_path))
   {
     print " - Found existing keyframe images in cache\n";
@@ -303 +308 @@
     `$cmd`;
   }
-  if (!&util::file_exists($oshots_path))
+  if (!&FileUtils::fileExists($oshots_path))
   {
     die("Fatal Error! Failed to extract keyframe images: " . $oshots_path . "\nReason:" . $! . "\n");
@@ -321 +326 @@
   foreach my $shot (sort @shots)
   {
-    my $shot_path = &util::filename_cat($tmp_dir, $shot);
+    my $shot_path = &FileUtils::filenameConcatenate($tmp_dir, $shot);
     if ($shot =~ /.jpg$/)
     {