Browse Source

some renames that make the classes functions appear more clear

Kevin Bradley 5 years ago
parent
commit
64bcc26ae0

+ 2 - 2
bootstrapTool/Classes/Defines.h

@@ -3,8 +3,8 @@
 #import "NSObject+Additions.h"
 #import "NSString+Additions.h"
 #import "ErrorReturn.h"
-#import "Package.h"
-#import "PackageFile.h"
+#import "StatusPackage.h"
+#import "StatusPackageFile.h"
 #import "DebPackageModel.h"
 
 typedef NS_ENUM(NSInteger, BSPackageFileType)

+ 1 - 1
bootstrapTool/Classes/HelperClass.h

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

+ 6 - 6
bootstrapTool/Classes/HelperClass.m

@@ -84,7 +84,7 @@
     return lines;
 }
 
-+ (PackageFile *)packageFileFromLine:(NSString *)inputLine {
++ (StatusPackageFile *)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];
     
-    PackageFile *pf = [PackageFile new];
+    StatusPackageFile *pf = [StatusPackageFile new];
     [pf _setFileTypeFromRaw:fileTypeChar];
     
     switch (pf.type) {
@@ -247,17 +247,17 @@
 
 
 
-+ (Package *)packageForDeb:(NSString *)debFile {
++ (StatusPackage *)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 <PackageFile *> *fileList = [self returnForProcess:[NSString stringWithFormat:@"/usr/local/bin/dpkg -c %@", debFile]];
+    NSArray <StatusPackageFile *> *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) {
         
-        PackageFile *file = [self packageFileFromLine:obj];
+        StatusPackageFile *file = [self packageFileFromLine:obj];
         if (file) {
             //DLog(@"%@", file);
             [finalArray addObject:file];
@@ -265,7 +265,7 @@
         
     }];
     
-    Package *pkg = [Package new];
+    StatusPackage *pkg = [StatusPackage new];
     pkg.files = finalArray;
     pkg.packageName = packageName;
     pkg.version = packageVersion;

+ 3 - 3
bootstrapTool/Classes/Package.h

@@ -1,9 +1,9 @@
 
-#import "PackageFile.h"
+#import "StatusPackageFile.h"
 
-@interface Package: NSObject
+@interface StatusPackage: NSObject
 
-@property (nonatomic, strong) NSArray <PackageFile *> *files;
+@property (nonatomic, strong) NSArray <StatusPackageFile *> *files;
 @property (nonatomic, strong) NSArray  *controlFiles;
 @property (nonatomic, strong) NSString *packageName;
 @property (nonatomic, strong) NSString *version;

+ 4 - 4
bootstrapTool/Classes/Package.m

@@ -1,8 +1,8 @@
-#import "Package.h"
+#import "StatusPackage.h"
 #import "ErrorReturn.h"
 #import "HelperClass.h"
 
-@implementation Package
+@implementation StatusPackage
 
 - (NSString*) description {
     
@@ -24,7 +24,7 @@
 - (NSString *)listfile {
     
     __block NSMutableArray *outFiles = [NSMutableArray new];
-    [self.files enumerateObjectsUsingBlock:^(PackageFile * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+    [self.files enumerateObjectsUsingBlock:^(StatusPackageFile * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         
         if ([obj.fileType isEqualToString:@"link"]){ //does this need to handle things differently?
             [outFiles addObject:obj.path];
@@ -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:^(PackageFile * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+    [self.files enumerateObjectsUsingBlock:^(StatusPackageFile * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         
         if ([obj.fileType isEqualToString:@"file"]){
             

+ 1 - 1
bootstrapTool/Classes/PackageFile.h

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

+ 4 - 4
bootstrapTool/Classes/PackageFile.m

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

+ 2 - 2
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);
-            Package *output = [HelperClass packageForDeb:repackage];
+            StatusPackage *output = [HelperClass packageForDeb:repackage];
             
             DLog(@"\nFound package: '%@' at version: '%@'...\n", output.packageName, output.version );
             
@@ -367,7 +367,7 @@ int main(int argc, const char * argv[]) {
             //DLog(@"installedPackages: %@", installedPackages);
             
             DLog(@"\nProcessing file: %@\n", debFile);
-            Package *output = [HelperClass packageForDeb:debFile];
+            StatusPackage *output = [HelperClass packageForDeb:debFile];
             
             DLog(@"\nFound package: '%@' at version: '%@'...\n", output.packageName, output.version );