Avoid sending too many requests at the same time while downloading fo…

…lder
haiwen · Jul 3, 2016 · 5301363 · 5301363
1 parent 38a1d87
commit 5301363
Show file tree

Hide file tree

Showing 25 changed files with 21 additions and 9 deletions.
diff --git a/SeafProvider/Info.plist b/SeafProvider/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

diff --git a/SeafProviderFileProvider/Info.plist b/SeafProviderFileProvider/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

diff --git a/common/SeafConnection.m b/common/SeafConnection.m
@@ -624,7 +624,6 @@ - (NSURLRequest *)buildRequest:(NSString *)url method:(NSString *)method form:(N
     if (self.token)
         [request setValue:[NSString stringWithFormat:@"Token %@", self.token] forHTTPHeaderField:@"Authorization"];
 
-    Debug("Request: %@", request.URL);
     return request;
 }
 
@@ -633,6 +632,8 @@ - (void)sendRequestAsync:(NSString *)url method:(NSString *)method form:(NSStrin
                  failure:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, id JSON, NSError *error))failure
 {
     NSURLRequest *request = [self buildRequest:url method:method form:form];
+    Debug("Request: %@", request.URL);
+
     NSURLSessionDataTask *task = [_sessionMgr dataTaskWithRequest:request completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
         NSHTTPURLResponse *resp = (NSHTTPURLResponse *)response;
         if (error) {
@@ -1339,14 +1340,17 @@ - (void)clearUploadingVideos
 - (void)downloadDir:(SeafDir *)dir
 {
     [dir downloadContentSuccess:^(SeafDir *dir) {
+        Debug("dir %@ items: %d", dir.path, dir.items.count);
+        long delay = 1;
         for (SeafBase *item in dir.items) {
+            delay += 1;
             if ([item isKindOfClass:[SeafFile class]]) {
                 SeafFile *file = (SeafFile *)item;
-                Debug("download file: %@, %@", item.repoId, item.path );
-                [SeafGlobal.sharedObject addDownloadTask:file];
+                Debug("download file: %@, %@ after %ld ms", item.repoId, item.path, delay);
+                [SeafGlobal.sharedObject performSelector:@selector(addDownloadTask:) withObject:file afterDelay:delay];
             } else if ([item isKindOfClass:[SeafDir class]]) {
-                Debug("download dir: %@, %@", item.repoId, item.path );
-                [self downloadDir:(SeafDir *)item];
+                Debug("download dir: %@, %@ after %ld ms", item.repoId, item.path, delay);
+                [self performSelector:@selector(downloadDir:) withObject:(SeafDir *)item afterDelay:delay];
             }
         }
     } failure:^(SeafDir *dir) {

diff --git a/common/SeafFile.m b/common/SeafFile.m
@@ -252,6 +252,7 @@ - (void)downloadThumb
     int size = THUMB_SIZE * (int)[[UIScreen mainScreen] scale];
     NSString *thumburl = [NSString stringWithFormat:API_URL"/repos/%@/thumbnail/?size=%d&p=%@", self.repoId, size, self.path.escapedUrl];
     NSURLRequest *downloadRequest = [connection buildRequest:thumburl method:@"GET" form:nil];
+    Debug("Request: %@", downloadRequest.URL);
     NSString *target = [self thumbPath:self.oid];
     @synchronized (self) {
         if (_thumbtask) return;

diff --git a/seafile/SeafFileViewController.m b/seafile/SeafFileViewController.m
@@ -276,7 +276,7 @@ - (void)refreshView
             [self noneSelected:NO];
     }
     if (_directory && !_directory.hasCache) {
-        Debug("no cache, load from server.");
+        Debug("no cache, load %@ from server.", _directory.path);
         [self showLoadingView];
         self.state = STATE_LOADING;
     }

diff --git a/seafile/StartViewController.m b/seafile/StartViewController.m
@@ -255,6 +255,7 @@ - (void)checkSelectAccount:(SeafConnection *)conn completeHandler:(void (^)(bool
         BOOL ret = [self selectAccount:conn];
         return handler(ret);
     }
+    Debug("verify touchId for %@ %@", conn.address, conn.username);
     [self checkTouchId:^(bool success) {
         if (success) {
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.), dispatch_get_main_queue(), ^{

diff --git a/seafile/ca.lproj/Localizable.strings b/seafile/ca.lproj/Localizable.strings
diff --git a/seafile/cs.lproj/Localizable.strings b/seafile/cs.lproj/Localizable.strings
diff --git a/seafile/de.lproj/Localizable.strings b/seafile/de.lproj/Localizable.strings
diff --git a/seafile/es.lproj/Localizable.strings b/seafile/es.lproj/Localizable.strings
diff --git a/seafile/fr.lproj/Localizable.strings b/seafile/fr.lproj/Localizable.strings
diff --git a/seafile/hu.lproj/Localizable.strings b/seafile/hu.lproj/Localizable.strings
diff --git a/seafile/is.lproj/Localizable.strings b/seafile/is.lproj/Localizable.strings
diff --git a/seafile/it.lproj/Localizable.strings b/seafile/it.lproj/Localizable.strings
diff --git a/seafile/ja.lproj/Localizable.strings b/seafile/ja.lproj/Localizable.strings
diff --git a/seafile/ko.lproj/Localizable.strings b/seafile/ko.lproj/Localizable.strings
diff --git a/seafile/nb.lproj/Localizable.strings b/seafile/nb.lproj/Localizable.strings
diff --git a/seafile/pl.lproj/Localizable.strings b/seafile/pl.lproj/Localizable.strings
diff --git a/seafile/pt-BR.lproj/Localizable.strings b/seafile/pt-BR.lproj/Localizable.strings
diff --git a/seafile/pt-PT.lproj/Localizable.strings b/seafile/pt-PT.lproj/Localizable.strings
diff --git a/seafile/ru.lproj/Localizable.strings b/seafile/ru.lproj/Localizable.strings
diff --git a/seafile/seafile-appstore-Info.plist b/seafile/seafile-appstore-Info.plist
@@ -67,7 +67,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/seafile/tr.lproj/Localizable.strings b/seafile/tr.lproj/Localizable.strings
diff --git a/seafile/zh-Hans.lproj/Localizable.strings b/seafile/zh-Hans.lproj/Localizable.strings
diff --git a/seafilePro.xcodeproj/project.pbxproj b/seafilePro.xcodeproj/project.pbxproj
@@ -1903,6 +1903,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: xie zheng (V5PK24Q5Y5)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
+				ENABLE_BITCODE = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "seafile/seafile-Prefix.pch";
 				HEADER_SEARCH_PATHS = "$(inherited)";
@@ -1932,6 +1933,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
+				ENABLE_BITCODE = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "seafile/seafile-Prefix.pch";
 				HEADER_SEARCH_PATHS = "$(inherited)";
@@ -1964,6 +1966,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
+				ENABLE_BITCODE = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -1998,6 +2001,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Seafile Inc. (55LCTZ5354)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
+				ENABLE_BITCODE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@@ -2029,6 +2033,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
+				ENABLE_BITCODE = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -2065,6 +2070,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Seafile Inc. (55LCTZ5354)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
+				ENABLE_BITCODE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;