文件 - 兼容一下旧版本已下载的文件

Author: wanghengheng

Coding_iOS/Controllers/FileListViewController.m

@@ -366,7 +366,7 @@ - (void)downloadFilesBtnClicked{
 
         Coding_FileManager *manager = [Coding_FileManager sharedManager];
         for (ProjectFile *file in selectedFiles) {
-            if ([file hasBeenDownload]) {//已下载
+            if ([file diskFileUrl]) {//已下载
                 downloadedCount++;
                 DebugLog(@"%@: 已在队列", file.name);
             }else if ([file cDownloadTask]) {//正在下载
@@ -693,7 +693,7 @@ - (void)deleteFile:(ProjectFile *)file{
     __weak typeof(self) weakSelf = self;
     __weak typeof(file) weakFile = file;
 
-    NSURL *fileUrl = [file hasBeenDownload];
+    NSURL *fileUrl = [file diskFileUrl];
     Coding_DownloadTask *cDownloadTask = [file cDownloadTask];
     UIActionSheet *actionSheet;
 
@@ -740,7 +740,7 @@ - (void)deleteFile:(ProjectFile *)file fromDisk:(BOOL)fromDisk{
         [Coding_FileManager cancelCDownloadTaskForKey:file.storage_key];
     }
     //    删除本地文件
-    NSURL *fileUrl = [file hasBeenDownload];
+    NSURL *fileUrl = [file diskFileUrl];
     NSString *filePath = fileUrl.path;
     NSFileManager *fm = [NSFileManager defaultManager];
     if ([fm fileExistsAtPath:filePath]) {

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_for_disk];
+    NSURL *fileUrl = curVersion.diskFileUrl;
     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_for_disk];
+    NSURL *fileUrl = curVersion.diskFileUrl;
     NSString *filePath = fileUrl.path;
     NSFileManager *fm = [NSFileManager defaultManager];
     if ([fm fileExistsAtPath:filePath]) {

Coding_iOS/Controllers/FileViewController.m

@@ -101,7 +101,7 @@ - (void)configContent{
     self.title = [self titleStr];
     [self setupNavigationItem];
 
-    NSURL *fileUrl = [self hasBeenDownload];
+    NSURL *fileUrl = [self diskFileUrl];
     if (!fileUrl) {
         [self showDownloadView];
     }else{
@@ -359,7 +359,7 @@ - (void)goToFileInfo{
 
 - (void)deleteCurFile{
     UIActionSheet *actionSheet;
-    NSURL *fileUrl = [_curFile hasBeenDownload];
+    NSURL *fileUrl = [_curFile diskFileUrl];
     Coding_DownloadTask *cDownloadTask = [_curFile cDownloadTask];
 
     if (fileUrl) {
@@ -405,7 +405,7 @@ - (void)doDeleteCurFile:(ProjectFile *)file fromDisk:(BOOL)fromDisk{
         [Coding_FileManager cancelCDownloadTaskForKey:file.storage_key];
     }
     //    删除本地文件
-    NSURL *fileUrl = [file hasBeenDownload];
+    NSURL *fileUrl = [file diskFileUrl];
     NSString *filePath = fileUrl.path;
     NSFileManager *fm = [NSFileManager defaultManager];
     if ([fm fileExistsAtPath:filePath]) {
@@ -509,12 +509,12 @@ - (void)easeToolBar:(EaseToolBar *)toolBar didClickedIndex:(NSInteger)index{
     }
 }
 #pragma mark Data Value
-- (NSURL *)hasBeenDownload{
+- (NSURL *)diskFileUrl{
     NSURL *fileUrl;
     if (self.curVersion) {
-        fileUrl = [self.curVersion hasBeenDownload];
+        fileUrl = [self.curVersion diskFileUrl];
     }else{
-        fileUrl = [self.curFile hasBeenDownload];
+        fileUrl = [self.curFile diskFileUrl];
     }
     return fileUrl;
 }

Coding_iOS/Models/FileVersion.h

@@ -25,5 +25,5 @@
 //download
 - (DownloadState)downloadState;
 - (Coding_DownloadTask *)cDownloadTask;
-- (NSURL *)hasBeenDownload;
+- (NSURL *)diskFileUrl;
 @end

Coding_iOS/Models/FileVersion.m

@@ -46,7 +46,7 @@ - (NSString *)toDeletePath{
 //download
 - (DownloadState)downloadState{
     DownloadState state = DownloadStateDefault;
-    if ([self hasBeenDownload]) {
+    if ([self diskFileUrl]) {
         state = DownloadStateDownloaded;
     }else{
         Coding_DownloadTask *cDownloadTask = [self cDownloadTask];
@@ -65,7 +65,7 @@ - (DownloadState)downloadState{
 - (Coding_DownloadTask *)cDownloadTask{
     return [Coding_FileManager cDownloadTaskForKey:_storage_key];
 }
-- (NSURL *)hasBeenDownload{
-    return [Coding_FileManager diskDownloadUrlForKey:self.storage_key_for_disk];
+- (NSURL *)diskFileUrl{
+    return [Coding_FileManager diskDownloadUrlForKey:self.storage_key] ?: [Coding_FileManager diskDownloadUrlForKey:self.storage_key_for_disk];
 }
 @end

Coding_iOS/Models/ProjectFile.h

@@ -35,7 +35,7 @@ typedef NS_ENUM(NSInteger, DownloadState){
 
 - (DownloadState)downloadState;
 - (Coding_DownloadTask *)cDownloadTask;
-- (NSURL *)hasBeenDownload;
+- (NSURL *)diskFileUrl;
 
 - (NSString *)downloadPath;
 

Coding_iOS/Models/ProjectFile.m

@@ -78,7 +78,7 @@ - (BOOL)isEmpty{
 
 - (DownloadState)downloadState{
     DownloadState state = DownloadStateDefault;
-    if ([self hasBeenDownload]) {
+    if ([self diskFileUrl]) {
         state = DownloadStateDownloaded;
     }else{
         Coding_DownloadTask *cDownloadTask = [self cDownloadTask];
@@ -121,8 +121,8 @@ - (NSString *)storage_key_for_disk{
 - (Coding_DownloadTask *)cDownloadTask{
     return [Coding_FileManager cDownloadTaskForKey:_storage_key];
 }
-- (NSURL *)hasBeenDownload{
-    return [Coding_FileManager diskDownloadUrlForKey:self.storage_key_for_disk];
+- (NSURL *)diskFileUrl{
+    return [Coding_FileManager diskDownloadUrlForKey:self.storage_key] ?: [Coding_FileManager diskDownloadUrlForKey:self.storage_key_for_disk];
 }
 
 - (NSString *)toDeletePath{

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_for_disk];
+    NSURL *fileUrl = _file.diskFileUrl;
     if (fileUrl) {//已经下载到本地了
         if (_showDiskFileBlock) {
             _showDiskFileBlock(fileUrl, _file);

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_for_disk];
+    NSURL *fileUrl = _curVersion.diskFileUrl;
     if (fileUrl) {//已经下载到本地了
         if (_showDiskFileBlock) {
             _showDiskFileBlock(fileUrl, _curVersion);

Coding_iOS/Views/FileDownloadView.m

@@ -66,8 +66,8 @@ - (NSString *)owner_preview{
 - (NSString *)fileType{
     return [self.curData valueForKey:@"fileType"];
 }
-- (NSString *)storage_key{
-    return [self.curData valueForKey:@"storage_key_for_disk"];
+- (NSURL *)diskFileUrl{
+    return [self.curData valueForKey:@"diskFileUrl"];
 }
 - (NSString *)name{
     if (_version) {
@@ -281,7 +281,7 @@ - (void)updatePregress:(double)fractionCompleted{
 
 - (void)clickedByUser{
     Coding_FileManager *manager = [Coding_FileManager sharedManager];
-    NSURL *fileUrl = [Coding_FileManager diskDownloadUrlForKey:self.storage_key];
+    NSURL *fileUrl = self.diskFileUrl;
     if (fileUrl) {//已经下载到本地了
         if (_otherMethodOpenBlock) {
             _otherMethodOpenBlock();