文件 - storage_key 后缀与真实文件后缀不一致的 bugfix

wanghengheng · wanghengheng · commit ea85d0304144 · 2018-01-12T17:19:28.000+08:00
diff --git a/Coding_iOS/Controllers/FileVersionsViewController.m b/Coding_iOS/Controllers/FileVersionsViewController.m
@@ -187,7 +187,7 @@ - (void)doRemarkFileVersion:(FileVersion *)curVersion withRemarkStr:(NSString *)
 - (void)deleteFileVersion:(FileVersion *)curVersion{
     __weak typeof(self) weakSelf = self;
     
-    NSURL *fileUrl = [Coding_FileManager diskDownloadUrlForKey:curVersion.storage_key];
+    NSURL *fileUrl = [Coding_FileManager diskDownloadUrlForKey:curVersion.storage_key_for_disk];
     Coding_DownloadTask *cDownloadTask = [Coding_FileManager cDownloadTaskForKey:curVersion.storage_key];
     UIActionSheet *actionSheet;
     
@@ -234,7 +234,7 @@ - (void)doDeleteFileVersion:(FileVersion *)curVersion fromDisk:(BOOL)fromDisk{
         [Coding_FileManager cancelCDownloadTaskForKey:curVersion.storage_key];
     }
     //    删除本地文件
-    NSURL *fileUrl = [Coding_FileManager diskDownloadUrlForKey:curVersion.storage_key];
+    NSURL *fileUrl = [Coding_FileManager diskDownloadUrlForKey:curVersion.storage_key_for_disk];
     NSString *filePath = fileUrl.path;
     NSFileManager *fm = [NSFileManager defaultManager];
     if ([fm fileExistsAtPath:filePath]) {
diff --git a/Coding_iOS/Models/FileVersion.h b/Coding_iOS/Models/FileVersion.h
@@ -15,7 +15,7 @@
 @property (strong, nonatomic) NSDate *created_at;
 @property (readwrite, nonatomic, strong) User *owner;
 
-@property (strong, nonatomic, readonly) NSString *diskFileName;
+@property (strong, nonatomic, readonly) NSString *diskFileName, *storage_key_for_disk;
 
 - (NSString *)downloadPath;
 
diff --git a/Coding_iOS/Models/FileVersion.m b/Coding_iOS/Models/FileVersion.m
@@ -16,10 +16,22 @@ @interface FileVersion ()
 @implementation FileVersion
 - (NSString *)diskFileName{
     if (!_diskFileName) {
-        _diskFileName = [NSString stringWithFormat:@"%@|||%@|||%@|%@", _name, _project_id.stringValue, _storage_type, _storage_key];
+        _diskFileName = [NSString stringWithFormat:@"%@|||%@|||%@|%@", _name, _project_id.stringValue, _storage_type, self.storage_key_for_disk];
     }
     return _diskFileName;
 }
+
+- (NSString *)storage_key_for_disk{
+    NSArray *fileNameCom = [_name componentsSeparatedByString:@"."];
+    NSMutableArray *storage_keyCom = [_storage_key componentsSeparatedByString:@"."].mutableCopy;
+    if (fileNameCom.count > 1 && storage_keyCom.count > 0 && ![fileNameCom.lastObject isEqualToString:storage_keyCom.lastObject]) {
+        [storage_keyCom addObject:fileNameCom.lastObject];
+        return [storage_keyCom componentsJoinedByString:@"."];
+    }else{
+        return _storage_key;
+    }
+}
+
 - (NSString *)downloadPath{
     return [NSString stringWithFormat:@"%@api/project/%@/files/histories/%@/download", [NSObject baseURLStr], _project_id, _history_id];
 }
@@ -54,6 +66,6 @@ - (Coding_DownloadTask *)cDownloadTask{
     return [Coding_FileManager cDownloadTaskForKey:_storage_key];
 }
 - (NSURL *)hasBeenDownload{
-    return [Coding_FileManager diskDownloadUrlForKey:_storage_key];
+    return [Coding_FileManager diskDownloadUrlForKey:self.storage_key_for_disk];
 }
 @end
diff --git a/Coding_iOS/Models/ProjectFile.h b/Coding_iOS/Models/ProjectFile.h
@@ -26,7 +26,7 @@ typedef NS_ENUM(NSInteger, DownloadState){
 @property (readwrite, nonatomic, strong) NSString *name, *fileType, *owner_preview, *preview, *storage_key, *storage_type, *title, *path;
 @property (readwrite, nonatomic, strong) User *owner;
 @property (readwrite, nonatomic, strong) FileShare *share, *share_ea;
-@property (strong, nonatomic, readonly) NSString *diskFileName;
+@property (strong, nonatomic, readonly) NSString *diskFileName, *storage_key_for_disk;
 
 + (ProjectFile *)fileWithFileId:(NSNumber *)fileId andProjectId:(NSNumber *)project_id;
 - (instancetype)initWithFileId:(NSNumber *)fileId inProject:(NSString *)project_name ofUser:(NSString *)project_owner_name;
diff --git a/Coding_iOS/Models/ProjectFile.m b/Coding_iOS/Models/ProjectFile.m
@@ -102,16 +102,27 @@ - (NSString *)downloadPath{
 
 - (NSString *)diskFileName{
     if (!_diskFileName) {
-        _diskFileName = [NSString stringWithFormat:@"%@|||%@|||%@|%@", _name, _project_id.stringValue, _storage_type, _storage_key];
+        _diskFileName = [NSString stringWithFormat:@"%@|||%@|||%@|%@", _name, _project_id.stringValue, _storage_type, self.storage_key_for_disk];
     }
     return _diskFileName;
 }
 
+- (NSString *)storage_key_for_disk{
+    NSArray *fileNameCom = [_name componentsSeparatedByString:@"."];
+    NSMutableArray *storage_keyCom = [_storage_key componentsSeparatedByString:@"."].mutableCopy;
+    if (fileNameCom.count > 1 && storage_keyCom.count > 0 && ![fileNameCom.lastObject isEqualToString:storage_keyCom.lastObject]) {
+        [storage_keyCom addObject:fileNameCom.lastObject];
+        return [storage_keyCom componentsJoinedByString:@"."];
+    }else{
+        return _storage_key;
+    }
+}
+
 - (Coding_DownloadTask *)cDownloadTask{
     return [Coding_FileManager cDownloadTaskForKey:_storage_key];
 }
 - (NSURL *)hasBeenDownload{
-    return [Coding_FileManager diskDownloadUrlForKey:_storage_key];
+    return [Coding_FileManager diskDownloadUrlForKey:self.storage_key_for_disk];
 }
 
 - (NSString *)toDeletePath{
diff --git a/Coding_iOS/Util/Manager/Coding_FileManager.m b/Coding_iOS/Util/Manager/Coding_FileManager.m
@@ -261,7 +261,6 @@ - (Coding_UploadTask *)addUploadTaskWithFileName:(NSString *)fileName projectIsP
             [[NSNotificationCenter defaultCenter] postNotificationName:kNotificationUploadCompled object:manager userInfo:@{@"response" : response,
                                                                                                                             @"error" : error}];
         }else if (responseObject) {
-            NSString *block_project_id = [[[[response.URL.absoluteString componentsSeparatedByString:@"/project/"] lastObject] componentsSeparatedByString:@"/"] firstObject];
             responseObject = [responseObject valueForKey:@"data"];
             
             if ([responseObject isKindOfClass:[NSString class]]) {
@@ -270,12 +269,11 @@ - (Coding_UploadTask *)addUploadTaskWithFileName:(NSString *)fileName projectIsP
                                                                                                                                 @"data" : responseObject}];
             }else{
                 ProjectFile *curFile = [NSObject objectOfClass:@"ProjectFile" fromJSON:responseObject];
-                NSString *block_fileName = [NSString stringWithFormat:@"%@|||%@|||%@", block_project_id, curFile.parent_id.stringValue, curFile.name];
+                NSString *block_fileName = [NSString stringWithFormat:@"%@|||%@|||%@", curFile.project_id.stringValue, curFile.parent_id.stringValue, curFile.name];
                 NSString *block_filePath = [[[manager class] uploadPath] stringByAppendingPathComponent:block_fileName];
                 
                 //移动文件到已下载
-                NSString *diskFileName = [NSString stringWithFormat:@"%@|||%@|||%@|%@", curFile.name, block_project_id, curFile.storage_type, curFile.storage_key];
-                NSString *diskFilePath = [[[manager class] downloadPath] stringByAppendingPathComponent:diskFileName];
+                NSString *diskFilePath = [[[manager class] downloadPath] stringByAppendingPathComponent:curFile.diskFileName];
                 [[NSFileManager defaultManager] moveItemAtPath:block_filePath toPath:diskFilePath error:nil];
                 [manager directoryDidChange:manager.docUploadWatcher];
                 [manager directoryDidChange:manager.docDownloadWatcher];
diff --git a/Coding_iOS/Views/Cell/FileListFileCell.m b/Coding_iOS/Views/Cell/FileListFileCell.m
@@ -142,7 +142,7 @@ - (void)setFile:(ProjectFile *)file{
 
 - (void)clickedByUser{
     Coding_FileManager *manager = [Coding_FileManager sharedManager];
-    NSURL *fileUrl = [Coding_FileManager diskDownloadUrlForKey:_file.storage_key];
+    NSURL *fileUrl = [Coding_FileManager diskDownloadUrlForKey:_file.storage_key_for_disk];
     if (fileUrl) {//已经下载到本地了
         if (_showDiskFileBlock) {
             _showDiskFileBlock(fileUrl, _file);
diff --git a/Coding_iOS/Views/Cell/FileVersionCell.m b/Coding_iOS/Views/Cell/FileVersionCell.m
@@ -164,7 +164,7 @@ - (void)changeToState:(DownloadState)state{
 
 - (void)clickedByUser{
     Coding_FileManager *manager = [Coding_FileManager sharedManager];
-    NSURL *fileUrl = [Coding_FileManager diskDownloadUrlForKey:_curVersion.storage_key];
+    NSURL *fileUrl = [Coding_FileManager diskDownloadUrlForKey:_curVersion.storage_key_for_disk];
     if (fileUrl) {//已经下载到本地了
         if (_showDiskFileBlock) {
             _showDiskFileBlock(fileUrl, _curVersion);
diff --git a/Coding_iOS/Views/FileDownloadView.m b/Coding_iOS/Views/FileDownloadView.m
@@ -67,7 +67,7 @@ - (NSString *)fileType{
     return [self.curData valueForKey:@"fileType"];
 }
 - (NSString *)storage_key{
-    return [self.curData valueForKey:@"storage_key"];
+    return [self.curData valueForKey:@"storage_key_for_disk"];
 }
 - (NSString *)name{
     if (_version) {

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ - (NSString *)fileType{`
`67`	`67`	`return [self.curData valueForKey:@"fileType"];`
`68`	`68`	`}`
`69`	`69`	`- (NSString *)storage_key{`
`70`		`- return [self.curData valueForKey:@"storage_key"];`
	`70`	`+ return [self.curData valueForKey:@"storage_key_for_disk"];`
`71`	`71`	`}`
`72`	`72`	`- (NSString *)name{`
`73`	`73`	`if (_version) {`