Merge pull request #658 from zapcannon87/master

feat: file prefix

Author: zapcannon87

AVOS/AVOS.xcodeproj/project.pbxproj

@@ -11,9 +11,7 @@
 		D30B6A1424A09978006ABE09 /* LeanCloudObjc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30B6A0B24A09978006ABE09 /* LeanCloudObjc.framework */; };
 		D30B6A1B24A09978006ABE09 /* LeanCloudObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = D30B6A0D24A09978006ABE09 /* LeanCloudObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A2224A09B1F006ABE09 /* UserAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841AAC1A5A7A0000C5C6C4 /* UserAgent.h */; };
-		D30B6A2324A09B1F006ABE09 /* LCConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C8419F31A5A79FF00C5C6C4 /* LCConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A2424A09B1F006ABE09 /* LCGlobal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C8419F41A5A79FF00C5C6C4 /* LCGlobal.h */; };
-		D30B6A2524A09B1F006ABE09 /* LCAvailability.h in Headers */ = {isa = PBXBuildFile; fileRef = 8311CD841C3D25B9007DEFF8 /* LCAvailability.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A2824A09B1F006ABE09 /* LCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = D3700B782475345C00678B2B /* LCApplication.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A2924A09B1F006ABE09 /* LCApplication_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = D3596DAC2480EEED002D2D22 /* LCApplication_Internal.h */; };
 		D30B6A2A24A09B1F006ABE09 /* LCApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = D3700B792475345C00678B2B /* LCApplication.m */; };
@@ -113,12 +111,12 @@
 		D30B6A9924A09DF2006ABE09 /* LCUser.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841A9E1A5A7A0000C5C6C4 /* LCUser.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A9A24A09DF2006ABE09 /* LCUser_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841AA01A5A7A0000C5C6C4 /* LCUser_Internal.h */; };
 		D30B6A9B24A09DF2006ABE09 /* LCUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C841A9F1A5A7A0000C5C6C4 /* LCUser.m */; };
-		D30B6A9E24A09E35006ABE09 /* LCErrorUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841AA21A5A7A0000C5C6C4 /* LCErrorUtils.h */; };
+		D30B6A9E24A09E35006ABE09 /* LCErrorUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841AA21A5A7A0000C5C6C4 /* LCErrorUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6A9F24A09E35006ABE09 /* LCErrorUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C841AA31A5A7A0000C5C6C4 /* LCErrorUtils.m */; };
 		D30B6AA024A09E35006ABE09 /* LCHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841AA41A5A7A0000C5C6C4 /* LCHelpers.h */; };
 		D30B6AA124A09E35006ABE09 /* LCLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841AA61A5A7A0000C5C6C4 /* LCLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6AA224A09E35006ABE09 /* LCLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C841AA71A5A7A0000C5C6C4 /* LCLogger.m */; };
-		D30B6AA324A09E35006ABE09 /* LCUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841AAA1A5A7A0000C5C6C4 /* LCUtils.h */; };
+		D30B6AA324A09E35006ABE09 /* LCUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841AAA1A5A7A0000C5C6C4 /* LCUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D30B6AA424A09E35006ABE09 /* LCUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C841AAB1A5A7A0000C5C6C4 /* LCUtils.m */; };
 		D30B6AA524A09E35006ABE09 /* LCDatabaseCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 830E7CFE1B1CB07B005F4B22 /* LCDatabaseCommon.h */; };
 		D30B6AA624A09E35006ABE09 /* LCDatabaseCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = 830E7CF61B1CA2A2005F4B22 /* LCDatabaseCoordinator.h */; };
@@ -304,6 +302,7 @@
 		D33127D326CBAD6D00BBDE09 /* LCFileTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = D33127D226CBAD6D00BBDE09 /* LCFileTestCase.swift */; };
 		D33127D526CE391500BBDE09 /* LCLeaderboardTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = D33127D426CE391500BBDE09 /* LCLeaderboardTestCase.swift */; };
 		D33127D726CFAC5100BBDE09 /* LCLeaderboard_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = D33127D626CFAC5100BBDE09 /* LCLeaderboard_Internal.h */; };
+		D357146E26D50405009E611C /* LCUtils_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = D357146D26D50405009E611C /* LCUtils_Internal.h */; };
 		D365E42426C3D29F00148DE8 /* LCLeaderboard.h in Headers */ = {isa = PBXBuildFile; fileRef = D365E42226C3D29F00148DE8 /* LCLeaderboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D365E42526C3D29F00148DE8 /* LCLeaderboard.m in Sources */ = {isa = PBXBuildFile; fileRef = D365E42326C3D29F00148DE8 /* LCLeaderboard.m */; };
 		D36A095A25BEA75000A4F312 /* IMMessageTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = D36A095925BEA75000A4F312 /* IMMessageTestCase.swift */; };
@@ -354,7 +353,6 @@
 		830EB9FE1C44F3D600BA917F /* LCSaveOption_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCSaveOption_internal.h; sourceTree = "<group>"; };
 		830F159E1F010F260009B4D0 /* LCIMRecalledMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCIMRecalledMessage.h; sourceTree = "<group>"; };
 		830F159F1F010F260009B4D0 /* LCIMRecalledMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCIMRecalledMessage.m; sourceTree = "<group>"; };
-		8311CD841C3D25B9007DEFF8 /* LCAvailability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCAvailability.h; sourceTree = "<group>"; };
 		831E29581D882CBB006E502B /* LCIMMessageOption.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCIMMessageOption.h; sourceTree = "<group>"; };
 		831E29591D882CBB006E502B /* LCIMMessageOption.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCIMMessageOption.m; sourceTree = "<group>"; };
 		83331D431EB9A25F00CADC9C /* LCCaptcha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCCaptcha.h; sourceTree = "<group>"; };
@@ -418,7 +416,6 @@
 		8C8419E01A5A79FF00C5C6C4 /* LCRole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCRole.h; sourceTree = "<group>"; };
 		8C8419E11A5A79FF00C5C6C4 /* LCRole.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCRole.m; sourceTree = "<group>"; };
 		8C8419E21A5A79FF00C5C6C4 /* LCRole_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCRole_Internal.h; sourceTree = "<group>"; };
-		8C8419F31A5A79FF00C5C6C4 /* LCConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCConstants.h; sourceTree = "<group>"; };
 		8C8419F41A5A79FF00C5C6C4 /* LCGlobal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCGlobal.h; sourceTree = "<group>"; };
 		8C8419FA1A5A79FF00C5C6C4 /* LCCacheManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCCacheManager.h; sourceTree = "<group>"; };
 		8C8419FB1A5A79FF00C5C6C4 /* LCCacheManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCCacheManager.m; sourceTree = "<group>"; };
@@ -557,6 +554,7 @@
 		D34C417D2483C3FD00CD2459 /* LCRTMConnection_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCRTMConnection_Internal.h; sourceTree = "<group>"; };
 		D34EBDCC211C20FF0092A538 /* LCRouter_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCRouter_Internal.h; sourceTree = "<group>"; };
 		D34FD72B2068CFE900B7C11B /* LCLiveQuery_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCLiveQuery_Internal.h; sourceTree = "<group>"; };
+		D357146D26D50405009E611C /* LCUtils_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCUtils_Internal.h; sourceTree = "<group>"; };
 		D3596DAC2480EEED002D2D22 /* LCApplication_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCApplication_Internal.h; sourceTree = "<group>"; };
 		D365E42226C3D29F00148DE8 /* LCLeaderboard.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCLeaderboard.h; sourceTree = "<group>"; };
 		D365E42326C3D29F00148DE8 /* LCLeaderboard.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LCLeaderboard.m; sourceTree = "<group>"; };
@@ -824,9 +822,7 @@
 			isa = PBXGroup;
 			children = (
 				8C841AAC1A5A7A0000C5C6C4 /* UserAgent.h */,
-				8C8419F31A5A79FF00C5C6C4 /* LCConstants.h */,
 				8C8419F41A5A79FF00C5C6C4 /* LCGlobal.h */,
-				8311CD841C3D25B9007DEFF8 /* LCAvailability.h */,
 				D3700B782475345C00678B2B /* LCApplication.h */,
 				D3596DAC2480EEED002D2D22 /* LCApplication_Internal.h */,
 				D3700B792475345C00678B2B /* LCApplication.m */,
@@ -1045,6 +1041,7 @@
 				8C841AA61A5A7A0000C5C6C4 /* LCLogger.h */,
 				8C841AA71A5A7A0000C5C6C4 /* LCLogger.m */,
 				8C841AAA1A5A7A0000C5C6C4 /* LCUtils.h */,
+				D357146D26D50405009E611C /* LCUtils_Internal.h */,
 				8C841AAB1A5A7A0000C5C6C4 /* LCUtils.m */,
 				830E7CFE1B1CB07B005F4B22 /* LCDatabaseCommon.h */,
 				830E7CF61B1CA2A2005F4B22 /* LCDatabaseCoordinator.h */,
@@ -1461,6 +1458,7 @@
 				D30B6B0224A09F1F006ABE09 /* LCGPBStruct.pbobjc.h in Headers */,
 				D30B6A4824A09CFE006ABE09 /* LCFile_Internal.h in Headers */,
 				D30B6ACC24A09ED2006ABE09 /* LCIMConversationQuery.h in Headers */,
+				D357146E26D50405009E611C /* LCUtils_Internal.h in Headers */,
 				D32AA480263BF2F30044E74E /* Foundation.h in Headers */,
 				D30B6B5C24A0A03D006ABE09 /* LCLiveQuery_Internal.h in Headers */,
 				D30B6AA124A09E35006ABE09 /* LCLogger.h in Headers */,
@@ -1478,14 +1476,12 @@
 				D30B6A6524A09D52006ABE09 /* LCPush_Internal.h in Headers */,
 				D30B6A6924A09D62006ABE09 /* LCFriendQuery.h in Headers */,
 				D30B6A7424A09D87006ABE09 /* LCRouter_Internal.h in Headers */,
-				D30B6A2524A09B1F006ABE09 /* LCAvailability.h in Headers */,
 				D30B6AAD24A09E35006ABE09 /* NSDictionary+LCHash.h in Headers */,
 				D30B6AE724A09F1E006ABE09 /* LCGPBDescriptor_PackagePrivate.h in Headers */,
 				D30B6B4524A09F84006ABE09 /* LCIMImageMessage.h in Headers */,
 				D30B6AAA24A09E35006ABE09 /* LCKeyValueSQL.h in Headers */,
 				D30B6A8224A09DCA006ABE09 /* LCNetworkReachabilityManager.h in Headers */,
 				D30B6B3624A09F79006ABE09 /* LCIMCacheStore.h in Headers */,
-				D30B6A2324A09B1F006ABE09 /* LCConstants.h in Headers */,
 				D30B6AC624A09ED1006ABE09 /* LCIMConversation.h in Headers */,
 				D30B6A9924A09DF2006ABE09 /* LCUser.h in Headers */,
 				D30B6AD024A09ED2006ABE09 /* LCIMKeyedConversation_internal.h in Headers */,

AVOS/LeanCloudObjc/Foundation.h

@@ -12,9 +12,9 @@
 #import "LCApplication.h"
 
 // Constants
-#import "LCAvailability.h"
-#import "LCConstants.h"
 #import "LCLogger.h"
+#import "LCErrorUtils.h"
+#import "LCUtils.h"
 
 // Object
 #import "LCObject.h"

AVOS/LeanCloudObjcTests/LCFileTestCase.swift

@@ -36,4 +36,27 @@ class LCFileTestCase: BaseTestCase {
         XCTAssertTrue(object0.fetch())
         XCTAssertTrue(object0[fileFieldKey] is LCFile)
     }
+    
+    /*
+    func testPathPrefix() {
+        let prefixKey = "prefix"
+        let prefixValue = "gamesaves"
+        let file = LCFile(data: uuid.data(using: .utf8)!)
+        file.setPathPrefix(prefixValue)
+        XCTAssertEqual(file.metaData?[prefixKey] as? String, prefixValue)
+        file.clearPathPrefix()
+        XCTAssertNil(file.metaData?[prefixKey])
+        file.setPathPrefix(prefixValue)
+        expecting { exp in
+            file.saveInBackground { succeeded, error in
+                XCTAssertTrue(succeeded)
+                XCTAssertNil(error)
+                exp.fulfill()
+            }
+        }
+        XCTAssertEqual(file.metaData?[prefixKey] as? String, prefixValue)
+        XCTAssertNil(file.object(forKey: prefixKey))
+        XCTAssertTrue((file.url ?? "").contains("/\(prefixValue)/"))
+    }
+     */
 }

AVOS/Sources/Foundation/Cache/LCCacheManager.h

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "LCConstants.h"
+#import "LCUtils.h"
 
 @interface LCCacheManager : NSObject
 

AVOS/Sources/Foundation/Cache/LCCacheManager.m

@@ -10,7 +10,7 @@
 #import "LCErrorUtils.h"
 #import "LCUtils.h"
 #import "LCPersistenceUtils.h"
-
+#import "LCHelpers.h"
 
 @interface LCCacheManager ()
 @property (nonatomic, copy) NSString *diskCachePath;
@@ -53,7 +53,7 @@ - (NSString *)pathForKey:(NSString *)key {
 }
 
 - (BOOL)hasCacheForKey:(NSString *)key {
-    return [[NSFileManager defaultManager] fileExistsAtPath:[self pathForKey:[key LCMD5String]]];
+    return [[NSFileManager defaultManager] fileExistsAtPath:[self pathForKey:[key _lc_MD5String]]];
 }
 - (BOOL)hasCacheForMD5Key:(NSString *)key {
     return [[NSFileManager defaultManager] fileExistsAtPath:[self pathForKey:key]];
@@ -67,9 +67,9 @@ - (void)getWithKey:(NSString *)key maxCacheAge:(NSTimeInterval)maxCacheAge block
         if (maxCacheAge<=0) {
             isTooOld=YES;
         } else {
-             diskResult=[LCPersistenceUtils getJSONFromPath:[self pathForKey:[key LCMD5String]]];
+             diskResult=[LCPersistenceUtils getJSONFromPath:[self pathForKey:[key _lc_MD5String]]];
             if (diskResult && maxCacheAge > 0) {
-                NSDate *lastModified = [LCPersistenceUtils lastModified:[self pathForKey:[key LCMD5String]]];
+                NSDate *lastModified = [LCPersistenceUtils lastModified:[self pathForKey:[key _lc_MD5String]]];
                 if ([[NSDate date] timeIntervalSinceDate:lastModified] > maxCacheAge) {
                     isTooOld = YES;
                 }
@@ -88,7 +88,7 @@ - (void)getWithKey:(NSString *)key maxCacheAge:(NSTimeInterval)maxCacheAge block
 
 - (void)saveJSON:(id)JSON forKey:(NSString *)key {
     dispatch_async(self.cacheQueue, ^{
-        [LCPersistenceUtils saveJSON:JSON toPath:[self pathForKey:[key LCMD5String]]];
+        [LCPersistenceUtils saveJSON:JSON toPath:[self pathForKey:[key _lc_MD5String]]];
     });
 }
 
@@ -125,7 +125,7 @@ + (BOOL)clearCacheMoreThanDays:(NSInteger)numberOfDays {
 
 - (void)clearCacheForKey:(NSString *)key {
     dispatch_sync(self.cacheQueue, ^{
-        [[NSFileManager defaultManager] removeItemAtPath:[self pathForKey:[key LCMD5String]] error:NULL];
+        [[NSFileManager defaultManager] removeItemAtPath:[self pathForKey:[key _lc_MD5String]] error:NULL];
     });
 }
 

AVOS/Sources/Foundation/Cache/LCPersistenceUtils.m

@@ -9,6 +9,8 @@
 #import "LCPersistenceUtils.h"
 #import <TargetConditionals.h>
 #import "LCUtils.h"
+#import "LCLogger.h"
+#import "LCApplication_Internal.h"
 
 #define LCRootDirName @"LeanCloud"
 #define LCMessageCacheDirName @"MessageCache"