Freed CCPackage of CCPackageInstallData code.

Author: NickyWeber

cocos2d/CCPackage+InstallData.m

@@ -34,4 +34,12 @@ - (void)removeInstallData
     objc_setAssociatedObject(self, KEY_INSTALL_DATA, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
+- (NSString *)description
+{
+    CCPackageInstallData *installData = [self installData];
+
+    return [NSString stringWithFormat:@"Name: %@, resolution: %@, os: %@, status: %d, folder name: %@\nremoteURL: %@\ninstallURL: %@\nunzipURL: %@\ndownloadURL: %@\n",
+                                      self.name, self.resolution, self.os, self.status, installData.folderName, self.remoteURL, self.installURL, installData.unzipURL, installData.localDownloadURL];
+}
+
 @end

cocos2d/CCPackage.m

@@ -1,17 +1,14 @@
 #import "CCPackage.h"
-#import "CCPackageInstallData.h"
-#import "CCPackage+InstallData.h"
 #import "CCPackageHelper.h"
 
-
-NSUInteger PACKAGE_SERIALIZATION_VERSION = 1;
-NSString *const PACKAGE_SERIALIZATION_KEY_NAME = @"name";
-NSString *const PACKAGE_SERIALIZATION_KEY_RESOLUTION = @"resolution";
-NSString *const PACKAGE_SERIALIZATION_KEY_OS = @"os";
-NSString *const PACKAGE_SERIALIZATION_KEY_REMOTE_URL = @"remoteURL";
-NSString *const PACKAGE_SERIALIZATION_KEY_INSTALL_URL = @"installURL";
-NSString *const PACKAGE_SERIALIZATION_KEY_VERSION = @"version";
-NSString *const PACKAGE_SERIALIZATION_KEY_STATUS = @"status";
+static NSUInteger PACKAGE_SERIALIZATION_VERSION = 1;
+static NSString *const PACKAGE_SERIALIZATION_KEY_NAME = @"name";
+static NSString *const PACKAGE_SERIALIZATION_KEY_RESOLUTION = @"resolution";
+static NSString *const PACKAGE_SERIALIZATION_KEY_OS = @"os";
+static NSString *const PACKAGE_SERIALIZATION_KEY_REMOTE_URL = @"remoteURL";
+static NSString *const PACKAGE_SERIALIZATION_KEY_INSTALL_URL = @"installURL";
+static NSString *const PACKAGE_SERIALIZATION_KEY_VERSION = @"version";
+static NSString *const PACKAGE_SERIALIZATION_KEY_STATUS = @"status";
 
 
 @interface CCPackage()
@@ -67,10 +64,6 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary
     package.installURL = [NSURL URLWithString:dictionary[PACKAGE_SERIALIZATION_KEY_INSTALL_URL]];
     package.status = (CCPackageStatus) [dictionary[PACKAGE_SERIALIZATION_KEY_STATUS] unsignedIntegerValue];
 
-    CCPackageInstallData *installData = [[CCPackageInstallData alloc] initWithPackage:package];
-    [package setInstallData:installData];
-    [installData populateInstallDataWithDictionary:dictionary];
-
     return package;
 }
 
@@ -94,20 +87,9 @@ - (NSDictionary *)toDictionary
         dictionary[PACKAGE_SERIALIZATION_KEY_INSTALL_URL] = [_installURL absoluteString];
     }
 
-    CCPackageInstallData *installData = [self installData];
-    [installData writeInstallDataToDictionary:dictionary];
-
     return dictionary;
 }
 
-- (NSString *)description
-{
-    CCPackageInstallData *installData = [self installData];
-
-    return [NSString stringWithFormat:@"Name: %@, resolution: %@, os: %@, status: %d, folder name: %@\nremoteURL: %@\ninstallURL: %@\nunzipURL: %@\ndownloadURL: %@\n",
-                                      _name, _resolution, _os, _status, installData.folderName, _remoteURL, _installURL, installData.unzipURL, installData.localDownloadURL];
-}
-
 - (NSString *)statusToString
 {
     switch (_status)

cocos2d/CCPackageManager.m

@@ -131,6 +131,11 @@ - (void)loadPackagesFromUserDefaults
     for (NSDictionary *aPackageDict in packages)
     {
         CCPackage *aPackage = [[CCPackage alloc] initWithDictionary:aPackageDict];
+
+        CCPackageInstallData *installData = [[CCPackageInstallData alloc] initWithPackage:aPackage];
+        [aPackage setInstallData:installData];
+        [installData populateInstallDataWithDictionary:aPackageDict];
+
         [_packages addObject:aPackage];
         CCLOGINFO(@"[PACKAGE][INFO] Package info added: %@: %@", [aPackage standardIdentifier], [aPackage statusToString]);
     }
@@ -167,7 +172,12 @@ - (void)savePackages
 
     for (CCPackage *aPackage in _packages)
     {
-        NSDictionary *packageDict = [aPackage toDictionary];
+        NSMutableDictionary *packageDict = [NSMutableDictionary dictionary];
+        CCPackageInstallData *installData = [aPackage installData];
+        [installData writeInstallDataToDictionary:packageDict];
+
+        [packageDict addEntriesFromDictionary:[aPackage toDictionary]];
+
         if (packageDict)
         {
             [packagesToSave addObject:packageDict];