Livephoto Server NC 28 #2683

marinofaggiana · 2023-11-29T09:05:28Z

Nextcloud 28 will be natively compatible with LivePhoto.

livephoto detection structure changed (NextcloudKit included)
new api to set up an uploaded file as LivePhoto
start of a strategy to convert existing livephotos (at test phase only probable in background ... )

codecov · 2023-11-29T09:37:33Z

Codecov Report

Attention: 69 lines in your changes are missing coverage. Please review.

Comparison is base (b78e6f0) 2.40% compared to head (6ffaedc) 2.41%.
Report is 1 commits behind head on develop.

❗ Current head 6ffaedc differs from pull request most recent head 0b0d1ff. Consider uploading reports for the commit 0b0d1ff to get more accurate results

Files	Patch %	Lines
iOSClient/Networking/NCNetworking.swift	0.00%	25 Missing ⚠️
iOSClient/Data/NCManageDatabase+Metadata.swift	0.00%	19 Missing ⚠️
iOSClient/Data/NCDataSource.swift	0.00%	5 Missing ⚠️
iOSClient/Networking/NCAutoUpload.swift	0.00%	5 Missing ⚠️
iOSClient/Data/NCManageDatabase.swift	0.00%	4 Missing ⚠️
iOSClient/Media/NCMedia.swift	0.00%	4 Missing ⚠️
iOSClient/Main/Create cloud/NCUploadAssets.swift	0.00%	3 Missing ⚠️
iOSClient/NCImageCache.swift	0.00%	2 Missing ⚠️
iOSClient/Utility/NCCameraRoll.swift	0.00%	2 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##           develop   #2683   +/-   ##
=======================================
  Coverage     2.40%   2.41%           
=======================================
  Files          203     203           
  Lines        27056   26972   -84     
  Branches     10311   10275   -36     
=======================================
- Hits           652     651    -1     
+ Misses       26356   26274   -82     
+ Partials        48      47    -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

iOSClient/AppDelegate.swift

iOSClient/Data/NCManageDatabase+Metadata.swift

iOSClient/Networking/NCNetworking.swift

iOSClient/Data/NCManageDatabase+Metadata.swift

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

mpivchev · 2023-11-29T14:10:08Z

iOSClient/Networking/NCNetworking.swift

+            let results = await NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath, livePhotoFile: metadata1.livePhotoFile)
+            print("Send LivePhoto metadata error \(results.error.errorCode)")
+
+            let results1 = await NextcloudKit.shared.setLivephoto(serverUrlfileNamePath: serverUrlfileNamePath1, livePhotoFile: metadata.livePhotoFile)
+            print("Send LivePhoto metadata1 error \(results1.error.errorCode)")
+        }


WHy do we need 2 calls?

As we discussed, try to find better names for these.

mpivchev · 2023-11-29T15:02:27Z

iOSClient/Data/NCManageDatabase+Metadata.swift

    @objc dynamic var livePhotoFile = ""
+    @objc dynamic var livePhotoServer: Bool = false


Suggested change

@objc dynamic var livePhotoServer: Bool = false

/// A flag indicating if the file is sent as a live photo from the server, or if we should detect it as such and convert it client-side, then send it back to server.

/// Usually this will be false if it's an old media and there is no `<metadata-files-live-photo xmlns="[http://nextcloud.org/ns\"/>]` flag in the metadata, and true if there is.

@objc dynamic var isFlaggedAsLivePhotoByServer: Bool = false

mpivchev · 2023-11-29T15:07:47Z

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -61,8 +61,8 @@ class tableMetadata: Object, NCUserBaseUrl {
    @objc dynamic var iconName = ""
    @objc dynamic var iconUrl = ""
    @objc dynamic var isExtractFile: Bool = false
-    @objc dynamic var livePhoto: Bool = false
    @objc dynamic var livePhotoFile = ""


Suggested change

@objc dynamic var livePhotoFile = ""

///If this is not empty, the media is a live photo. New media gets this straight from server, but old media needs to be detected as live photo, converted client side, and sent back to server to update.

@objc dynamic var livePhotoFileName = ""

but old media if detected correctly are taken over by NextcloudKit, it must then be the client that sends the conversion to the server

Oops, will modify

mpivchev · 2023-11-29T15:08:33Z

Should rename vars AND add the comments in both NextcloudKit and iOS app.

marinofaggiana · 2023-11-29T15:30:42Z

Should rename vars AND add the comments in both NextcloudKit and iOS app.

suggest .. remember need modify NextcloudKit, iOS app, database version ... and oldSchemaVersion conversion

mpivchev · 2023-11-29T15:40:01Z

Should rename vars AND add the comments in both NextcloudKit and iOS app.

suggest .. remember need modify NextcloudKit, iOS app, database version ... and oldSchemaVersion conversion

You can do this in new PR

* biometry * improved / fix forbidden charactes * fix media deleteFile * Livephoto Server NC 28 (#2683) * NextcloudKit 2.9.2 * fix(i18n): Improved grammar and fixed typos (#2692) --------- Co-authored-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> Co-authored-by: Milen Pivchev <milen.pivchev@gmail.com> Co-authored-by: rakekniven <2069590+rakekniven@users.noreply.github.com>

* Version 4.9.2 (#2673) Version 4.9.2 * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * add async/await searchMedia Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> * add async/await searchMedia Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> * Update NCMedia.swift * Update NCMedia.swift * Update NCMedia.swift * Update NCMedia.swift * add async/await searchMedia Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> * Update NCMedia.swift * Update NCMedia.swift * Update NCMedia.swift * Update NCMedia.swift * Update NCMedia.swift * Update NCMedia.swift * add async/await searchMedia Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> * add async/await searchMedia Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * add async/await searchMedia Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> * add async/await searchMedia Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> * add async/await searchMedia Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> * Update NCMedia.swift * add async/await searchMedia Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> * Update NCMedia.swift * add async/await searchMedia Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> * add async/await searchMedia Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> * Update NCMedia.swift * Update NCManageDatabase+Metadata.swift * Update NCMedia.swift * Update NCManageDatabase+Metadata.swift * Update NCManageDatabase+Metadata.swift * Update NCMedia.swift * Update NCMedia.swift * Update NCManageDatabase+Metadata.swift * Update NCMedia.swift * Update NCMedia.swift * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * Update NCMedia.swift * Update NCMedia.swift * Update NCMedia.swift * Update NCMedia.swift * Update NCMedia.swift * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Update NCMedia.swift * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * coding * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * coding * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Load old media Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * Livephoto Server NC 28 (#2683) LivePhoto detect --------- Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * code improved Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * code improved Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * code improved Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * code improved Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * code improved Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * code improved Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * code improved Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Track first and last metadata that appear Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * #2687 Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * #2687 Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * Build 2 Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * NextcloudKit 2.9.2 Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * cleaning Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * fix(i18n): Improved grammar and fixed typos (#2692) Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com> * V 4.9.3 (#2695) * biometry * improved / fix forbidden charactes * fix media deleteFile * Livephoto Server NC 28 (#2683) * NextcloudKit 2.9.2 * fix(i18n): Improved grammar and fixed typos (#2692) --------- Co-authored-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> Co-authored-by: Milen Pivchev <milen.pivchev@gmail.com> Co-authored-by: rakekniven <2069590+rakekniven@users.noreply.github.com> * isLivePhoto Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * Build 3 Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * V 4.9.3 b 3 (#2696) * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * Improved the Media metadata, ImageCache, convert Live Photo (#2698) * Update NCManageDatabase+Metadata.swift * Update NCMedia.swift * new db updateMetadas * updateMetadas * convertLivePhotoQueue * Update NCManageDatabase+Metadata.swift Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Chunk metadata in parent, remove unneeded bindings Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Fix crash Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Fix threads Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Fix warnings Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Oops Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * fix navigationController Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * fix Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * comments Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * New loading of media Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Fix to and from date Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Refactor Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * Livephoto improvements (#2702) Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * new Build Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * new DB version Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * fix HUD Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * improvements code Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * build 2 Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * improvements code Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * NextcloudKit 2.9.3 Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * V 4.9.4 (#2703) * Improved the Media metadata, ImageCache, convert Live Photo (#2698) * Update NCManageDatabase+Metadata.swift * Update NCMedia.swift * new db updateMetadas * updateMetadas * convertLivePhotoQueue * Update NCManageDatabase+Metadata.swift * Fix Version 4.9.5 (#2704) * fix Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * V 4.9.5 (#2705) Fix E2ee * Improve code Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * lint Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * lint Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * improved code Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * Version 4.9.6 Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * fix upload livephoto, remove old code Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * fix Upload Live Photo Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * improved code Live photo Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * remove “old” hud for copy/move/delete file Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * NextcloudKit 2.9.4 Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * bugfix Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * bugfix Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * Fix Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * added description Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * improved code Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * Virus detect (#2707) Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * Download improvements (#2710) Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * Queue message (#2713) * coding Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * cleaning Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * Badge Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * Message (#2715) * notificationCenter Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot <bot@nextcloud.com> * Fix row now loading bug Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Remove “new media” code Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Remove old NCMedia Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Refactor Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Oops Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> --------- Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> Signed-off-by: Nextcloud bot <bot@nextcloud.com> Signed-off-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com> Co-authored-by: Marino Faggiana <marino@marinofaggiana.com> Co-authored-by: Nextcloud bot <bot@nextcloud.com> Co-authored-by: Marino Faggiana <8616947+marinofaggiana@users.noreply.github.com> Co-authored-by: rakekniven <2069590+rakekniven@users.noreply.github.com>

marinofaggiana added 13 commits November 28, 2023 09:37

Update project.pbxproj

678c0a3

coding

db91e1e

Update NCNetworking.swift

f9e55e0

coding

d13ca6b

cleaning

05da97b

cleaning

2f7a1e5

cleaning

bce00df

new DB version

fe6a3d5

livePhotoMetadata

bb7b8a2

Update NCDataSource.swift

d081291

Update NCNetworking.swift

6cd5210

cod

998a1f9

Update project.pbxproj

6ffaedc

marinofaggiana requested a review from mpivchev November 29, 2023 09:05

marinofaggiana added 2 commits November 29, 2023 10:54

fix

e69b657

fix

8a0f9d7

mpivchev requested changes Nov 29, 2023

View reviewed changes

iOSClient/AppDelegate.swift Show resolved Hide resolved

iOSClient/Data/NCManageDatabase+Metadata.swift Outdated Show resolved Hide resolved

iOSClient/Networking/NCNetworking.swift Outdated Show resolved Hide resolved

iOSClient/Data/NCManageDatabase+Metadata.swift Show resolved Hide resolved

fix

0b0d1ff

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

marinofaggiana requested a review from mpivchev November 29, 2023 13:45

mpivchev reviewed Nov 29, 2023

View reviewed changes

mpivchev requested changes Nov 29, 2023

View reviewed changes

marinofaggiana requested a review from mpivchev November 29, 2023 15:30

mpivchev approved these changes Nov 29, 2023

View reviewed changes

marinofaggiana merged commit 1b97134 into develop Nov 29, 2023
3 of 4 checks passed

delete-merged-branch bot deleted the livephoto branch November 29, 2023 15:42

marinofaggiana restored the livephoto branch November 29, 2023 15:42

marinofaggiana deleted the livephoto branch November 30, 2023 09:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Livephoto Server NC 28 #2683

Livephoto Server NC 28 #2683

marinofaggiana commented Nov 29, 2023 •

edited

codecov bot commented Nov 29, 2023 •

edited

mpivchev Nov 29, 2023

mpivchev Nov 29, 2023

mpivchev Nov 29, 2023 •

edited

mpivchev Nov 29, 2023 •

edited

marinofaggiana Nov 29, 2023

mpivchev Nov 29, 2023

mpivchev commented Nov 29, 2023

marinofaggiana commented Nov 29, 2023

mpivchev commented Nov 29, 2023

		@objc dynamic var livePhotoFile = ""
		@objc dynamic var livePhotoServer: Bool = false

-    @objc dynamic var livePhotoServer: Bool = false
+    /// A flag indicating if the file is sent as a live photo from the server, or if we should detect it as such and convert it client-side, then send it back to server.
+    /// Usually this will be false if it's an old media and there is no `<metadata-files-live-photo xmlns="[http://nextcloud.org/ns\"/>]` flag in the metadata, and true if there is.
+    @objc dynamic var isFlaggedAsLivePhotoByServer: Bool = false

	@objc dynamic var livePhotoFile = ""
	///If this is not empty, the media is a live photo. New media gets this straight from server, but old media needs to be detected as live photo, converted client side, and sent back to server to update.
	@objc dynamic var livePhotoFileName = ""

Livephoto Server NC 28 #2683

Livephoto Server NC 28 #2683

Conversation

marinofaggiana commented Nov 29, 2023 • edited

codecov bot commented Nov 29, 2023 • edited

Codecov Report

mpivchev Nov 29, 2023

Choose a reason for hiding this comment

mpivchev Nov 29, 2023

Choose a reason for hiding this comment

mpivchev Nov 29, 2023 • edited

Choose a reason for hiding this comment

mpivchev Nov 29, 2023 • edited

Choose a reason for hiding this comment

marinofaggiana Nov 29, 2023

Choose a reason for hiding this comment

mpivchev Nov 29, 2023

Choose a reason for hiding this comment

mpivchev commented Nov 29, 2023

marinofaggiana commented Nov 29, 2023

mpivchev commented Nov 29, 2023

marinofaggiana commented Nov 29, 2023 •

edited

codecov bot commented Nov 29, 2023 •

edited

mpivchev Nov 29, 2023 •

edited

mpivchev Nov 29, 2023 •

edited