Browse Source

just kidding, these names are better

Kevin Bradley 5 years ago
parent
commit
81352597a6

+ 3 - 3
bootstrapTool/Classes/Defines.h

@@ -3,9 +3,9 @@
 #import "NSObject+Additions.h"
 #import "NSString+Additions.h"
 #import "ErrorReturn.h"
-#import "StatusPackage.h"
-#import "StatusPackageFile.h"
-#import "DebPackageModel.h"
+#import "InputPackage.h"
+#import "InputPackageFile.h"
+#import "StatusPackageModel.h"
 
 typedef NS_ENUM(NSInteger, BSPackageFileType)
 {

+ 2 - 2
bootstrapTool/Classes/HelperClass.h

@@ -3,8 +3,8 @@
 
 + (BOOL)shouldContinueWithError:(NSString *)errorMessage;
 + (NSArray *)returnForProcess:(NSString *)call;
-+ (StatusPackage *)packageForDeb:(NSString *)debFile;
++ (InputPackage *)packageForDeb:(NSString *)debFile;
 + (NSString *)octalFromSymbols:(NSString *)theSymbols;
-+ (NSArray <DebPackageModel*>*)statusInstalledPackagesFromFile:(NSString *)statusFile;
++ (NSArray <StatusPackageModel*>*)statusInstalledPackagesFromFile:(NSString *)statusFile;
 
 @end

+ 9 - 9
bootstrapTool/Classes/HelperClass.m

@@ -1,10 +1,10 @@
 
 #import "HelperClass.h"
-#import "DebPackageModel.h"
+#import "StatusPackageModel.h"
 
 @implementation HelperClass
 
-+ (NSArray <DebPackageModel*>*)statusInstalledPackagesFromFile:(NSString *)statusFile
++ (NSArray <StatusPackageModel*>*)statusInstalledPackagesFromFile:(NSString *)statusFile
 {
     
     if (![FM fileExistsAtPath:statusFile]) {
@@ -18,7 +18,7 @@
     for (id currentItem in lineArray)
     {
         
-        DebPackageModel *debModel = [[DebPackageModel alloc] initWithRawControlString:currentItem];
+        StatusPackageModel *debModel = [[StatusPackageModel alloc] initWithRawControlString:currentItem];
         if (debModel != nil)
             [mutableList addObject:debModel];
     }
@@ -84,7 +84,7 @@
     return lines;
 }
 
-+ (StatusPackageFile *)packageFileFromLine:(NSString *)inputLine {
++ (InputPackageFile *)packageFileFromLine:(NSString *)inputLine {
     //    "-rwxr-xr-x  0 root   wheel   69424 Oct 22 03:56 ./Library/MobileSubstrate/DynamicLibraries/beigelist7.dylib\n",
     
     //-rwxr-xr-x root/staff    10860 2011-02-02 03:55 ./Library/Frameworks/CydiaSubstrate.framework/Commands/cycc
@@ -130,7 +130,7 @@
     //NSString *fullPath = [NSString stringWithFormat:@"/%@", path];
     NSString *fullPath = [path substringFromIndex:1];
     
-    StatusPackageFile *pf = [StatusPackageFile new];
+    InputPackageFile *pf = [InputPackageFile new];
     [pf _setFileTypeFromRaw:fileTypeChar];
     
     switch (pf.type) {
@@ -247,17 +247,17 @@
 
 
 
-+ (StatusPackage *)packageForDeb:(NSString *)debFile {
++ (InputPackage *)packageForDeb:(NSString *)debFile {
     
     NSString *packageName = [[self returnForProcess:[NSString stringWithFormat:@"/usr/local/bin/dpkg -f %@ Package", debFile]] componentsJoinedByString:@"\n"];
     NSString *packageVersion = [[self returnForProcess:[NSString stringWithFormat:@"/usr/local/bin/dpkg -f %@ Version", debFile]] componentsJoinedByString:@"\n"];
-    NSArray <StatusPackageFile *> *fileList = [self returnForProcess:[NSString stringWithFormat:@"/usr/local/bin/dpkg -c %@", debFile]];
+    NSArray <InputPackageFile *> *fileList = [self returnForProcess:[NSString stringWithFormat:@"/usr/local/bin/dpkg -c %@", debFile]];
     
     __block NSMutableArray *finalArray = [NSMutableArray new];
     
     [fileList enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         
-        StatusPackageFile *file = [self packageFileFromLine:obj];
+        InputPackageFile *file = [self packageFileFromLine:obj];
         if (file) {
             //DLog(@"%@", file);
             [finalArray addObject:file];
@@ -265,7 +265,7 @@
         
     }];
     
-    StatusPackage *pkg = [StatusPackage new];
+    InputPackage *pkg = [InputPackage new];
     pkg.files = finalArray;
     pkg.packageName = packageName;
     pkg.version = packageVersion;

+ 5 - 3
bootstrapTool/Classes/StatusPackage.h

@@ -1,9 +1,11 @@
 
-#import "StatusPackageFile.h"
+//the input deb file that is processing
 
-@interface StatusPackage: NSObject
+#import "InputPackageFile.h"
 
-@property (nonatomic, strong) NSArray <StatusPackageFile *> *files;
+@interface InputPackage: NSObject
+
+@property (nonatomic, strong) NSArray <InputPackageFile *> *files;
 @property (nonatomic, strong) NSArray  *controlFiles;
 @property (nonatomic, strong) NSString *packageName;
 @property (nonatomic, strong) NSString *version;

+ 5 - 5
bootstrapTool/Classes/StatusPackage.m

@@ -1,8 +1,8 @@
-#import "StatusPackage.h"
+#import "InputPackage.h"
 #import "ErrorReturn.h"
 #import "HelperClass.h"
 
-@implementation StatusPackage
+@implementation InputPackage
 
 - (NSString*) description {
     
@@ -24,7 +24,7 @@
 - (NSString *)listfile {
     
     __block NSMutableArray *outFiles = [NSMutableArray new];
-    [self.files enumerateObjectsUsingBlock:^(StatusPackageFile * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+    [self.files enumerateObjectsUsingBlock:^(InputPackageFile * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         
         if ([obj.fileType isEqualToString:@"link"]){ //does this need to handle things differently?
             [outFiles addObject:obj.path];
@@ -36,7 +36,7 @@
     
 }
 
-- (void)repackageFile:(DebPackageModel *)file arch:(NSString *)newArch {
+- (void)repackageFile:(StatusPackageModel *)file arch:(NSString *)newArch {
 /*
     NSString *pwd = [[HelperClass returnForProcess:@"/bin/pwd"] componentsJoinedByString:@"\n"];
     DLog(@"\nProcessing file: %@\n", file);
@@ -112,7 +112,7 @@
     NSFileManager *man = [NSFileManager defaultManager];
     __block NSInteger returnValue = 0; //0 = good to go 1 = over write warning, 2 = no go
     __block NSMutableArray *_overwriteArray = [NSMutableArray new];
-    [self.files enumerateObjectsUsingBlock:^(StatusPackageFile * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+    [self.files enumerateObjectsUsingBlock:^(InputPackageFile * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         
         if ([obj.fileType isEqualToString:@"file"]){
             

+ 1 - 1
bootstrapTool/Classes/StatusPackageFile.h

@@ -1,6 +1,6 @@
 
 
-@interface StatusPackageFile: NSObject
+@interface InputPackageFile: NSObject
 
 @property (nonatomic, strong) NSString *fileType;
 @property (nonatomic, strong) NSString *permissions;

+ 4 - 4
bootstrapTool/Classes/StatusPackageFile.m

@@ -1,12 +1,12 @@
 
-#import "StatusPackageFile.h"
+#import "InputPackageFile.h"
 
-@implementation StatusPackageFile
+@implementation InputPackageFile
 
 - (void)_setFileTypeFromRaw:(NSString *)rawType {
     
-    _fileType = [StatusPackageFile readableFileTypeForRawMode:rawType];
-    _type = [StatusPackageFile fileTypeForRawMode:rawType];
+    _fileType = [InputPackageFile readableFileTypeForRawMode:rawType];
+    _type = [InputPackageFile fileTypeForRawMode:rawType];
     
     
 }

+ 2 - 1
bootstrapTool/Classes/DebPackageModel.h

@@ -1,6 +1,7 @@
 
+//that packages inside the status folder
 
-@interface DebPackageModel : NSObject
+@interface StatusPackageModel : NSObject
 
 @property (nonatomic, copy) NSString *name;
 @property (nonatomic, copy) NSString *package;

+ 3 - 3
bootstrapTool/Classes/DebPackageModel.m

@@ -1,5 +1,5 @@
 
-@implementation DebPackageModel
+@implementation StatusPackageModel
 
 - (NSString *)description {
     
@@ -116,7 +116,7 @@
             
             if ([key isEqualToString:@"Depends"]) //process the array
             {
-                NSArray *dependsObject = [DebPackageModel dependencyArrayFromString:object];
+                NSArray *dependsObject = [StatusPackageModel dependencyArrayFromString:object];
                 
                 [currentPackage setObject:dependsObject forKey:key];
                 
@@ -143,7 +143,7 @@
     
     NSArray *ourProps = [self properties];
     NSArray *allKeys = [theProps allKeys];
-    NSDictionary *mappedKeys = [DebPackageModel JSONKeyPathsByPropertyKey];
+    NSDictionary *mappedKeys = [StatusPackageModel JSONKeyPathsByPropertyKey];
     [ourProps enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         
         NSString *mappedProp = mappedKeys[obj];

+ 9 - 9
bootstrapTool/main.m

@@ -122,7 +122,7 @@ int main(int argc, const char * argv[]) {
             
             NSString *pwd = [[HelperClass returnForProcess:@"/bin/pwd"] componentsJoinedByString:@"\n"];
             DLog(@"\nProcessing file: %@\n", repackage);
-            StatusPackage *output = [HelperClass packageForDeb:repackage];
+            InputPackage *output = [HelperClass packageForDeb:repackage];
             
             DLog(@"\nFound package: '%@' at version: '%@'...\n", output.packageName, output.version );
             
@@ -164,11 +164,11 @@ int main(int argc, const char * argv[]) {
             DLog(@"\n [INFO] Cleaning status file: %@", statusFile);
             
             NSString *testStatusFile = [bootstrapPath stringByAppendingPathComponent:@"Library/dpkg/status"];
-            NSArray <DebPackageModel*> *installedPackages = [HelperClass statusInstalledPackagesFromFile:statusFile];
+            NSArray <StatusPackageModel*> *installedPackages = [HelperClass statusInstalledPackagesFromFile:statusFile];
             __block NSMutableString *newStatusFile = [NSMutableString new];
             __block NSMutableArray *alreadyAdded = [NSMutableArray new];
             
-            [installedPackages enumerateObjectsUsingBlock:^(DebPackageModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            [installedPackages enumerateObjectsUsingBlock:^(StatusPackageModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
                 
                 DLog(@"\n [INFO] Processing pacakge: %@", obj.package);
                 
@@ -180,7 +180,7 @@ int main(int argc, const char * argv[]) {
                     if (doubleCheck.count > 1){
                         
                         NSSortDescriptor *sortDesc = [NSSortDescriptor sortDescriptorWithKey:@"version" ascending:FALSE];
-                        DebPackageModel *latestVersion = [[doubleCheck sortedArrayUsingDescriptors:@[sortDesc]] firstObject];
+                        StatusPackageModel *latestVersion = [[doubleCheck sortedArrayUsingDescriptors:@[sortDesc]] firstObject];
                         DLog(@"\n [INFO] We found a duplicate package, choosing latestVersion: %@", latestVersion);
                         
                         
@@ -223,9 +223,9 @@ int main(int argc, const char * argv[]) {
             __block NSString *postInstFile = nil;
             
             NSString *statusFile = [bootstrapPath stringByAppendingPathComponent:@"Library/dpkg/status"];
-            NSArray <DebPackageModel*> *installedPackages = [HelperClass statusInstalledPackagesFromFile:statusFile];
+            NSArray <StatusPackageModel*> *installedPackages = [HelperClass statusInstalledPackagesFromFile:statusFile];
             
-            DebPackageModel *model = [[installedPackages filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"package == %@", deletePackage]] lastObject];
+            StatusPackageModel *model = [[installedPackages filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"package == %@", deletePackage]] lastObject];
             
             if (model) {
                 
@@ -309,7 +309,7 @@ int main(int argc, const char * argv[]) {
 
                 __block NSMutableString *newStatusFile = [NSMutableString new];
                 
-                [installedPackages enumerateObjectsUsingBlock:^(DebPackageModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+                [installedPackages enumerateObjectsUsingBlock:^(StatusPackageModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
                     
                     if (obj != model){
                         
@@ -367,13 +367,13 @@ int main(int argc, const char * argv[]) {
             //DLog(@"installedPackages: %@", installedPackages);
             
             DLog(@"\nProcessing file: %@\n", debFile);
-            StatusPackage *output = [HelperClass packageForDeb:debFile];
+            InputPackage *output = [HelperClass packageForDeb:debFile];
             
             DLog(@"\nFound package: '%@' at version: '%@'...\n", output.packageName, output.version );
             
             
             
-            DebPackageModel *model = [[installedPackages filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"package == %@", output.packageName]] lastObject];
+            StatusPackageModel *model = [[installedPackages filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"package == %@", output.packageName]] lastObject];
             
             if (model) {