Changeset 6088

Timestamp:

May 6, 2010, 10:40:05 PM (14 years ago)

Author:

ronosman

Message:

Feature 1609 added : Verify upload access while connecting and before upload.

Location:

extensions/pLoader/trunk

Files:

• locale/fr_FR/pLoader.mo (modified) (previous)
• locale/fr_FR/pLoader.po (modified) (1 diff)
• src/Uploader/GUI/Frame.pm (modified) (3 diffs)
• src/Uploader/GUI/wxApp.pm (modified) (3 diffs)
• src/Uploader/ImageList.pm (modified) (1 diff)
• src/Uploader/PWG.pm (modified) (1 diff)
• src/Uploader/PWG/WebServices.pm (modified) (6 diffs)

extensions/pLoader/trunk/locale/fr_FR/pLoader.po

@@ -703 +703 @@
 msgid "Selection"
 msgstr "Sélection"
+
+msgid "Your user account is not granted to upload photos"
+msgstr "Les droits associés à votre compte ne permettent pas le transfert de photos"
+
+msgid "Add photos for resizing and uploading"
+msgstr "Ajoute des photos à redimensionner et transférer"
+
+msgid "Remove selected photos. Original files are not deleted"
+msgstr "Enlève les photos sélectionnées. Les fichiers originaux ne sont pas supprimés"
+
+msgid "Change global settings"
+msgstr "Change les réglages"

extensions/pLoader/trunk/src/Uploader/GUI/Frame.pm

@@ -1666 +1666 @@
     my ( $self, $select_all ) = @_;
 
+    return if wxTheApp->CheckUpload;
     return if !scalar @{$self->imagelist->sums};
 
@@ -1826 +1827 @@
             1, 
             wxTheApp->resource_path('tb_remove.png'),
-            gettext("Remove selected photos. Original files are not deleted ")
+            gettext("Remove selected photos. Original files are not deleted")
         ],
         [
@@ -1835 +1836 @@
             0, 
             wxTheApp->resource_path('tb_settings.png'),
-            gettext("Change global settings.")
+            gettext("Change global settings")
         ],
     

extensions/pLoader/trunk/src/Uploader/GUI/wxApp.pm

@@ -260 +260 @@
     # user pressed OK
     if($not_exit){
-        $self->StoreConnectionProperties;
-        if( !$self->use_offline ){
+        $self->StoreConnectionProperties;
+        if( !$self->use_offline ){
             while( $not_exit and !$self->_is_connected ){
-                $not_exit = $self->Login();
-                last if $self->use_offline;
+                $not_exit = $self->Login();
+                last if $self->use_offline;
             }
-        }
+            $self->CheckUpload;
+        }
         $self->_init_imagelist;
         $self->_init_thumbimagelist;
         $self->_set_stored_layout;
-        #$self->_init_frame;
-    }
-    #Wx::LogMessage("bin dir %s", $bin_dir);
+    }
+
     $not_exit;
 }
@@ -557 +557 @@
             $use_new_imagelist = 1 unless $self->imagelist_version eq $stored_imagelist->{imagelist_version};
         }
+        # make sure we really have
         $use_new_imagelist = 1 unless defined $stored_imagelist;
 
-                if($use_new_imagelist){
+        if($use_new_imagelist){
             Wx::LogMessage(gettext("pLoader has to reset image cache."));
             # and silently clean layout
@@ -983 +984 @@
 
 
+sub CheckUpload {
+    my ( $self ) = @_;
+
+    my $err_msg = $self->pwg->CheckUpload;
+
+    $err_msg = gettext("Your user account is not granted to upload photos") if
+        'Access denied' eq $err_msg;
+
+    Wx::LogMessage("%s", $err_msg) if $err_msg;
+
+    $err_msg;
+}
 1;

extensions/pLoader/trunk/src/Uploader/ImageList.pm

@@ -1597 +1597 @@
 }
 
+
+sub CheckUpload {
+    my ( $self ) = @_;
+
+    $self->pwg->CheckUpload;
+}
+
 1;

extensions/pLoader/trunk/src/Uploader/PWG.pm

@@ -56 +56 @@
     }
     else{
+        $self->GetMethods;
         $self->RefreshCategories;
         $self->RefreshTags;

extensions/pLoader/trunk/src/Uploader/PWG/WebServices.pm

@@ -43 +43 @@
            qry_list_categories
            qry_add_categories
+           qry_list_methods
            qry_list_tags
+           qry_check_upload
            items
            tags
@@ -71 +73 @@
            multiple_value_mode
            privacy_level
+           is_method_available
       / 
 );
@@ -145 +148 @@
         $self->urlbase,
         'pwg.tags.getAdminList',
+    );
+
+    $self->qry_list_methods( sprintf
+        "%s/ws.php?format=json&method=%s",
+        $self->urlbase,
+        'reflection.getMethodList',
+    );
+
+    $self->qry_check_upload( sprintf
+        "%s/ws.php?format=json&method=%s",
+        $self->urlbase,
+        'pwg.images.checkUpload',
     );
 
@@ -193 +208 @@
         };
     }
-    
+
+    if(401 == $self->uagent_response->code){
+        $hresult->{message} = 'Access denied';
+    }
+
     $hresult;
 }
@@ -237 +256 @@
     return ( $result->is_success, $result->status_line );
 }
+
 sub GetCategories {
     my ( $self ) = @_;
@@ -268 +288 @@
 } 
 
+sub CheckUpload {
+    my ( $self ) = @_;
+
+    my $err_msg;
+
+    if($self->is_method_available->{'pwg.images.checkUpload'}){
+        $self->_execute_get(
+            $self->qry_check_upload
+        );
+#        my $result = $self->_json_response_content->{result};
+        my $hresult = $self->_json_response_content;
+
+        $err_msg = 'ok' eq $hresult->{stat} ?
+            $hresult->{result}{message} :
+            $hresult->{message};
+    }
+
+    $err_msg;
+}
+
+sub GetMethods {
+    my ( $self ) = @_;
+
+    $self->_execute_get(
+        $self->qry_list_methods    
+    );
+
+    my $methods = $self->_json_response_content->{result}{methods};
+
+    $self->is_method_available(
+        {}
+    );
+
+    map {
+        $self->is_method_available->{$_}++
+    }@$methods;
+
+    $methods;
+}
 
 sub UploadImage {