Add config to select source directories #2319

artonge · 2024-02-06T13:50:30Z

Fix #141

TODO

Ensure mobiles clients are also restricting photos source.

Changes

Add a photosSourceFolder config, defaulting to /Photos
Rewrite UserConfig mixin into a Vuex store and remove the usage of the mixin everywhere.
Use the new photosSourceFolder option in the photos search request
Add UI to update photosSourceFolder
Update UI to set photosLocation to match design mockups
Update the timelines when photosSourceFolder gets updated
Unrelated fix: update photosLocationFolder when photosLocation is updated

Limitations

It is currently not possible to make a search on multiple folders with WebDAV. This limitation should be removed by 🔍📂 Unified Search in specific folder server#42915. But in the meantime, this PR does not support the selection of multiple source folders.

Screenshots

Defaults	Edited	Root folder

nimishavijay

Looking great! :) Only really small comments:

For the media folders: "Choose a different folder" --> "Add folder" (updated the mockup after you started working on the PR, my bad)
how would people be able to remove folders? (eg. would the file picker component allow multiselect, so people can unselect folders?)
Unsure about the wording "Root folder" we could maybe change the icon to a home icon or change the wording to something else, any suggestions @nextcloud/designers? :)

jancborchardt · 2024-02-07T19:52:43Z

Unsure about the wording "Root folder" we could maybe change the icon to a home icon or change the wording to something else, any suggestions @nextcloud/designers? :)

As discussed, the "root" folder should be "Home" and use the home house icon that we also use in the breadcrumbs in Files.

artonge · 2024-02-08T09:32:11Z

* For the media folders: "Choose a different folder" --> "Add folder" (updated the [mockup](https://github.com/nextcloud/photos/issues/141#issuecomment-1927554553) after you started working on the PR, my bad)
* how would people be able to remove folders? (eg. would the file picker component allow multiselect, so people can unselect folders?)

As stated, this PR does not support the selection of multiple source folders for now. The day we can search in multiple folders, I will follow your above recommendations :).

* Unsure about the wording "Root folder" we could maybe change the icon to a home icon or change the wording to something else, any suggestions @nextcloud/designers? :)

Updated !

src/services/PhotoSearch.js

src/views/Timeline.vue

src/components/Settings/PhotosSourceLocationsSettings.vue

src/components/Settings/PhotosUploadLocationSettings.vue

nimishavijay

Sounds good! In that case, only change "Media folders" to "Media folder" (folder is singular, not plural :) ) approving to not block! :)

skjnldsv · 2024-02-15T14:51:12Z

src/components/Settings/PhotosFolder.vue

+		subname() {
+			const slashesCount = (this.path.match(/\//g) ?? []).length
+
+			switch (slashesCount) {
+			case 1:
+				return ''
+			case 2:
+				return this.path.split('/').splice(0, 2).join('/')
+			default:
+				return this.path.split('/').splice(0, 3).join('/')
+			}


What is this sorcery? 😁

To properly display the path of the folder. Let me add a comment.

Full path Displayed path

/ Home

/a nothing

/a/b /a

/a/b/c /a/b

More comments the better :)

Signed-off-by: Louis Chemineau <[email protected]>

artonge · 2024-02-15T15:24:38Z

Added some comments and a better error handling when the folder does not exist.

Signed-off-by: Louis Chemineau <[email protected]>

szaimen · 2024-02-15T15:59:28Z

🎉🎉🎉

artonge self-assigned this Feb 6, 2024

artonge added enhancement New feature or request php PHP related ticket javascript Javascript related ticket 2. developing Work in progress labels Feb 6, 2024

artonge added this to the Nextcloud 29 milestone Feb 6, 2024

artonge changed the base branch from master to enh/migrate-to-webdav-v5 February 6, 2024 13:54

artonge force-pushed the artonge/feat/photos_locations branch 4 times, most recently from 5597abb to 6c75718 Compare February 7, 2024 11:54

artonge marked this pull request as ready for review February 7, 2024 12:01

artonge added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 7, 2024

artonge requested review from susnux, skjnldsv and nimishavijay February 7, 2024 12:01

artonge force-pushed the artonge/feat/photos_locations branch 2 times, most recently from 7d742cd to 1de2b1f Compare February 7, 2024 16:46

nimishavijay requested changes Feb 7, 2024

View reviewed changes

artonge requested a review from nimishavijay February 8, 2024 09:32

skjnldsv reviewed Feb 8, 2024

View reviewed changes

src/services/PhotoSearch.js Outdated Show resolved Hide resolved

skjnldsv reviewed Feb 8, 2024

View reviewed changes

src/views/Timeline.vue Outdated Show resolved Hide resolved

artonge force-pushed the artonge/feat/photos_locations branch from 1de2b1f to 042082c Compare February 8, 2024 09:41

skjnldsv reviewed Feb 8, 2024

View reviewed changes

src/components/Settings/PhotosSourceLocationsSettings.vue Show resolved Hide resolved

skjnldsv reviewed Feb 8, 2024

View reviewed changes

src/components/Settings/PhotosUploadLocationSettings.vue Outdated Show resolved Hide resolved

nimishavijay approved these changes Feb 8, 2024

View reviewed changes

artonge force-pushed the artonge/feat/photos_locations branch from 042082c to 4a6986c Compare February 8, 2024 14:58

artonge force-pushed the artonge/feat/photos_locations branch 3 times, most recently from 0943774 to bd9b7a2 Compare February 13, 2024 17:23

artonge requested a review from skjnldsv February 14, 2024 09:12

skjnldsv reviewed Feb 15, 2024

View reviewed changes

skjnldsv approved these changes Feb 15, 2024

View reviewed changes

artonge added 12 commits February 15, 2024 16:24

Add config to select source directories

e038644

Signed-off-by: Louis Chemineau <[email protected]>

Use store to manage user config

bc85b66

Signed-off-by: Louis Chemineau <[email protected]>

use userConfig store in all components

d96558f

Signed-off-by: Louis Chemineau <[email protected]>

Update photosLocationFolder when photosLocation change

e3c3926

Signed-off-by: Louis Chemineau <[email protected]>

Restrict source folder selection to 1

8f16b06

Signed-off-by: Louis Chemineau <[email protected]>

Use photosSourceFolder in photos search

aec5811

Signed-off-by: Louis Chemineau <[email protected]>

Run lint:fix

2cebaf0

Signed-off-by: Louis Chemineau <[email protected]>

Update root folder icon and label for upload location

c357cb2

Signed-off-by: Louis Chemineau <[email protected]>

Fix lint errors

3e0a2d3

Signed-off-by: Louis Chemineau <[email protected]>

Upload test images in the /Photos directory

1cbfa65

Signed-off-by: Louis Chemineau <[email protected]>

Remove warning during compilation

289c4b8

Signed-off-by: Louis Chemineau <[email protected]>

Improve errors handling

57aea9b

Signed-off-by: Louis Chemineau <[email protected]>

Compile assets

b110ae7

Signed-off-by: Louis Chemineau <[email protected]>

artonge force-pushed the artonge/feat/photos_locations branch from bd9b7a2 to b110ae7 Compare February 15, 2024 15:25

artonge merged commit f45f8d3 into master Feb 15, 2024
34 checks passed

artonge deleted the artonge/feat/photos_locations branch February 15, 2024 15:51

blizzz mentioned this pull request Mar 5, 2024

29.0.0 beta 1 nextcloud/server#43991

Merged

AndyScherzinger mentioned this pull request Mar 21, 2024

Select root folder for timeline #515

Closed

AndyScherzinger added the 🍀 2024-Spring label Mar 21, 2024

artonge mentioned this pull request Apr 8, 2024

feat: Allow multiple source folders #2426

Merged

joshtrichards mentioned this pull request Jun 18, 2024

[Bug]: Photos (web) does not display the latest media files scanned by OCC #2506

Closed

8 tasks

joshtrichards mentioned this pull request Aug 5, 2024

Pulling images from outside /Photos directory #1719

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add config to select source directories #2319

Add config to select source directories #2319

artonge commented Feb 6, 2024 •

edited

Loading

nimishavijay left a comment

jancborchardt commented Feb 7, 2024

artonge commented Feb 8, 2024 •

edited

Loading

nimishavijay left a comment

skjnldsv Feb 15, 2024

artonge Feb 15, 2024

skjnldsv Feb 15, 2024

artonge commented Feb 15, 2024

szaimen commented Feb 15, 2024

Add config to select source directories #2319

Add config to select source directories #2319

Conversation

artonge commented Feb 6, 2024 • edited Loading

TODO

Changes

Limitations

Screenshots

nimishavijay left a comment

Choose a reason for hiding this comment

jancborchardt commented Feb 7, 2024

artonge commented Feb 8, 2024 • edited Loading

nimishavijay left a comment

Choose a reason for hiding this comment

skjnldsv Feb 15, 2024

Choose a reason for hiding this comment

artonge Feb 15, 2024

Choose a reason for hiding this comment

skjnldsv Feb 15, 2024

Choose a reason for hiding this comment

artonge commented Feb 15, 2024

szaimen commented Feb 15, 2024

artonge commented Feb 6, 2024 •

edited

Loading

artonge commented Feb 8, 2024 •

edited

Loading