소스 검색

update exif

marinofaggiana 4 년 전
부모
커밋
d42fe96ac9

+ 0 - 2
Nextcloud.xcodeproj/project.pbxproj

@@ -210,7 +210,6 @@
 		F782FDC424E6933900666099 /* NCUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70BFC7320E0FA7C00C67599 /* NCUtility.swift */; };
 		F785EE9D246196DF00B3F945 /* NCNetworkingE2EE.swift in Sources */ = {isa = PBXBuildFile; fileRef = F785EE9C246196DF00B3F945 /* NCNetworkingE2EE.swift */; };
 		F785EE9E2461A09900B3F945 /* NCNetworking.swift in Sources */ = {isa = PBXBuildFile; fileRef = F75A9EE523796C6F0044CFCE /* NCNetworking.swift */; };
-		F785EEA32461A23C00B3F945 /* CCExifGeo.m in Sources */ = {isa = PBXBuildFile; fileRef = F7A54C351C6267B500E2C8BF /* CCExifGeo.m */; };
 		F785EEA42461A4A600B3F945 /* NCUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70BFC7320E0FA7C00C67599 /* NCUtility.swift */; };
 		F785EEA52461A4CF00B3F945 /* CCUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = F7053E3D1C639DF500741EA5 /* CCUtility.m */; };
 		F785EEA62461A4FB00B3F945 /* CCUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = F7053E3D1C639DF500741EA5 /* CCUtility.m */; };
@@ -1932,7 +1931,6 @@
 			files = (
 				F71459BA1D12E3B700CAFEEC /* NSString+TruncateToWidth.m in Sources */,
 				F73D5E48246DE09200DF6467 /* NCElementsJSON.swift in Sources */,
-				F785EEA32461A23C00B3F945 /* CCExifGeo.m in Sources */,
 				F70460532499095400BB98A7 /* NotificationCenter+MainThread.swift in Sources */,
 				F71459C21D12E3B700CAFEEC /* ShareViewController.m in Sources */,
 				F70BFC7520E0FA7D00C67599 /* NCUtility.swift in Sources */,

+ 5 - 0
iOSClient/Networking/NCNetworking.swift

@@ -503,6 +503,11 @@ import Queuer
                         appDelegate.networkingAutoUpload.startProcess()
                     }
                 }
+                // EXIF
+                if metadata.typeFile == k_metadataTypeFile_image {
+                    let metadata = tableMetadata.init(value: metadata)
+                    CCExifGeo.sharedInstance()?.setExifLocalTable(metadata)
+                }
                 #endif                
                 
                 NCCommunicationCommon.shared.writeLog("Upload complete " + serverUrl + "/" + fileName + ", result: success(\(size) bytes)")

+ 1 - 0
iOSClient/Nextcloud-Bridging-Header.h

@@ -9,3 +9,4 @@
 #import "NCEndToEndEncryption.h"
 #import "NYMnemonic.h"
 #import "CCPeekPop.h"
+#import "CCExifGeo.h"

+ 2 - 2
iOSClient/Utility/CCExifGeo.h

@@ -32,7 +32,7 @@
 
 + (CCExifGeo *)sharedInstance;
 
-- (void)setExifLocalTableEtag:(tableMetadata *)metadata;
-- (void)setGeocoderEtag:(NSString *)ocId exifDate:(NSDate *)exifDate latitude:(NSString*)latitude longitude:(NSString*)longitude;
+- (void)setExifLocalTable:(tableMetadata *)metadata;
+- (void)setGeocoder:(NSString *)ocId exifDate:(NSDate *)exifDate latitude:(NSString*)latitude longitude:(NSString*)longitude;
 
 @end

+ 2 - 2
iOSClient/Utility/CCExifGeo.m

@@ -41,7 +41,7 @@
     }
 }
 
-- (void)setExif:(tableMetadata *)metadata
+- (void)setExifLocalTable:(tableMetadata *)metadata
 {
     NSString *dateTime;
     NSString *latitudeRef;
@@ -120,7 +120,7 @@
     CFRelease(imageProperties);
 }
 
-- (void)setGeocoderEtag:(NSString *)ocId exifDate:(NSDate *)exifDate latitude:(NSString*)latitude longitude:(NSString*)longitude
+- (void)setGeocoder:(NSString *)ocId exifDate:(NSDate *)exifDate latitude:(NSString*)latitude longitude:(NSString*)longitude
 {
     // If exists already geocoder data in TableGPS exit
     if ([[NCManageDatabase sharedInstance] getLocationFromGeoLatitude:latitude longitude:longitude])