Changeset 34367

Timestamp:

2020-09-14T11:29:43+12:00 (4 years ago)

Author:

davidb

Message:

Now supports https URLs as well

File:

• gs3-extensions/mars-src/trunk/perllib/plugins/AMCMetadataJSONPlugin.pm (modified) (2 diffs)

gs3-extensions/mars-src/trunk/perllib/plugins/AMCMetadataJSONPlugin.pm

@@ -166 +166 @@
 
     my $local_audio_file = $audio_url;
-    $local_audio_file =~ s/^http:\/\/.*\///;
-    
-    print STDERR "***** local audio file = $local_audio_file\n";
+    $local_audio_file =~ s/^http(s?):\/\/.*\///;
+    my ($amc_id) = ($local_audio_file =~ m/^(.+)(?:\..+?)$/);
+
+    ## print STDERR "***** local audio file = $local_audio_file\n";
  
+    # Set up metadata table based on JSON file read in
     foreach my $k (keys %$json_metadata) {
     $json_metadata->{'amc.'.$k} = [ $json_metadata->{$k} ];
     delete $json_metadata->{$k};
     }
-
+    $json_metadata->{'amc.id'} = [ $amc_id ];
 
 #    my $json_filename = shift(@$json_trackurl_array);
@@ -184 +186 @@
 
 ###  print STDERR "**** setting up mapping for: $json_filename\n";
-
+    
+    # Set up mapping from local_audio_file to the created JSON metadata table 
+    # so it 'sticks' to the file
     $extrametadata->{$local_audio_file} = $json_metadata;
     push(@$extrametakeys, $local_audio_file);