Refactoring: CCPackageInstaller won't enable the package anymore, this is done in the CCPackageManager now.

CCPackageCocos2dEnabler will set relevant status instead of CCPackageManager.

Author: NickyWeber

cocos2d/CCPackageCocos2dEnabler.h

@@ -7,6 +7,7 @@
  *  Note: This method won't check a package's status and it is meant to be used for initialization
  *  of packages on startup by the CCPackagesManager.
  *  If a package is already among the search path then it won't be added again, spritesheets and file lookups not reloaded
+ *  Sets the package's status to CCPackageStatusInstalledEnabled
  *
  *  @param packages An array of CCPackage instance to be enabled
  */
@@ -17,6 +18,7 @@
  *  of remaining search paths.
  *  Note: This method won't check a package's status and it is meant to be used for initialization
  *  of packages on startup by the CCPackagesManager.
+ *  Sets the package's status to CCPackageStatusInstalledDisabled*
  *
  *  @param packages An array of CCPackage instance to be disabled
  */

cocos2d/CCPackageCocos2dEnabler.m

@@ -39,11 +39,15 @@ - (BOOL)addPackagestoSearchPath:(NSArray *)packages
 
     for (CCPackage *aPackage in packages)
     {
+        NSAssert(aPackage.installURL != nil, @"aPackage.installURL must not be nil for package %@", aPackage);
+
         NSMutableArray *newSearchPath = [[CCFileUtils sharedFileUtils].searchPath mutableCopy];
         NSString *newPackagePath = aPackage.installURL.path;
 
         if (![newSearchPath containsObject:newPackagePath])
         {
+            [aPackage setValue:@(CCPackageStatusInstalledEnabled) forKey:NSStringFromSelector(@selector(status))];
+
             [newSearchPath insertObject:newPackagePath atIndex:0];
             [CCFileUtils sharedFileUtils].searchPath = newSearchPath;
             searchPathChanged = YES;
@@ -71,6 +75,8 @@ - (void)removePackagesFromSearchPath:(NSArray *)packages
         NSMutableArray *newSearchPath = [[CCFileUtils sharedFileUtils].searchPath mutableCopy];
         NSString *packagePathToRemove = aPackage.installURL.path;
 
+        [aPackage setValue:@(CCPackageStatusInstalledDisabled) forKey:NSStringFromSelector(@selector(status))];
+
         if ([newSearchPath containsObject:packagePathToRemove])
         {
             [newSearchPath removeObject:packagePathToRemove];

cocos2d/CCPackageInstaller.m

@@ -51,25 +51,11 @@ - (BOOL)installWithError:(NSError **)error
         return NO;
     }
 
-    if (installData.enableOnDownload)
-    {
-        [self enablePackageInCocos2d];
-        [_package setValue:@(CCPackageStatusInstalledEnabled) forKey:@"status"];
-    }
-    else
-    {
-        [_package setValue:@(CCPackageStatusInstalledDisabled) forKey:@"status"];
-    }
+    [_package setValue:@(CCPackageStatusInstalledDisabled) forKey:@"status"];
 
     return YES;
 }
 
-- (void)enablePackageInCocos2d
-{
-    CCPackageCocos2dEnabler *packageCocos2dEnabler = [[CCPackageCocos2dEnabler alloc] init];
-    [packageCocos2dEnabler enablePackages:@[_package]];
-}
-
 - (BOOL)movePackageToInstallPathWithError:(NSError **)error
 {
     CCPackageInstallData *installData = [_package installData];

cocos2d/CCPackageManager.m

@@ -156,15 +156,6 @@ - (void)enablePackages
     [packageCocos2dEnabler enablePackages:packagesToEnable];
 }
 
-- (void)storePackagesAndPauseDownloads
-{
-    CCLOGINFO(@"[PACKAGE][INFO] Packages info saved to userdefaults.");
-
-    [_downloadManager pauseAllDownloads];
-
-    [self savePackages];
-}
-
 - (void)savePackages
 {
     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
@@ -469,6 +460,13 @@ - (BOOL)installPackage:(CCPackage *)package
         return NO;
     }
 
+    CCPackageInstallData *installData = [package installData];
+    if (installData.enableOnDownload)
+    {
+        CCPackageCocos2dEnabler *packageCocos2dEnabler = [[CCPackageCocos2dEnabler alloc] init];
+        [packageCocos2dEnabler enablePackages:@[package]];
+    }
+
     CCLOGINFO(@"[PACKAGE/INSTALL][INFO] Installation of package successful! Package enabled: %d", [package installData].enableOnDownload);
 
     [_delegate packageInstallationFinished:package];
@@ -594,8 +592,6 @@ - (BOOL)disablePackage:(CCPackage *)package error:(NSError **)error
     CCPackageCocos2dEnabler *packageCocos2dEnabler = [[CCPackageCocos2dEnabler alloc] init];
     [packageCocos2dEnabler disablePackages:@[package]];
 
-    [package setValue:@(CCPackageStatusInstalledDisabled) forKey:@"status"];
-
     if (![_packages containsObject:package])
     {
         [_packages addObject:package];
@@ -624,8 +620,6 @@ - (BOOL)enablePackage:(CCPackage *)package error:(NSError **)error
     CCPackageCocos2dEnabler *packageCocos2dEnabler = [[CCPackageCocos2dEnabler alloc] init];
     [packageCocos2dEnabler enablePackages:@[package]];
 
-    [package setValue:@(CCPackageStatusInstalledEnabled) forKey:@"status"];
-
     if (![_packages containsObject:package])
     {
         [_packages addObject:package];