瀏覽代碼

remove old date field

Marino Faggiana 8 年之前
父節點
當前提交
ad32fe7429

+ 1 - 1
iOSClient/FileSystem/CCCoreData.h

@@ -127,7 +127,7 @@
 
 // ===== Directory =====
 
-+ (NSString *)addDirectory:(NSString *)serverUrl date:(NSDate *)date permissions:(NSString *)permissions activeAccount:(NSString *)activeAccount;
++ (NSString *)addDirectory:(NSString *)serverUrl permissions:(NSString *)permissions activeAccount:(NSString *)activeAccount;
 + (void)deleteDirectoryFromPredicate:(NSPredicate *)predicate;
 + (NSArray *)deleteDirectoryAndSubDirectory:(NSString *)serverUrl activeAccount:(NSString *)activeAccount;
 + (void)renameDirectory:(NSString *)serverUrl serverUrlTo:(NSString *)serverUrlTo activeAccount:(NSString *)activeAccount;

+ 2 - 4
iOSClient/FileSystem/CCCoreData.m

@@ -870,7 +870,7 @@
 #pragma mark ===== Directory =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (NSString *)addDirectory:(NSString *)serverUrl date:(NSDate *)date permissions:(NSString *)permissions activeAccount:(NSString *)activeAccount
++ (NSString *)addDirectory:(NSString *)serverUrl permissions:(NSString *)permissions activeAccount:(NSString *)activeAccount
 {
     NSString *directoryID;
     
@@ -881,7 +881,6 @@
     if (record) {
      
         directoryID = record.directoryID;
-        record.date = date;
         record.permissions = permissions;
         
     } else {
@@ -889,7 +888,6 @@
         TableDirectory *record = [TableDirectory MR_createEntityInContext:context];
         
         record.account = activeAccount;
-        record.date = date;        
         record.directoryID = [CCUtility createID];
         directoryID = record.directoryID;
         record.permissions = permissions;
@@ -1040,7 +1038,7 @@
     TableDirectory *record = [TableDirectory MR_findFirstWithPredicate:predicate];
     if (record) return record.directoryID;
     else {
-        return [self addDirectory:serverUrl date:NULL permissions:nil activeAccount:activeAccount];
+        return [self addDirectory:serverUrl permissions:nil activeAccount:activeAccount];
     }
     return nil;
 }

+ 0 - 1
iOSClient/FileSystem/TableDirectory+CoreDataProperties.h

@@ -16,7 +16,6 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSFetchRequest<TableDirectory *> *)fetchRequest;
 
 @property (nullable, nonatomic, copy) NSString *account;
-@property (nullable, nonatomic, copy) NSDate *date;
 @property (nullable, nonatomic, copy) NSDate *dateReadDirectory;
 @property (nullable, nonatomic, copy) NSString *directoryID;
 @property (nullable, nonatomic, copy) NSNumber *favorite;

+ 0 - 1
iOSClient/FileSystem/TableDirectory+CoreDataProperties.m

@@ -15,7 +15,6 @@
 }
 
 @dynamic account;
-@dynamic date;
 @dynamic dateReadDirectory;
 @dynamic directoryID;
 @dynamic favorite;

+ 2 - 2
iOSClient/Main/CCMain.m

@@ -2104,7 +2104,7 @@
             
             // Add new directory
             NSString *newDirectory = [NSString stringWithFormat:@"%@/%@", serverUrlTo, fileName];
-            [CCCoreData addDirectory:newDirectory date:[NSDate date] permissions:nil activeAccount:app.activeAccount];
+            [CCCoreData addDirectory:newDirectory permissions:nil activeAccount:app.activeAccount];
             
             // Check Offline
             if ([CCCoreData isOfflineDirectoryServerUrl:serverUrlTo activeAccount:app.activeAccount])
@@ -2236,7 +2236,7 @@
     
     NSString *newDirectory = [NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName];
     
-    [CCCoreData addDirectory:newDirectory date:[NSDate date] permissions:nil activeAccount:app.activeAccount];
+    [CCCoreData addDirectory:newDirectory permissions:nil activeAccount:app.activeAccount];
     
     // Check Offline
     if ([CCCoreData isOfflineDirectoryServerUrl:_serverUrl activeAccount:app.activeAccount])

+ 1 - 1
iOSClient/Move/CCMove.m

@@ -356,7 +356,7 @@
 {
     [_hud hideHud];
     
-    [CCCoreData addDirectory:[NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName] date:[NSDate date] permissions:nil activeAccount:activeAccount];
+    [CCCoreData addDirectory:[NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName] permissions:nil activeAccount:activeAccount];
     
     // Load Folder or the Datasource
     [self readFolder];

+ 7 - 5
iOSClient/Networking/OCNetworking.m

@@ -324,9 +324,9 @@
         // directory [0]
         OCFileDto *itemDtoDirectory = [items objectAtIndex:0];
         NSString *permissions = itemDtoDirectory.permissions;
-        NSDate *date = [NSDate dateWithTimeIntervalSince1970:itemDtoDirectory.date];
+        //NSDate *date = [NSDate dateWithTimeIntervalSince1970:itemDtoDirectory.date];
         
-        NSString *directoryID = [CCCoreData addDirectory:_metadataNet.serverUrl date:date permissions:permissions activeAccount:_metadataNet.account];
+        NSString *directoryID = [CCCoreData addDirectory:_metadataNet.serverUrl permissions:permissions activeAccount:_metadataNet.account];
             
         NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
         NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl];
@@ -353,10 +353,12 @@
                 if (_isCryptoCloudMode == NO || [_metadataNet.selector isEqualToString:selectorSearch]) {
                     
                     NSString *fileName = itemDto.fileName;
+                    
                     if (itemDto.isDirectory) {
+                        
                         fileName = [fileName substringToIndex:[fileName length] - 1];
                         NSString *serverUrl = [CCUtility stringAppendServerUrl:_metadataNet.serverUrl addFileName:fileName];
-                        [CCCoreData addDirectory:serverUrl date:[NSDate date] permissions:nil activeAccount:_metadataNet.account];
+                        [CCCoreData addDirectory:serverUrl permissions:nil activeAccount:_metadataNet.account];
                     }
                     
                     if ([CCUtility isFileCryptated:fileName])
@@ -472,7 +474,7 @@
             
             serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
             
-            NSString *directoryID = [CCCoreData addDirectory:serverUrl date:[NSDate date] permissions:itemDto.permissions activeAccount:_metadataNet.account];
+            NSString *directoryID = [CCCoreData addDirectory:serverUrl permissions:itemDto.permissions activeAccount:_metadataNet.account];
 
             [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
         }
@@ -604,7 +606,7 @@
             
             serverUrl = [CCUtility stringAppendServerUrl:[_activeUrl stringByAppendingString:webDAV] addFileName:serverUrl];
             
-            NSString *directoryID = [CCCoreData addDirectory:serverUrl date:[NSDate date] permissions:itemDto.permissions activeAccount:_metadataNet.account];
+            NSString *directoryID = [CCCoreData addDirectory:serverUrl permissions:itemDto.permissions activeAccount:_metadataNet.account];
             
             [metadatas addObject:[CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:itemDto.fileName serverUrl:serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser]];
         }

+ 1 - 2
iOSClient/cryptocloud.xcdatamodeld/cryptocloud 7.xcdatamodel/contents

@@ -54,7 +54,6 @@
     </entity>
     <entity name="TableDirectory" representedClassName="TableDirectory" syncable="YES">
         <attribute name="account" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="dateReadDirectory" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="directoryID" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="favorite" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
@@ -134,7 +133,7 @@
         <element name="TableAccount" positionX="-6597" positionY="111" width="171" height="585"/>
         <element name="TableAutomaticUpload" positionX="-6597" positionY="801" width="128" height="180"/>
         <element name="TableCertificates" positionX="-6597" positionY="711" width="128" height="60"/>
-        <element name="TableDirectory" positionX="-6372" positionY="111" width="162" height="225"/>
+        <element name="TableDirectory" positionX="-6372" positionY="111" width="162" height="210"/>
         <element name="TableGPS" positionX="-6597" positionY="990" width="128" height="165"/>
         <element name="TableLocalFile" positionX="-6138" positionY="111" width="162" height="225"/>
         <element name="TableMetadata" positionX="-6138" positionY="402" width="162" height="510"/>