Changeset 20111

Timestamp:

2009-07-31T17:08:27+12:00 (15 years ago)

Author:

davidb

Message:

Fixed clash on filename for thumbnail and screenview images

Location:

extensions/gsdl-video/trunk/perllib/plugins

Files:

• VideoConverter.pm (modified) (1 diff)
• VideoPlugin.pm (modified) (6 diffs)

extensions/gsdl-video/trunk/perllib/plugins/VideoConverter.pm

@@ -635 +635 @@
     my $ivideo_filename_gsdlenv = $self->gsdlhome_independent($ivideo_filename);
 
-
-
     $command = "ffmpeg -i \"$ivideo_filename_gsdlenv\"  -ss 12.5 -vframes 1 -f image2 -s ${thumbnailwidth}x${thumbnailheight} -y \"$thumbnailfile_gsdlenv\"";
 

extensions/gsdl-video/trunk/perllib/plugins/VideoPlugin.pm

@@ -163 +163 @@
     # Generate the thumbnail with convert, a la ImagePlug
 
-    my $thumbnailfile = &util::filename_cat($output_dir,"$ivideo_root.$thumbnailtype");
+    my $thumbnailfile = &util::filename_cat($output_dir,"$ivideo_root-thumbnail.$thumbnailtype");
     
     
@@ -172 +172 @@
     }
     
+###    print STDERR "**** creating thumbnail: $thumbnail_width x $thumbnail_height\n";
+
     my ($thumb_cmd ,$othumb_filename)
     = $self->keyframe_thumbnail_cmd($filename,$thumbnailfile,$thumbnail_width,$thumbnail_height);
@@ -265 +267 @@
     # make the screenview image
 
-    my $screenviewfilename = &util::filename_cat($output_dir,"$ivideo_root.$screenviewtype");
+    my $screenviewfilename = &util::filename_cat($output_dir,"$ivideo_root-screenview.$screenviewtype");
 
     
@@ -452 +454 @@
     
     # split filename on char if specified
-    if ($file_unicode =~ m/\-/) {
+    if (0) {
+# don't do any more 
+#    if ($file_unicode =~ m/\-/) {
 
     my @file_split = split(/\s*\-\s*/,$file_unicode);
@@ -610 +614 @@
     }
 
-
     if (($self->{'enablestreaming'}) && ($self->{'extractkeyframes'})) {
     my $section = $doc_obj->get_top_section();
@@ -625 +628 @@
     $self->run_general_cmd($streamkeyframes_cmd,$streamkeyframes_options);
     }
+
+    my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
+    my $section = $doc_obj->get_top_section();
+
+    $self->title_fallback($doc_obj,$section,$filename_no_path);
     
     $self->{'media_type'} = undef;