Skip to content

Commit

Permalink
Use photosSourceFolder in photos search
Browse files Browse the repository at this point in the history 
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@artonge
artonge committed Feb 7, 2024
1 parent af0fd8b commit 6c75718
Show file tree
Hide file tree
Showing 24 changed files with 189 additions and 505 deletions.
222 changes: 49 additions & 173 deletions js/photos-main.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-main.js.map
View file

Large diffs are not rendered by default.

33 changes: 17 additions & 16 deletions js/photos-public.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21234,7 +21234,8 @@ function getPropFind(extraProps = []) {
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__),
/* harmony export */ getFolder: () => (/* binding */ getFolder)
/* harmony export */ });
/* harmony import */ var _nextcloud_files__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @nextcloud/files */ "./node_modules/@nextcloud/files/dist/index.mjs");
/* harmony import */ var _nextcloud_initial_state__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @nextcloud/initial-state */ "./node_modules/@nextcloud/initial-state/dist/index.es.mjs");
Expand Down Expand Up @@ -21303,7 +21304,7 @@ const module = {
state() {
return {
croppedLayout: (0,_nextcloud_initial_state__WEBPACK_IMPORTED_MODULE_1__.loadState)('photos', 'croppedLayout', 'false') === 'true',
photosSourceFolders: JSON.parse((0,_nextcloud_initial_state__WEBPACK_IMPORTED_MODULE_1__.loadState)('photos', 'photosSourceFolders', '[]')),
photosSourceFolder: (0,_nextcloud_initial_state__WEBPACK_IMPORTED_MODULE_1__.loadState)('photos', 'photosSourceFolder', ''),
photosLocation: (0,_nextcloud_initial_state__WEBPACK_IMPORTED_MODULE_1__.loadState)('photos', 'photosLocation', ''),
photosLocationFolder: undefined
};
Expand All @@ -21317,15 +21318,6 @@ const module = {
}
},
actions: {
async initUserConfig({
commit
}) {
const photosLocationFolder = await getFolder((0,_nextcloud_initial_state__WEBPACK_IMPORTED_MODULE_1__.loadState)('photos', 'photosLocation', ''));
commit('updateUserConfig', {
key: 'photosLocationFolder',
value: photosLocationFolder
});
},
async updateUserConfig({
commit
}, {
Expand All @@ -21336,9 +21328,7 @@ const module = {
key,
value
});
// Long time save setting
await _nextcloud_axios__WEBPACK_IMPORTED_MODULE_6__["default"].put((0,_nextcloud_router__WEBPACK_IMPORTED_MODULE_5__.generateUrl)('apps/photos/api/v1/config/' + key), {
// Stringify non string values.
value: typeof value === 'string' ? value : JSON.stringify(value)
});
}
Expand Down Expand Up @@ -23675,6 +23665,17 @@ vue__WEBPACK_IMPORTED_MODULE_10__["default"].use(vuex__WEBPACK_IMPORTED_MODULE_1
places: _places_js__WEBPACK_IMPORTED_MODULE_5__["default"],
userConfig: _userConfig_ts__WEBPACK_IMPORTED_MODULE_9__["default"]
},
plugins: [store => {
store.subscribe(async (mutation, state) => {
if (mutation.type === 'updateUserConfig' && mutation.payload.key === 'photosLocation') {
const photosLocationFolder = await (0,_userConfig_ts__WEBPACK_IMPORTED_MODULE_9__.getFolder)(state.userConfig.photosLocation);
store.commit('updateUserConfig', {
key: 'photosLocationFolder',
value: photosLocationFolder
});
}
});
}],
strict: "development" !== 'production'
}));

Expand Down Expand Up @@ -218196,7 +218197,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"compressed":true,"categories":[{"id"
/******/ // This function allow to reference async chunks
/******/ __webpack_require__.u = (chunkId) => {
/******/ // return url for filenames based on template
/******/ return "photos-" + chunkId + ".js?v=" + {"vendors-node_modules_nextcloud_upload_dist_index_mjs":"fda0f7774dad7cb2db86","vendors-node_modules_vue-virtual-grid_dist_vue-virtual-grid_es_js-node_modules_vue-material-d-d44540":"f303a0ad77c2b2339e52","src_mixins_AbortControllerMixin_js-src_components_HeaderNavigation_vue":"f81560dcac7f7154d161","src_views_Folders_vue":"34fc252bab5fed0305c8","vendors-node_modules_nextcloud_sharing_dist_index_js-node_modules_vue-material-design-icons_A-b8d79d":"e684ed68e4f121796cab","vendors-node_modules_vue-material-design-icons_AlertCircle_vue-node_modules_vue-material-desi-bb4af6":"23e68045012935830d6a","src_mixins_FetchCollectionContentMixin_js":"a8c696e469e7b9b5b67b","src_components_Albums_AlbumForm_vue":"7f61046484f43dfc9fdb","src_mixins_FetchCollectionsMixin_js-src_components_Collection_CollectionCover_vue-src_compone-02d443":"b1770161cc47441721e6","src_views_Albums_vue":"d8cb23c1406f699491fd","vendors-node_modules_vue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-856c5b":"6c7356d5818f197a47b9","vendors-node_modules_vue-material-design-icons_AlertCircle_vue-node_modules_vue-material-desi-27c787":"a289de0259e464e40452","vendors-node_modules_debounce_index_js-node_modules_vue-material-design-icons_Pencil_vue-node-22e157":"1500c82bb20d19e6d4cc","src_mixins_FilesSelectionMixin_js-src_components_File_vue-src_components_FilesListViewer_vue":"14b78e8d7bf0dee68be1","src_components_Collection_CollectionContent_vue":"174ae93c7c23177159de","src_mixins_FetchFilesMixin_js-src_mixins_FilesByMonthMixin_js":"6adab2fab46791fc424c","src_components_FilesPicker_vue":"c3ed870669af8dff7a8a","src_views_AlbumContent_vue":"4c7caf39d7b8c87489ca","src_services_collectionFetcher_js-src_views_SharedAlbums_vue":"7d6cad21bb272481aced","src_views_SharedAlbumContent_vue":"bc9bbd3eaf58c72f4157","vendors-node_modules_vue-material-design-icons_AlertCircle_vue-node_modules_vue-material-desi-c193af":"de653726e01215bb6308","src_views_PublicAlbumContent_vue":"22bafdfae404805efd13","src_services_collectionFetcher_js-src_views_Places_vue":"c4dc70c387119a7a6f0f","vendors-node_modules_vue-material-design-icons_AlertCircle_vue-node_modules_vue-material-desi-61889f":"8d65589ce7dedf1ee19d","src_views_PlaceContent_vue":"322321681c7c37003e35","src_views_Tags_vue":"5207f55bd3c93704411d","src_views_TagContent_vue":"3911e621f547f5eb9ddc","vendors-node_modules_vue-material-design-icons_Delete_vue-node_modules_vue-material-design-ic-a77421":"57b65dd44583b89dc742","src_views_Timeline_vue":"e36cd35a1f8fab3c722b","vendors-node_modules_he_he_js":"29240ee109f014c88265","src_components_Faces_FaceCover_vue":"e681d3a17dc429deae32","src_views_Faces_vue":"3b329a85d53dd1831d8b","vendors-node_modules_vue-material-design-icons_AccountSwitch_vue-node_modules_vue-material-de-65950c":"3625e965850c0ca6469c","vendors-node_modules_vue-material-design-icons_AccountBoxMultipleOutline_vue-node_modules_vue-5a23de":"bbe978a9977f805cc233","src_mixins_FetchFilesMixin_js-src_components_Faces_FaceMergeForm_vue":"0167f5c9f3ad44b2ded4","src_views_FaceContent_vue":"bf9b3232d7142848d55d","src_views_UnassignedFaces_vue":"19baeef143a51479914a","vendors-node_modules_nextcloud_upload_dist_chunks_ConflictPicker-28e9d8de_mjs":"dbcfc079c25ac46ffd5b","node_modules_nextcloud_upload_node_modules_nextcloud_dialogs_dist_chunks_index-c0bccfab_mjs":"fe7d1764919eed52ff86","vendors-node_modules_nextcloud_upload_node_modules_nextcloud_dialogs_dist_chunks_FilePicker-0-aee94f":"1bc638f2589fd395057f"}[chunkId] + "";
/******/ return "photos-" + chunkId + ".js?v=" + {"vendors-node_modules_nextcloud_upload_dist_index_mjs":"fda0f7774dad7cb2db86","vendors-node_modules_vue-virtual-grid_dist_vue-virtual-grid_es_js-node_modules_vue-material-d-d44540":"f303a0ad77c2b2339e52","src_mixins_AbortControllerMixin_js-src_components_HeaderNavigation_vue":"f81560dcac7f7154d161","src_views_Folders_vue":"345022616072fd3ae180","vendors-node_modules_nextcloud_sharing_dist_index_js-node_modules_vue-material-design-icons_A-b8d79d":"e684ed68e4f121796cab","vendors-node_modules_vue-material-design-icons_AlertCircle_vue-node_modules_vue-material-desi-bb4af6":"23e68045012935830d6a","src_mixins_FetchCollectionContentMixin_js":"a8c696e469e7b9b5b67b","src_components_Albums_AlbumForm_vue":"7f61046484f43dfc9fdb","src_mixins_FetchCollectionsMixin_js-src_components_Collection_CollectionCover_vue-src_compone-02d443":"b1770161cc47441721e6","src_views_Albums_vue":"d8cb23c1406f699491fd","vendors-node_modules_vue-material-design-icons_ArrowLeft_vue-node_modules_vue-material-design-856c5b":"6c7356d5818f197a47b9","vendors-node_modules_vue-material-design-icons_AlertCircle_vue-node_modules_vue-material-desi-27c787":"a289de0259e464e40452","vendors-node_modules_debounce_index_js-node_modules_vue-material-design-icons_Pencil_vue-node-22e157":"1500c82bb20d19e6d4cc","src_mixins_FilesSelectionMixin_js-src_components_File_vue-src_components_FilesListViewer_vue":"54c89861149baeea5c4b","src_components_Collection_CollectionContent_vue":"174ae93c7c23177159de","src_mixins_FetchFilesMixin_js-src_mixins_FilesByMonthMixin_js":"c9b80ecf3bc2f6f8fd6d","src_components_FilesPicker_vue":"370b393c73cbe86c6bd3","src_views_AlbumContent_vue":"3117f7e15d4f219f4435","src_services_collectionFetcher_js-src_views_SharedAlbums_vue":"7d6cad21bb272481aced","src_views_SharedAlbumContent_vue":"bc9bbd3eaf58c72f4157","vendors-node_modules_vue-material-design-icons_AlertCircle_vue-node_modules_vue-material-desi-c193af":"de653726e01215bb6308","src_views_PublicAlbumContent_vue":"22bafdfae404805efd13","src_services_collectionFetcher_js-src_views_Places_vue":"c4dc70c387119a7a6f0f","vendors-node_modules_vue-material-design-icons_AlertCircle_vue-node_modules_vue-material-desi-61889f":"8d65589ce7dedf1ee19d","src_views_PlaceContent_vue":"322321681c7c37003e35","src_views_Tags_vue":"5207f55bd3c93704411d","src_views_TagContent_vue":"3911e621f547f5eb9ddc","vendors-node_modules_vue-material-design-icons_Delete_vue-node_modules_vue-material-design-ic-a77421":"57b65dd44583b89dc742","src_views_Timeline_vue":"b2b1d25e48e753dda13b","vendors-node_modules_he_he_js":"29240ee109f014c88265","src_components_Faces_FaceCover_vue":"e681d3a17dc429deae32","src_views_Faces_vue":"3b329a85d53dd1831d8b","vendors-node_modules_vue-material-design-icons_AccountSwitch_vue-node_modules_vue-material-de-65950c":"3625e965850c0ca6469c","vendors-node_modules_vue-material-design-icons_AccountBoxMultipleOutline_vue-node_modules_vue-5a23de":"bbe978a9977f805cc233","src_mixins_FetchFilesMixin_js-src_components_Faces_FaceMergeForm_vue":"ff1f5b932fa23aa063b5","src_views_FaceContent_vue":"bf9b3232d7142848d55d","src_views_UnassignedFaces_vue":"19baeef143a51479914a","vendors-node_modules_nextcloud_upload_dist_chunks_ConflictPicker-28e9d8de_mjs":"dbcfc079c25ac46ffd5b","node_modules_nextcloud_upload_node_modules_nextcloud_dialogs_dist_chunks_index-c0bccfab_mjs":"fe7d1764919eed52ff86","vendors-node_modules_nextcloud_upload_node_modules_nextcloud_dialogs_dist_chunks_FilePicker-0-aee94f":"1bc638f2589fd395057f"}[chunkId] + "";
/******/ };
/******/ })();
/******/
Expand All @@ -218216,7 +218217,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"compressed":true,"categories":[{"id"
/******/
/******/ /* webpack/runtime/getFullHash */
/******/ (() => {
/******/ __webpack_require__.h = () => ("8f908633dc152e8e0f8f")
/******/ __webpack_require__.h = () => ("0dbac028237d9f68af85")
/******/ })();
/******/
/******/ /* webpack/runtime/global */
Expand Down Expand Up @@ -219294,4 +219295,4 @@ module.exports = /*#__PURE__*/JSON.parse('{"compressed":true,"categories":[{"id"
/******/
/******/ })()
;
//# sourceMappingURL=photos-public.js.map?v=5c5aa097d6f3ec322f68
//# sourceMappingURL=photos-public.js.map?v=84a41ab26c7a77ef9ed1
2 changes: 1 addition & 1 deletion js/photos-public.js.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-sidebar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29141,7 +29141,7 @@ var o = n.Gr,
/******/
/******/ /* webpack/runtime/getFullHash */
/******/ (() => {
/******/ __webpack_require__.h = () => ("8f908633dc152e8e0f8f")
/******/ __webpack_require__.h = () => ("0dbac028237d9f68af85")
/******/ })();
/******/
/******/ /* webpack/runtime/global */
Expand Down Expand Up @@ -30219,4 +30219,4 @@ var o = n.Gr,
/******/
/******/ })()
;
//# sourceMappingURL=photos-sidebar.js.map?v=ddb086b7c080b40c1386
//# sourceMappingURL=photos-sidebar.js.map?v=af6dfb9e55e7b3049343
2 changes: 1 addition & 1 deletion js/photos-sidebar.js.map
View file

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions js/photos-src_components_FilesPicker_vue.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/photos-src_components_FilesPicker_vue.js.map
View file

Large diffs are not rendered by default.

24 changes: 18 additions & 6 deletions js/photos-src_mixins_FetchFilesMixin_js-src_components_Faces_FaceMergeForm_vue.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/photos-src_mixins_FetchFilesMixin_js-src_components_Faces_FaceMergeForm_vue.js.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 6c75718

Please sign in to comment.