CCPackageHelper added to extract currentOS method from CCPackageManager.

currentOS now a class method.

Author: NickyWeber

cocos2d-ios.xcodeproj/project.pbxproj

@@ -599,6 +599,8 @@
 		E0F924711224140400EF2362 /* CCTexturePVR.h in Headers */ = {isa = PBXBuildFile; fileRef = E0F9246F1224140400EF2362 /* CCTexturePVR.h */; };
 		E0F924721224140400EF2362 /* CCTexturePVR.m in Sources */ = {isa = PBXBuildFile; fileRef = E0F924701224140400EF2362 /* CCTexturePVR.m */; };
 		E0F92AC41224559800EF2362 /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = E0F92AC31224559800EF2362 /* CCNS.h */; };
+		E525F0F74C7C69C4371E20EE /* CCPackageHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F9EA4B5DD37D0418869E /* CCPackageHelper.m */; };
+		E525FCC2CF72D3667DE4D71B /* CCPackageHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = E525FF8C7C018BF691F36044 /* CCPackageHelper.h */; };
 		FC39962219C3BBCF00C93E5E /* libObjectAL (Android).a in Frameworks */ = {isa = PBXBuildFile; fileRef = FC39961F19C3B92F00C93E5E /* libObjectAL (Android).a */; };
 		FC64014019C79716003E595A /* libObjectAL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FC39961B19C3B92F00C93E5E /* libObjectAL.a */; };
 /* End PBXBuildFile section */
@@ -1031,6 +1033,8 @@
 		E0F9246F1224140400EF2362 /* CCTexturePVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTexturePVR.h; sourceTree = "<group>"; };
 		E0F924701224140400EF2362 /* CCTexturePVR.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCTexturePVR.m; sourceTree = "<group>"; };
 		E0F92AC31224559800EF2362 /* CCNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNS.h; sourceTree = "<group>"; };
+		E525F9EA4B5DD37D0418869E /* CCPackageHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPackageHelper.m; sourceTree = "<group>"; };
+		E525FF8C7C018BF691F36044 /* CCPackageHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPackageHelper.h; sourceTree = "<group>"; };
 		FC39961319C3B92F00C93E5E /* ObjectAL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ObjectAL.xcodeproj; path = external/ObjectAL/ObjectAL/ObjectAL.xcodeproj; sourceTree = "<group>"; };
 		FC55599F1991A26300E29CCE /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = "external/ogg/android/ogg/build/Debug-android/libogg.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -1478,6 +1482,8 @@
 				83E1A85719C8AC56000A3BCA /* Download */,
 				83E1A85919C8AC6A000A3BCA /* Unzip */,
 				83E1A85819C8AC65000A3BCA /* Install */,
+				E525FF8C7C018BF691F36044 /* CCPackageHelper.h */,
+				E525F9EA4B5DD37D0418869E /* CCPackageHelper.m */,
 			);
 			name = Packages;
 			sourceTree = "<group>";
@@ -1977,6 +1983,7 @@
 				B78AE46817E7AF1C0028BE0B /* CCScrollView.h in Headers */,
 				B78AE46C17E7AF6C0028BE0B /* UITouch+CC.h in Headers */,
 				B7D2730F1822F4AA0054849B /* CCBKeyframe.h in Headers */,
+				E525FCC2CF72D3667DE4D71B /* CCPackageHelper.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2422,6 +2429,7 @@
 				B78AE46D17E7AF6C0028BE0B /* UITouch+CC.m in Sources */,
 				D33803E318032ECE0072D8FE /* CCPhysicsBody.m in Sources */,
 				D268FE12198078FF00ECBCD0 /* CCEffectHue.m in Sources */,
+				E525F0F74C7C69C4371E20EE /* CCPackageHelper.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

cocos2d/CCPackage.h

@@ -41,7 +41,20 @@
  *
  *  @param name Name of the package
  *  @param resolution Resolution of the package
- *  @param os OS of the package
+ *  @param remoteURL Remote URL of the package
+ *
+ *  @return New instance of CCPackage
+ */
+- (instancetype)initWithName:(NSString *)name
+                  resolution:(NSString *)resolution
+                   remoteURL:(NSURL *)remoteURL;
+
+/**
+ *  Creates a new instance of a package.
+ *
+ *  @param name Name of the package
+ *  @param resolution Resolution of the package
+ *  @param os OS of the package, usally determined internally
  *  @param remoteURL Remote URL of the package
  *
  *  @return New instance of CCPackage

cocos2d/CCPackage.m

@@ -1,6 +1,7 @@
 #import "CCPackage.h"
 #import "CCPackageInstallData.h"
 #import "CCPackage+InstallData.h"
+#import "CCPackageHelper.h"
 
 
 NSUInteger PACKAGE_SERIALIZATION_VERSION = 1;
@@ -48,6 +49,14 @@ - (instancetype)initWithName:(NSString *)name resolution:(NSString *)resolution
     return self;
 }
 
+- (instancetype)initWithName:(NSString *)name resolution:(NSString *)resolution remoteURL:(NSURL *)remoteURL
+{
+    return [[CCPackage alloc] initWithName:name
+                                resolution:resolution
+                                        os:[CCPackageHelper currentOS]
+                                 remoteURL:remoteURL];
+}
+
 - (instancetype)initWithDictionary:(NSDictionary *)dictionary
 {
     CCPackage *package = [[CCPackage alloc] initWithName:dictionary[PACKAGE_SERIALIZATION_KEY_NAME]

cocos2d/CCPackageHelper.h

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+
+
+@interface CCPackageHelper : NSObject
+
++ (NSString *)currentOS;
+
+@end

cocos2d/CCPackageHelper.m

@@ -0,0 +1,21 @@
+#import "CCPackageHelper.h"
+
+
+@implementation CCPackageHelper
+
++ (NSString *)currentOS
+{
+#ifdef __CC_PLATFORM_IOS
+    return @"iOS";
+
+#elif defined(__CC_PLATFORM_MAC)
+    return @"Mac";
+
+#elif defined(__CC_PLATFORM_ANDROID)
+    return @"Android";
+
+#endif
+    return nil;
+}
+
+@end

cocos2d/CCPackageManager.m

@@ -9,6 +9,7 @@
 #import "CCPackage+InstallData.h"
 #import "CCPackageCocos2dEnabler.h"
 #import "ccMacros.h"
+#import "CCPackageHelper.h"
 
 
 @interface CCPackageManager()
@@ -181,7 +182,7 @@ - (CCPackage *)downloadPackageWithName:(NSString *)name resolution:(NSString *)r
 {
     NSAssert(_baseURL != nil, @"baseURL must not be nil");
 
-    NSString *packageName = [NSString stringWithFormat:@"%@-%@-%@.zip", name, [self currentOS], resolution];
+    NSString *packageName = [NSString stringWithFormat:@"%@-%@-%@.zip", name, [CCPackageHelper currentOS], resolution];
     NSURL *remoteURL = [_baseURL URLByAppendingPathComponent:packageName];
 
     return [self downloadPackageWithName:name resolution:resolution remoteURL:remoteURL enableAfterDownload:enableAfterDownload];
@@ -209,10 +210,10 @@ - (CCPackage *)downloadPackageWithName:(NSString *)name resolution:(NSString *)r
         return aPackage;
     }
 
-    CCPackage *package = [[CCPackage alloc] initWithName:name resolution:resolution os:[self currentOS] remoteURL:remoteURL];
     CCPackageInstallData *installData = [[CCPackageInstallData alloc] initWithPackage:package];
     installData.enableOnDownload = enableAfterDownload;
     [package setInstallData:installData];
+    CCPackage *package = [[CCPackage alloc] initWithName:name resolution:resolution remoteURL:remoteURL];
 
     [_packages addObject:package];