Refreshing should be faster now, some optimization

bolencki13 · bolencki13 · commit 3f963460e0b5 · 2016-11-22T12:20:21.000-05:00
diff --git a/APTOFileParser.m b/APTOFileParser.m
@@ -1,4 +1,4 @@
-//
+
 //  APTOFileParser.m
 //  
 //
@@ -22,20 +22,23 @@ - (instancetype)initWithFilePath:(NSString*)filePath {
     return self;
 }
 - (void)enumeratePackageContentsUsingBlock:(void(^)(NSString *packageContents))block {
-    FILE *file = fopen([_filePath UTF8String], "r");
-    
-    int lineBuffer = 256;
-    char buffer[lineBuffer];
-    
-    NSString *packageContents = @"";
-    while (fgets(buffer, sizeof(char)*lineBuffer, file) != NULL){
-        NSString *line = [NSString stringWithUTF8String:buffer];
+    @autoreleasepool {
+        FILE *file = fopen([_filePath UTF8String], "r");
+        if (!file) return;
+        
+        int lineBuffer = 256;
+        char buffer[lineBuffer];
         
-        if ([line isEqualToString:@"\n"]) {
-            block(packageContents);
-            packageContents = @"";
-        } else {
-            packageContents = [packageContents stringByAppendingString:line];
+        NSString *packageContents = @"";
+        while (fgets(buffer, sizeof(char)*lineBuffer, file) != NULL){
+            NSString *line = [NSString stringWithUTF8String:buffer];
+            
+            if ([line isEqualToString:@"\n"]) {
+                block(packageContents);
+                packageContents = @"";
+            } else {
+                packageContents = [packageContents stringByAppendingString:line];
+            }
         }
     }
 }
diff --git a/APTOPackageManager.h b/APTOPackageManager.h
@@ -21,6 +21,7 @@ typedef void (^PackageManagerCallBack)(NSString *line);
 - (APTOPackage*)packageWithBundleIdentifier:(NSString*)bundleIdentifer;
 - (NSArray*)installedPackages;
 - (BOOL)install:(APTOPackage*)package callBack:(PackageManagerCallBack)callBack;
+- (BOOL)remove:(APTOPackage*)package callBack:(PackageManagerCallBack)callBack;
 - (NSArray*)dependanciesForPackage:(APTOPackage*)package error:(NSError**)error;
 - (NSArray*)conflictsForPackage:(APTOPackage*)package error:(NSError**)error;
 
diff --git a/APTOPackageManager.m b/APTOPackageManager.m
@@ -47,18 +47,26 @@ - (BOOL)updatePackages {
 #endif
     /* -------------------- */
     
+    __block NSInteger processes = [_sourceManager.sources count]-1;
+    for (APTOSource *source in _sourceManager.sources) {
+        dispatch_queue_t backgroundQueue1 = dispatch_queue_create([source.srcUrl UTF8String], 0);
+        dispatch_async(backgroundQueue1, ^{
+            BOOL success;
+            
+            NSRange range = NSMakeRange([source.packageURL length]-3, 3);
+            if ([[source.packageURL substringWithRange:range] isEqualToString:@"bz2"]) {
+                success = [self downloadSpecialPackage:source.packageURL];
+            } else {
+                success = [self downloadPackageList:source.packageURL];
+            }
+            if (output == YES) output = success;
+            processes--;
+        });
+    }
     
-    [_sourceManager iterateThroughSources:^(APTOSource *source) {
-        BOOL success;
-        
-        NSRange range = NSMakeRange([source.packageURL length]-3, 3);
-        if ([[source.packageURL substringWithRange:range] isEqualToString:@"bz2"]) {
-            success = [self downloadSpecialPackage:source.packageURL];
-        } else {
-            success = [self downloadPackage:source.packageURL];
-        }
-        if (output == YES) output = success;
-    }];
+    while (processes > 0) {
+        [NSThread sleepForTimeInterval:0];
+    }
     
     return output;
 }
@@ -188,16 +196,31 @@ - (BOOL)install:(APTOPackage*)package callBack:(PackageManagerCallBack)callBack
     
     if (dependancies) {
         for (APTOPackage *_package in dependancies) {
-            NSLog(@"%@",_package.pkgName);
+            [self install:_package callBack:^(NSString *line) {
+                if (callBack) callBack(line);
+            }];
         }
     }
     
     if (conflicts) {
         for (APTOPackage *_package in conflicts) {
-            NSLog(@"%@",_package.pkgName);
+            [self remove:_package callBack:^(NSString *line) {
+                if (callBack) callBack(line);
+            }];
         }
     }
     
+    
+    
+//    XXX: Actually install package
+    
+    return output;
+}
+- (BOOL)remove:(APTOPackage*)package callBack:(PackageManagerCallBack)callBack {
+    BOOL output = NO;
+    
+//    XXX: Actually remove package
+    
     return output;
 }
 - (NSArray*)conflictsForPackage:(APTOPackage*)package error:(NSError**)error {
@@ -206,7 +229,6 @@ - (NSArray*)conflictsForPackage:(APTOPackage*)package error:(NSError**)error {
     BOOL firmwareCheck = NO;
     
     for (NSString *item in package.pkgConflicts) {
-        NSLog(@"%@",item);
         NSString *bundleIdentifier = item;
         NSString *version = nil;
         
@@ -245,7 +267,6 @@ - (NSArray*)conflictsForPackage:(APTOPackage*)package error:(NSError**)error {
             firmwareCheck = YES;
         } else {
             APTOPackage *_package = [self packageWithBundleIdentifier:bundleIdentifier];
-            NSLog(@"Input: %@\nOutput: %@",bundleIdentifier, _package.pkgPackage);
             
             if (_package) {
                 if ([version containsString:@">>"]) { /* greater than */
@@ -327,7 +348,6 @@ - (NSArray*)dependanciesForPackage:(APTOPackage*)package error:(NSError**)error
             firmwareCheck = YES;
         } else {
             APTOPackage *_package = [self packageWithBundleIdentifier:bundleIdentifier];
-            NSLog(@"Input: %@\nOutput: %@",bundleIdentifier, _package.pkgPackage);
             
             if (_package) {
                 if ([version containsString:@">>"]) { /* greater than */
@@ -367,7 +387,7 @@ - (NSArray*)dependanciesForPackage:(APTOPackage*)package error:(NSError**)error
 }
 
 #pragma mark - Other
-- (BOOL)downloadPackage:(NSString*)url {
+- (BOOL)downloadPackageList:(NSString*)url {
     NSData *urlData = [NSData dataWithContentsOfURL:[NSURL URLWithString:url]];
     
     if (urlData) {
diff --git a/APTOSourceManager.m b/APTOSourceManager.m
@@ -107,33 +107,44 @@ - (BOOL)removeSource:(NSString *)url {
     return [newFile writeToFile:filePath atomically:YES encoding:NSUTF8StringEncoding error:nil];
 }
 - (BOOL)updateSources {
-    BOOL output = YES;
-    
     NSArray *directory = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:_manager.sourceFile error:nil];
+    
+    __block NSInteger processes = [directory count]-1;
     for (NSString *file in directory) {
-        NSString *content = [self contentsOfFile:[NSString stringWithFormat:@"%@/%@",_manager.sourceFile,file]];
-        if (![content isEqualToString:@""] && content != nil) {
-            NSArray *aryList = [content componentsSeparatedByString:@"\n"];
-            
-            for (NSString *item in aryList) {
-                if ([item length] < 4 || ![[item substringWithRange:NSMakeRange(0,3)] isEqualToString:@"deb"]) continue;
-                
-                NSString *url = [item substringWithRange:NSMakeRange(4, [item length]-4)];
-                url = [url stringByReplacingOccurrencesOfString:@" ./" withString:@""];
+        dispatch_queue_t backgroundQueue1 = dispatch_queue_create([file UTF8String], 0);
+        dispatch_async(backgroundQueue1, ^{
+            NSString *content = [self contentsOfFile:[NSString stringWithFormat:@"%@/%@",_manager.sourceFile,file]];
+            if (![content isEqualToString:@""] && content != nil) {
+                NSArray *aryList = [content componentsSeparatedByString:@"\n"];
                 
-                NSRange original = [url rangeOfString:@" "];
-                if (NSNotFound != original.location) {
-                    url = [url stringByReplacingCharactersInRange:original withString:@"dists/"];
+                for (NSString *item in aryList) {
+                    dispatch_queue_t backgroundQueue2 = dispatch_queue_create([item UTF8String], 0);
+                    dispatch_async(backgroundQueue2, ^{
+                        if ([item length] < 4 || ![[item substringWithRange:NSMakeRange(0,3)] isEqualToString:@"deb"]) return;
+                        
+                        NSString *url = [item substringWithRange:NSMakeRange(4, [item length]-4)];
+                        url = [url stringByReplacingOccurrencesOfString:@" ./" withString:@""];
+                        
+                        NSRange original = [url rangeOfString:@" "];
+                        if (NSNotFound != original.location) {
+                            url = [url stringByReplacingCharactersInRange:original withString:@"dists/"];
+                        }
+                        url = [url stringByReplacingOccurrencesOfString:@" main" withString:@""];
+                        
+                        [self downloadRelease:url];
+                        [self downloadIcon:url];
+                    });
                 }
-                url = [url stringByReplacingOccurrencesOfString:@" main" withString:@""];
-                
-                [self downloadRelease:url];
-                [self downloadIcon:url];
             }
-        }
+            processes--;
+        });
     }
     
-    return output;
+    while (processes > 0) {
+        [NSThread sleepForTimeInterval:0];
+    }
+    
+    return YES;
 }
 - (NSString*)filePathForSource:(NSString*)url {
     NSString *_url;
diff --git a/README.md b/README.md
@@ -4,12 +4,11 @@
 
 **Known Bugs:**
 - Installation and remove of packages is not yet supported (not sure how this will work in sandbox unless we can break it or run as root?)
-- May have some restrictions on what repos can be removed (can be modified)
-- Currently refreshes one source at a time verses all at once (may need to be changed)
-- Sandboxing has lead to a new version being installed will overwrite source.list resetting a persons source list
+- Sandboxing has lead to a new version being installed will overwrite source.list resetting a persons source list (possibly only a simulator bug?)
 
 **Fixed Bugs:**
 - Package files are being miss read. Currently trying to load such a large file will cause it to crash. Attempted to load only the needed part of the file at a time. Some lines are being misses modification to the following should work (APTOFileParser): 
 - Package dependancies are fixed
 - Package conflicts are fixed
 - Currently supports Cydia and Works in sandbox
+- Somewhat optomized for speed. Refreshes all sources at the same time. Refreshes all package lists at the same time
diff --git a/libAPTObjc/.DS_Store b/libAPTObjc/.DS_Store
diff --git a/libAPTObjc/libAPTObjc.xcodeproj/project.xcworkspace/xcuserdata/bolencki13.xcuserdatad/UserInterfaceState.xcuserstate b/libAPTObjc/libAPTObjc.xcodeproj/project.xcworkspace/xcuserdata/bolencki13.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/libAPTObjc/libAPTObjc.xcodeproj/xcuserdata/bolencki13.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/libAPTObjc/libAPTObjc.xcodeproj/xcuserdata/bolencki13.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,22 +2,4 @@
 <Bucket
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../APTOPackageManager.m"
-            timestampString = "501441079.040615"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "159"
-            endingLineNumber = "159"
-            landmarkName = "-packageWithBundleIdentifier:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>
