Changeset 18692

Timestamp:

Oct 19, 2012, 11:40:10 AM (12 years ago)

Author:

plg

Message:

new option --short_lines to make output log shorter for DOS terminal

File:

• extensions/piwigo_import_tree/piwigo_import_tree.pl (modified) (4 diffs)

extensions/piwigo_import_tree/piwigo_import_tree.pl

@@ -34 +34 @@
           reload_properties
           debug
+          short_lines
       /
 );
@@ -279 +280 @@
 
     if (defined $property and $property ne '') {
-        print '[photo '.$params{id}.'] "'.$params{path}.'", set photo title "'.$property.'"'."\n";
+        print '[photo '.$params{id}.'] "';
+
+        if (defined $opt{short_lines}) {
+            print basename($params{path});
+        }
+        else {
+            print $params{path};
+        }
+
+        print '", set photo title "'.$property.'"'."\n";
 
         my $form = {
@@ -306 +316 @@
     };
 
-    print '[album '.$params{album_id}.'] '.$params{path}.' upload starts... ';
+    print '[album '.$params{album_id}.'] "';
+    if (defined $opt{short_lines}) {
+        print basename($params{path});
+    }
+    else {
+        print $params{path};
+    }
+    print '" upload starts... ';
+
     $| = 1;
     my $t1 = [gettimeofday];
@@ -317 +335 @@
     );
 
+    my $photo_id = from_json($response->content)->{result}{image_id};
+
     my $elapsed = tv_interval($t1);
-    print ' upload completed ('.sprintf('%u ms', $elapsed * 1000).')'."\n";
-
-    return from_json($response->content)->{result}{image_id};
+    print ' completed ('.sprintf('%u ms', $elapsed * 1000).', photo '.$photo_id.')'."\n";
+
+    return $photo_id;
 }