Select root folder for timeline #515

Mikescops · 2020-10-23T22:07:49Z

Closes #141

Signed-off-by: Corentin Mors <corentin.mors@dashlane.com>

Mikescops · 2020-10-23T22:08:40Z

@skjnldsv I don't know why but .jpg (which are JPEG files) are not taken in account, for some reasons, and as of now i can't find why..

Mikescops · 2020-10-24T06:58:16Z

Seems like the dav:or is not working and only the first mime type is taken in account.

strugee · 2020-10-24T16:59:49Z

This only provides for one root folder, right? That would be a problem for me and I assume other folks too since there's a couple places photos go if you use the out-of-the-box defaults - brand new accounts have a "Photos" folder created for them, so that's a natural place to put them, but the Android app auto uploads photos to the "InstantUpload" folder by default.

ntimo · 2020-10-24T17:43:10Z

But when there is no photos directory select manually the app should function as it does with the default settings, I would assume. So this would also some your issue @strugee. Am I correct @Mikescops? :)

strugee · 2020-10-24T18:56:49Z

@ntimo right, that would be a workaround. But then I have the original issue described in #141 again.

Mikescops · 2020-10-24T20:47:39Z

By default no difference with the current version, but you can select one folder from where images on your timeline will be fetched from.

skjnldsv · 2020-10-25T14:35:20Z

src/services/PhotoSearch.js

+		? `<d:eq>
+				<d:prop>
+					<oc:owner-id/>
+				</d:prop>
+				<d:literal>${getCurrentUser().uid}</d:literal>
+			</d:eq>`
+		: ''


This is needed to not have the shares as results.
Why did you need to put a condition on it?
It should not cause any issues like it was before :)

The owner filter is only allowed on the root. Dav throws this error if you try on subfolders. What do you think then?

Then it should be fixed on server.
cc @rullzer and @icewind1991 :)

nextcloud/server#17941

https://github.com/nextcloud/server/blob/2a054e6c04e0a40421510eb889cbf59f153c5177/lib/private/Files/Node/Folder.php#L246

skjnldsv · 2020-10-25T14:37:30Z

lib/Controller/PageController.php

 		$this->initialStateService->provideInitialState($this->appName, 'croppedLayout', $this->config->getUserValue($user->getUid(), Application::APP_ID, 'croppedLayout', 'false'));
+		$this->initialStateService->provideInitialState($this->appName, 'timelineRootFolder', $this->config->getUserValue($user->getUid(), Application::APP_ID, 'timelineRootFolder', '/'));


We should probably limit the allowed keys here:

photos/lib/Controller/ApiController.php

Line 66 in 441f970

$user = $this->userSession->getUser();

As a safety mesure 🤔

I'm not sure what you mean

setUserConfig allows anything, and will put it straight into the db.
Meaning we could override existing values. We should check if the $key is either timelineRootFolder or croppedLayout and throw otherwise as a safety measure

strugee · 2020-10-31T03:51:06Z

By default no difference with the current version, but you can select one folder from where images on your timeline will be fetched from.

@Mikescops right, to clarify, I'm not suggesting this would break existing workflows - I'm just saying that the feature might not actually be complete enough for many(?) users due to defaults in the server/Android app. Speaking only for myself, for example, I would not be able to use this feature since given the way my Nextcloud is organized, if I turned it on I would end up missing a ton of images that I'd want to see in the Photos app.

@jancborchardt I'd be interested in hearing if you agree or if you think it's not worth the additional interface/code complexity.

Mikescops · 2020-10-31T08:39:21Z

It's outside of the scope of this PR, if you're not happy with it, open a separate issue after it's merged, thanks.

saywebsolutions · 2020-11-12T17:26:44Z

Which release will this go into? I'm looking forward to being able to use photos again, thank you @Mikescops

Mikescops · 2020-11-12T17:31:26Z

NC 21 at least, for now we're stuck with a server issue.

StarSmasher44 · 2020-12-29T19:43:10Z

Hi! Sorry to bring this back, but I am hopeful this merge will resolve my issue. Is there any status update on this?
I saw the 'server problem' pull had been merged, is there anything else that needs to be done or fixed in order to get this in asap?

skjnldsv · 2020-12-30T08:10:18Z

I saw the 'server problem' pull had been merged, is there anything else that needs to be done or fixed in order to get this in asap?

Hey! The server hasn't received anything regarding this fix yet. Unfortunately this is not yet possible :/

StarSmasher44 · 2020-12-30T10:50:52Z

I saw the 'server problem' pull had been merged, is there anything else that needs to be done or fixed in order to get this in asap?

Hey! The server hasn't received anything regarding this fix yet. Unfortunately this is not yet possible :/

Ah well that sucks, I was referring to this one: nextcloud/server#17941 mentioned some posts up.

But would you happen to know what still needs to be done/added/fixed to make this work? I have a limited background in web development languages so I might be able to pull something through, even though I highly doubt it.

skjnldsv · 2020-12-30T11:36:56Z

But would you happen to know what still needs to be done/added/fixed to make this work? I have a limited background in web development languages so I might be able to pull something through, even though I highly doubt it.

It require a fair amount of rework on the backend dav search implementation :/

StarSmasher44 · 2020-12-30T12:03:20Z

But would you happen to know what still needs to be done/added/fixed to make this work? I have a limited background in web development languages so I might be able to pull something through, even though I highly doubt it.

It require a fair amount of rework on the backend dav search implementation :/

Sorry for being overly asking questions or coming off as pushy in any regard, I am merely just trying to figure out a good entry point, I looked through the code twice but I can't find an obvious stopping point beside the mentioned error with single vs multiple mime types being used.

And I am unsure if you even know enough of this PR yourself to respond (It isn't easy going off using other people's work as a starting point for yourself, imo) but I still have no idea what is actually wrong with this code, what needs fixing and what doesn't.

To me it looks mostly fine, given all it really needs to do is enter/search a single folder and mark that as the 'Photos' folder for NextCloud, if I get this correct.

If I have more information I may try to play around with this to see if I can bring it to a working state somehow, I have a bad taste for using OneDrive as my image backup server ever since Samsung forced it upon me, and this still adds in 600 images from my several Unity projects.

skjnldsv · 2021-01-07T09:07:12Z

@StarSmasher44 I suggest you read the original issues like nextcloud/server#17941 #141 entirely (with the folded comments too)

Again, this requires a fix on server. Currently there is a hard limitation for our webdav SEARCH that forces you to limit the search to a user home for performance issues.
That is why we don't have external storage nor groupfolders. And if you ignore this, you will not be able to properly filter it anymore. This requires a big revamp for al the following points to be implemented:

Allow to search/filter by tags (favourites)
Allow to search/filter by mime
Allow to search/filter by user
Allow to search/filter within a folder OR from root (currently only root is allowed with filtering)
Allow to limit results
Allow to sort results

Currently, the combo search-from-folder AND filter-by-owner is missing. It's not enabled (hard-coded on server) Once it is here, we'll be able to tell the Photos app to search from within the provided root folder instead of the default root.

AndyScherzinger · 2024-03-21T08:22:02Z

@artonge I guess this PR is obsolete with #2319 having been merged?

Select root folder for timeline

901d7d9

Signed-off-by: Corentin Mors <corentin.mors@dashlane.com>

Mikescops added enhancement New feature or request 3. to review Waiting for reviews feature: timeline Related to the timeline section labels Oct 23, 2020

Mikescops requested a review from skjnldsv October 23, 2020 22:07

Mikescops self-assigned this Oct 23, 2020

skjnldsv reviewed Oct 25, 2020

View reviewed changes

strugee mentioned this pull request Dec 29, 2020

🖼️📂 Limit Photos to a single folder + subtree #141

Closed

1 task

This comment has been minimized.

Sign in to view

skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Feb 17, 2021

bonswouar mentioned this pull request Aug 12, 2021

.nomedia / .noimage file not respected within "Your photos" #234

Closed

blizzz added this to the Nextcloud 25 milestone Apr 21, 2022

This was referenced Aug 12, 2022

25.0.0 beta 1 nextcloud/server#33505

Merged

25.0.0 beta 2 nextcloud/server#33592

Merged

This was referenced Aug 24, 2022

25.0.0 beta 3 nextcloud/server#33674

Merged

25.0.0 beta 4 nextcloud/server#33762

Merged

This was referenced Sep 6, 2022

25.0.0 beta 5 nextcloud/server#33913

Merged

25.0.0 beta 6 nextcloud/server#34002

Merged

skjnldsv mentioned this pull request Sep 15, 2022

25.0.0 beta 7 nextcloud/server#34095

Merged

This was referenced Sep 20, 2022

25.0.0 beta 8 nextcloud/server#34164

Closed

25.0.0 RC 1 nextcloud/server#34185

Merged

blizzz modified the milestones: Nextcloud 25, Nextcloud 26 Sep 22, 2022

blizzz mentioned this pull request Feb 1, 2023

26.0.0 beta 2 nextcloud/server#36484

Merged

skjnldsv mentioned this pull request Feb 23, 2023

26.0.0 beta 5 nextcloud/server#36834

Merged

blizzz mentioned this pull request Mar 7, 2023

26.0.0 RC2 nextcloud/server#37078

Merged

blizzz modified the milestones: Nextcloud 26, Nextcloud 27 Mar 9, 2023

This was referenced May 3, 2023

27.0.0 beta 1 nextcloud/server#38038

Merged

27.0.0 beta 2 nextcloud/server#38137

Closed

27.0.0 beta 2 nextcloud/server#38139

Merged

skjnldsv removed this from the Nextcloud 27 milestone May 10, 2023

skjnldsv marked this pull request as draft May 10, 2023 09:47

AndyScherzinger added this to the Nextcloud 29 milestone Feb 20, 2024

This was referenced Mar 12, 2024

29.0.0 beta 2 nextcloud/server#44152

Merged

29.0.0 beta 3 nextcloud/server#44186

Merged

29.0.0 beta 4 nextcloud/server#44275

Merged

Altahrim mentioned this pull request Mar 20, 2024

29.0.0 beta 5 nextcloud/server#44361

Merged

artonge closed this Mar 21, 2024

jancborchardt deleted the feature/select-root-folder-timeline branch May 7, 2024 09:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Select root folder for timeline #515

Select root folder for timeline #515

Mikescops commented Oct 23, 2020

Mikescops commented Oct 23, 2020

Mikescops commented Oct 24, 2020

strugee commented Oct 24, 2020

ntimo commented Oct 24, 2020

strugee commented Oct 24, 2020

Mikescops commented Oct 24, 2020

skjnldsv Oct 25, 2020

Mikescops Oct 25, 2020

skjnldsv Oct 26, 2020

skjnldsv Oct 26, 2020

skjnldsv Oct 26, 2020

skjnldsv Oct 25, 2020

Mikescops Oct 29, 2020

skjnldsv Oct 29, 2020

Mikescops Oct 29, 2020

strugee commented Oct 31, 2020

Mikescops commented Oct 31, 2020

saywebsolutions commented Nov 12, 2020

Mikescops commented Nov 12, 2020

StarSmasher44 commented Dec 29, 2020

skjnldsv commented Dec 30, 2020

StarSmasher44 commented Dec 30, 2020

skjnldsv commented Dec 30, 2020

StarSmasher44 commented Dec 30, 2020

skjnldsv commented Jan 7, 2021 •

edited

Loading

This comment has been minimized.

AndyScherzinger commented Mar 21, 2024

		$this->initialStateService->provideInitialState($this->appName, 'croppedLayout', $this->config->getUserValue($user->getUid(), Application::APP_ID, 'croppedLayout', 'false'));
		$this->initialStateService->provideInitialState($this->appName, 'timelineRootFolder', $this->config->getUserValue($user->getUid(), Application::APP_ID, 'timelineRootFolder', '/'));

Select root folder for timeline #515

Select root folder for timeline #515

Conversation

Mikescops commented Oct 23, 2020

Mikescops commented Oct 23, 2020

Mikescops commented Oct 24, 2020

strugee commented Oct 24, 2020

ntimo commented Oct 24, 2020

strugee commented Oct 24, 2020

Mikescops commented Oct 24, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

strugee commented Oct 31, 2020

Mikescops commented Oct 31, 2020

saywebsolutions commented Nov 12, 2020

Mikescops commented Nov 12, 2020

StarSmasher44 commented Dec 29, 2020

skjnldsv commented Dec 30, 2020

StarSmasher44 commented Dec 30, 2020

skjnldsv commented Dec 30, 2020

StarSmasher44 commented Dec 30, 2020

skjnldsv commented Jan 7, 2021 • edited Loading

This comment has been minimized.

AndyScherzinger commented Mar 21, 2024

skjnldsv commented Jan 7, 2021 •

edited

Loading