Changeset 27529

Timestamp:

2013-06-04T11:07:21+12:00 (11 years ago)

Author:

jmt12

Message:

Fixing a bug (HDFS drivers not being recognized due to sometimes being relative) and some tidy up stuff

File:

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

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

@@ -133 +133 @@
   my ($pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
 
+  if (!&FileUtils::isFilenameAbsolute($file) && $base_dir ne '')
+  {
+    $file = &FileUtils::filenameConcatenate($base_dir, $file);
+  }
+
   print STDERR "[A:" . time() . "] SimpleVideoPlugin processing: " . $file . "\n";
 
@@ -161 +166 @@
     $separate_io = 'true';
   }
+  ###rint STDERR "[DEBUG] separate_io:" . $separate_io . "\n";
 
   my $process_dir = $ENV{'GSDLCOLLECTDIR'};
@@ -206 +212 @@
     print STDERR "[B2:" . time() . "] Complete\n";
   }
+  else
+  {
+    print "Not gonna work!\n";
+    exit;
+  }
 
   # 1. Use MediaInfo to extract important metadata
@@ -212 +223 @@
   my $mi_metadata = $self->getMetadata($ivideo_path);
   $doc_obj->add_utf8_metadata($topsection,"Format", 'multimedia (' . $mi_metadata->{'General'}->{'Format'} . ')');
-  $doc_obj->set_metadata_element($topsection,"FileSize",$mi_metadata->{'General'}->{'File_size'});
+  if (defined $mi_metadata->{'General'}->{'File_size'})
+  {
+    $doc_obj->set_metadata_element($topsection, "FileSize", $mi_metadata->{'General'}->{'File_size'});
+  }
+  else
+  {
+    $doc_obj->set_metadata_element($topsection, "FileSize", &FileUtils::fileSize($ivideo_path));
+  }
   $doc_obj->add_utf8_metadata($topsection,"Duration",$mi_metadata->{'General'}->{'Duration'});
   if (defined $mi_metadata->{'Video'}->{'Format_Info'} && defined $mi_metadata->{'Video'}->{'Format'})
@@ -283 +301 @@
     {
       $attempt_count++;
-      print "[DEBUG: Video conversion attempt #" . $attempt_count . ": |" . $cmd . "|]\n";
+      ###rint "[DEBUG: Video conversion attempt #" . $attempt_count . ": |" . $cmd . "|]\n";
       `$cmd`;
     }
@@ -349 +367 @@
   my ($self, $ivideo_path) = @_;
   my $cmd = 'mediainfo --Output=XML "' . $ivideo_path . '" 2>&1';
-  ###print "Cmd: " . $cmd . "\n";
+  ###rint "[DEBUG] command: " . $cmd . "\n";
   my $metadata_xml = `$cmd`;
+  ###rint "[DEBUG] result: " . $metadata_xml . "\n\n";
   my @lines = split(/\r?\n/, $metadata_xml);
   my $metadata = {'Unknown'=>{}};