[shotwell/shotwell-0.30] Revert "split uploads into batches of 50"



commit 622428a750ee927fb30545fd0d66a74367f3eced
Author: Jens Georg <mail jensge org>
Date:   Tue Sep 6 15:39:28 2022 +0200

    Revert "split uploads into batches of 50"
    
    This reverts commit e3fcbd3243aaf779a1c0ddee7b2cfd8b9dbefe3b.

 plugins/shotwell-publishing/PhotosPublisher.vala | 52 +++++++++---------------
 1 file changed, 19 insertions(+), 33 deletions(-)
---
diff --git a/plugins/shotwell-publishing/PhotosPublisher.vala 
b/plugins/shotwell-publishing/PhotosPublisher.vala
index e1127acd..5f464700 100644
--- a/plugins/shotwell-publishing/PhotosPublisher.vala
+++ b/plugins/shotwell-publishing/PhotosPublisher.vala
@@ -7,7 +7,6 @@
 
 namespace Publishing.GooglePhotos {
 internal const string DEFAULT_ALBUM_NAME = N_("Shotwell Connect");
-internal const int MAX_BATCH_SIZE = 50;
 
 internal class Album {
     public string name;
@@ -128,41 +127,28 @@ private class MediaCreationTransaction : Publishing.RESTSupport.GooglePublisher.
     }
 
     public override void execute () throws Spit.Publishing.PublishingError {
-        for (var h = 0; h * MAX_BATCH_SIZE < this.upload_tokens.length; h++) {
-            var offset = h * MAX_BATCH_SIZE;
-            var difference = this.upload_tokens.length - offset;
-            int end;
-
-            if (difference > MAX_BATCH_SIZE) {
-                end = offset + MAX_BATCH_SIZE;
-            }
-            else {
-                end = offset + difference;
-            }
-
-            var builder = new Json.Builder();
+        var builder = new Json.Builder();
+        builder.begin_object();
+        builder.set_member_name("albumId");
+        builder.add_string_value(this.album_id);
+        builder.set_member_name("newMediaItems");
+        builder.begin_array();
+        for (var i = 0; i < this.upload_tokens.length; i++) {
             builder.begin_object();
-            builder.set_member_name("albumId");
-            builder.add_string_value(this.album_id);
-            builder.set_member_name("newMediaItems");
-            builder.begin_array();
-            for (var i = offset; i < end; i++) {
-                builder.begin_object();
-                builder.set_member_name("description");
-                builder.add_string_value(this.titles[i]);
-                builder.set_member_name("simpleMediaItem");
-                builder.begin_object();
-                builder.set_member_name("uploadToken");
-                builder.add_string_value(this.upload_tokens[i]);
-                builder.end_object();
-                builder.end_object();
-            }
-            builder.end_array();
+            builder.set_member_name("description");
+            builder.add_string_value(this.titles[i]);
+            builder.set_member_name("simpleMediaItem");
+            builder.begin_object();
+            builder.set_member_name("uploadToken");
+            builder.add_string_value(this.upload_tokens[i]);
+            builder.end_object();
             builder.end_object();
-            set_custom_payload(Json.to_string (builder.get_root (), false), "application/json");
-
-            base.execute();
         }
+        builder.end_array();
+        builder.end_object();
+        set_custom_payload(Json.to_string (builder.get_root (), false), "application/json");
+
+        base.execute();
     }
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]