chore: tweak code

Author: zapcannon87

AVOS/Sources/Foundation/File/LCFile.h

@@ -5,8 +5,9 @@
 
 #import <Foundation/Foundation.h>
 #import "LCUtils.h"
-#import "LCACL.h"
 
+@class LCObject;
+@class LCACL;
 @class LCFileQuery;
 
 NS_ASSUME_NONNULL_BEGIN

AVOS/Sources/Foundation/File/LCFile.m

@@ -134,16 +134,7 @@ - (instancetype)initWithData:(NSData *)data
             mimeType ?: @"application/octet-stream";
         });
 
-        _rawJSONData[kLCFile_metaData] = ({
-            
-            NSMutableDictionary *metaData = [NSMutableDictionary dictionary];
-            metaData[kLCFile_size] = @(data.length);
-            NSString *objectId = LCPaasClient.sharedInstance.currentUser.objectId;
-            if (objectId && objectId.length > 0) {
-                metaData[kLCFile_owner] = objectId;
-            }
-            metaData.copy;
-        });
+        _rawJSONData[kLCFile_metaData] = @{ kLCFile_size : @(data.length) };
 
         _ACL = ({
 
@@ -196,16 +187,8 @@ - (instancetype)initWithLocalPath:(NSString *)localPath
             mimeType ?: @"application/octet-stream";
         });
 
-        _rawJSONData[kLCFile_metaData] = ({
-            
-            NSMutableDictionary *metaData = [NSMutableDictionary dictionary];
-            metaData[kLCFile_size] = fileAttributes[NSFileSize];
-            NSString *objectId = [LCPaasClient sharedInstance].currentUser.objectId;
-            if (objectId && objectId.length > 0) {
-                metaData[kLCFile_owner] = objectId;
-            }
-            metaData.copy;
-        });
+        NSNumber *fileSize = fileAttributes[NSFileSize];
+        _rawJSONData[kLCFile_metaData] = fileSize ? @{ kLCFile_size : fileSize } : @{};
 
         _ACL = ({
 
@@ -247,7 +230,7 @@ - (instancetype)initWithRemoteURL:(NSURL *)remoteURL
             mimeType ?: @"application/octet-stream";
         });
 
-        _rawJSONData[kLCFile_metaData] = @{ kLCFile___source : @"external" };
+        _rawJSONData[kLCFile_metaData] = @{ @"__source" : @"external" };
 
         _ACL = ({
 
@@ -425,7 +408,7 @@ - (NSString *)url {
 - (NSDictionary *)metaData {
     __block NSDictionary *metaData;
     [self internalSyncLock:^{
-        metaData = [LCFile decodingMetaDataFromDic:self->_rawJSONData];
+        metaData = [NSDictionary _lc_decoding:self->_rawJSONData key:kLCFile_metaData];
     }];
     return metaData;
 }
@@ -667,6 +650,7 @@ - (void)uploadLocalDataWithData:(NSData *)data
               completionHandler:(void (^)(BOOL succeeded, NSError *error))completionHandler
 {
     NSMutableDictionary *parameters = [self rawJSONDataMutableCopy];
+    [parameters removeObjectsForKeys:@[@"__type", @"className"]];
     [self getFileTokensWithParameters:parameters callback:^(LCFileTokens *fileTokens, NSError *error) {
 
         if (error) {
@@ -1285,19 +1269,6 @@ + (NSString *)decodingObjectIdFromDic:(NSDictionary *)dic
     return value;
 }
 
-+ (NSDictionary *)decodingMetaDataFromDic:(NSDictionary *)dic
-{
-    /* @note For compatibility, should decoding multiple keys ... ... */
-    
-    NSDictionary *value = [NSDictionary _lc_decoding:dic key:kLCFile_metaData];
-    
-    if (value) { return value; }
-    
-    value = [NSDictionary _lc_decoding:dic key:kLCFile_metadata];
-    
-    return value;
-}
-
 // MARK: Compatibility
 
 - (void)saveInBackgroundWithBlock:(void (^)(BOOL, NSError * _Nullable))block

AVOS/Sources/Foundation/File/LCFile_Internal.h

@@ -8,36 +8,18 @@
 
 #import "LCFile.h"
 
-//# _File : {} #//
 static NSString * const kLCFile_mime_type = @"mime_type";
 static NSString * const kLCFile_key = @"key";
 static NSString * const kLCFile_name = @"name";
-static NSString * const kLCFile___type = @"__type";
 static NSString * const kLCFile_url = @"url";
 static NSString * const kLCFile_provider = @"provider";
-
-//### Meta Data of File Object ###//
-/// @note Totally, has two Keys to identify 'metaData' in history, @"metaData" is the latest Key.
 static NSString * const kLCFile_metaData = @"metaData";
-static NSString * const kLCFile_metadata = @"metadata";
-//### Meta Data of File Object ###//
-
-//## metaData : {} ##//
-static NSString * const kLCFile_owner = @"owner";
 static NSString * const kLCFile_size = @"size";
-static NSString * const kLCFile__checksum = @"_checksum";
-static NSString * const kLCFile___source = @"__source";
-//## metaData : {} ##//
-
 static NSString * const kLCFile_bucket = @"bucket";
-
-//### Object ID of File Object ###//
 /// @note Totally, has three Keys to identify 'objectId' in history, @"objectId" is the latest Key and @"objId" used in IM messages.
 static NSString * const kLCFile_objectId = @"objectId";
 static NSString * const kLCFile_objId = @"objId";
 static NSString * const kLCFile_id = @"id";
-//### Object ID of File Object ###//
-//# _File : {} #//
 
 @interface LCFile ()