Changeset 15731

Timestamp:

Jun 15, 2012, 3:52:59 PM (12 years ago)

Author:

plg

Message:

make sure piwigo_import_tree.pl is always correctly connected to Piwigo before any other action on the API

fix indentation issues

File:

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

extensions/piwigo_import_tree/piwigo_import_tree.pl

@@ -58 +58 @@
 
 # Login to Piwigo
-my $form = {
-    method => 'pwg.session.login',
-    username => $conf{username},
-    password => $conf{password},
-};
-
-$result = $ua->post(
-    $conf{base_url}.'/ws.php?format=json',
-    $form
-);
+piwigo_login();
 
 # Fill an "album path to album id" cache
@@ -75 +66 @@
     $conf{base_url}.'/ws.php?format=json',
     {
-                method => 'pwg.categories.getList',
-                recursive => 1,
-                fullname => 1,
-        }
+        method => 'pwg.categories.getList',
+        recursive => 1,
+        fullname => 1,
+    }
 );
 
 my $albums_aref = from_json($response->content)->{result}->{categories};
 foreach my $album_href (@{$albums_aref}) {
-        $piwigo_albums{ $album_href->{name} } = $album_href->{id};
+    $piwigo_albums{ $album_href->{name} } = $album_href->{id};
 }
 # print Dumper(\%piwigo_albums)."\n\n";
 
 if (defined $opt{parent_album_id}) {
-        foreach my $album_path (keys %piwigo_albums) {
-                if ($piwigo_albums{$album_path} == $opt{parent_album_id}) {
-                        $conf{parent_album_id} = $opt{parent_album_id};
-                        $conf{parent_album_path} = $album_path;
-                }
-        }       
-        if (not defined $conf{parent_album_path}) {
-                print "Parent album ".$opt{parent_album_id}." does not exist\n";
-                exit();
-        }
+    foreach my $album_path (keys %piwigo_albums) {
+        if ($piwigo_albums{$album_path} == $opt{parent_album_id}) {
+            $conf{parent_album_id} = $opt{parent_album_id};
+            $conf{parent_album_path} = $album_path;
+        }
+    }
+
+    if (not defined $conf{parent_album_path}) {
+        print "Parent album ".$opt{parent_album_id}." does not exist\n";
+        exit();
+    }
 }
 
@@ -110 +102 @@
 #---------------------------------------------------------------------
 
+sub piwigo_login {
+    $ua->post(
+        $conf{base_url}.'/ws.php?format=json',
+        {
+            method => 'pwg.session.login',
+            username => $conf{username},
+            password => $conf{password},
+        }
+    );
+}
+
 sub fill_photos_of_album {
-        my %params = @_;
-        
-        if (defined $photos_of_album{ $params{album_id} }) {
-                return 1;
-        }
-        
-        my $response = $ua->post(
+    my %params = @_;
+
+    if (defined $photos_of_album{ $params{album_id} }) {
+        return 1;
+    }
+
+    piwigo_login();
+    my $response = $ua->post(
         $conf{base_url}.'/ws.php?format=json',
         {
@@ -124 +128 @@
         }
     );
-    
+
     foreach my $image_href (@{from_json($response->content)->{result}{images}{_content}}) {
         $photos_of_album{ $params{album_id} }{ $image_href->{file} } = 1;
@@ -131 +135 @@
 
 sub photo_exists {
-        my %params = @_;
+    my %params = @_;
 
     fill_photos_of_album(album_id => $params{album_id});
-    
+
     if (defined $photos_of_album{ $params{album_id} }{ $params{file} }) {
         return 1;
@@ -144 +148 @@
 
 sub add_album {
-        my %params = @_;
-        
-        # print Dumper(\%params);
-        
+    my %params = @_;
+
     my $form = {
         method => 'pwg.categories.add',
         name => $params{name},
     };
-    
+
     if (defined $params{parent}) {
         $form->{parent} = $params{parent};
     }
 
+    piwigo_login();
     my $response = $ua->post(
         $conf{base_url}.'/ws.php?format=json',
@@ -193 +196 @@
     }
 
+    piwigo_login();
     my $response = $ua->post(
         $conf{base_url}.'/ws.php?format=json',