Merge branch 'pulsejet:master' into eltos-patch-99

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [pulsejet]

.github/workflows/e2e.yaml

@@ -118,6 +118,7 @@ jobs:
         ports:
           - 4444:5432/tcp
         env:
+          POSTGRES_DB: nextcloud
           POSTGRES_PASSWORD: rootpassword
         options: >-
           --health-cmd pg_isready

.github/workflows/lint-php.yaml

@@ -5,18 +5,6 @@ on:
   - pull_request
 
 jobs:
-  xml-linters:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@master
-      - name: Download schema
-        run: wget https://apps.nextcloud.com/schema/apps/info.xsd
-      - name: Lint info.xml
-        uses: ChristophWurst/xmllint-action@v1
-        with:
-          xml-file: ./appinfo/info.xml
-          xml-schema-file: ./info.xsd
   php-cs-fixer:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 This file is manually updated. Please file an issue if something is missing.
 
+## v4.8.0, v3.8.0
+
+- **Feature**: Timeline path now scans recursively for mounted volumes / shares inside it.
+- **Feature**: Multiple timeline paths can be specified.
+
+## v4.7.0, v3.7.0 (2022-11-14)
+
+- **Note**: you must run `occ memories:index -f` to take advantage of new features.
+- **Massively improved video performance**
+  - Memories now comes with a dedicated transcoding server with HLS support.
+  - Read the documentation [here](https://github.com/pulsejet/memories/wiki/Configuration#video-transcoding) carefully for more details.
+- **Feature**: Show EXIF metadata in sidebar ([#68](https://github.com/pulsejet/memories/issues/68))
+- **Feature**: Multi-selection with drag (mobile) and shift+click ([#28](https://github.com/pulsejet/memories/issues/28))
+- **Feature**: Show duration on video tiles
+- **Feature**: Allow editing all image formats (HEIC etc.)
+- Fix stretched images in viewer ([#176](https://github.com/pulsejet/memories/issues/176))
+- Restore metadata after image edit ([#174](https://github.com/pulsejet/memories/issues/174))
+- Fix loss of resolution after image edit
+
 ## v4.6.1, v3.6.1 (2022-11-07)
 
 - **Feature**: Native sharing from the viewer (images only)

Makefile

@@ -27,7 +27,8 @@ build-js-production:
 	rm -f js/* && npm run build
 
 patch-external:
-	patch -p1 < patches/scroller.patch
+	patch -p1 < patches/scroller-perf.patch
+	patch -p1 < patches/scroller-sticky.patch
 
 watch-js:
 	npm run watch

README.md

@@ -7,8 +7,9 @@
 [![Demo](https://img.shields.io/badge/demo-online-blue)](https://memories-demo.radialapps.com/apps/memories/)
 [![Gitter](https://img.shields.io/gitter/room/pulsejet/memories)](https://gitter.im/pulsejet/memories)
 [![GitHub issues](https://img.shields.io/github/issues/pulsejet/memories)](https://github.com/pulsejet/memories/issues)
+[![GitHub Sponsor](https://img.shields.io/github/sponsors/pulsejet?logo=GitHub)](https://github.com/sponsors/pulsejet)
 
-Memories is a photo management app for Nextcloud with advanced features including:
+Memories is a _batteries-included_ photo management solution for Nextcloud with advanced features including:
 
 - **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.
 - **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.
@@ -18,7 +19,8 @@ Memories is a photo management app for Nextcloud with advanced features includin
 - **📱 Mobile Support**: Works on devices of any shape and size through the web app.
 - **✏️ Edit Metadata**: Edit dates on photos quickly and easily.
 - **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.
-- **⚡️ Performance**: Memories is extremely fast.
+- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.
+- **⚡️ Performance**: In general, Memories is extremely fast.
 
 ## 🌐 Online Demo
 
@@ -41,11 +43,20 @@ Memories is a photo management app for Nextcloud with advanced features includin
 1. ✅ Enable the app through the app management of your Nextcloud.
 1. ⚒️ (Strongly recommended) use VS Code and install Vetur and Prettier.
 
-## How to support development
+## Support the project
 
-1. **🌟 Star this repository**: This is the easiest way to support the project and costs nothing.
-1. **🪲 Report bugs**: If you find a bug, please report it on the issue tracker.
-1. **📝 Contribute**: If you want to contribute, please read file / comment on an issue and ask for guidance.
+1. **🌟 Star this repository**: This is the easiest way to support Memories and costs nothing.
+1. **🪲 Report bugs**: Report any bugs you find on the issue tracker.
+1. **📝 Contribute**: Read and file or comment on an issue and ask for guidance.
+1. **🪙 Sponsorship**: You can support the project financially at [GitHub Sponsors](https://github.com/sponsors/pulsejet).
+
+A shout out to the current and past financial backers of Memories! See the sponsors page for a full list.
+
+[<img src="https://github.com/mpodshivalin.png" width="42" />](https://github.com/mpodshivalin)
+
+## Changelog
+
+For the full changelog, see [CHANGELOG.md](CHANGELOG.md).
 
 ## Special Thanks
 

appinfo/info.xml

@@ -7,7 +7,7 @@
 <description><![CDATA[
 # Memories
 
-Memories is a photo management app for Nextcloud with advanced features including:
+Memories is a *batteries-included* photo management solution for Nextcloud with advanced features including:
 
 - **📸 Timeline**: Sort photos and videos by date taken, parsed from Exif data.
 - **⏪ Rewind**: Jump to any time in the past instantly and relive your memories.
@@ -17,7 +17,8 @@ Memories is a photo management app for Nextcloud with advanced features includin
 - **📱 Mobile Support**: Works on devices of any shape and size through the web app.
 - **✏️ Edit Metadata**: Edit dates on photos quickly and easily.
 - **📦 Archive**: Store photos you don't want to see in your timeline in a separate folder.
-- **⚡️ Performance**: Memories is extremely fast.
+- **📹 Video Transcoding**: Memories transcodes videos and uses HLS for maximal performance.
+- **⚡️ Performance**: In general, Memories is extremely fast.
 
 ## 🌐 Online Demo
 
@@ -32,7 +33,7 @@ Memories is a photo management app for Nextcloud with advanced features includin
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.6.2</version>
+    <version>4.7.2</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>
@@ -46,11 +47,20 @@ Memories is a photo management app for Nextcloud with advanced features includin
     </dependencies>
     <commands>
         <command>OCA\Memories\Command\Index</command>
+        <command>OCA\Memories\Command\VideoSetup</command>
     </commands>
     <navigations>
         <navigation>
             <name>Memories</name>
             <route>memories.Page.main</route>
         </navigation>
     </navigations>
+	<repair-steps>
+		<post-migration>
+			<step>OCA\Memories\Migration\Repair</step>
+		</post-migration>
+		<install>
+			<step>OCA\Memories\Migration\Repair</step>
+		</install>
+	</repair-steps>
 </info>

appinfo/routes.php

@@ -52,11 +52,14 @@ function w($base, $param) {
         ['name' => 'Faces#faces', 'url' => '/api/faces', 'verb' => 'GET'],
         ['name' => 'Faces#preview', 'url' => '/api/faces/preview/{id}', 'verb' => 'GET'],
 
-        ['name' => 'Image#info', 'url' => '/api/info/{id}', 'verb' => 'GET'],
-        ['name' => 'Image#edit', 'url' => '/api/edit/{id}', 'verb' => 'PATCH'],
+        ['name' => 'Image#info', 'url' => '/api/image/info/{id}', 'verb' => 'GET'],
+        ['name' => 'Image#setExif', 'url' => '/api/image/set-exif/{id}', 'verb' => 'PATCH'],
+        ['name' => 'Image#jpeg', 'url' => '/api/image/jpeg/{id}', 'verb' => 'GET'],
 
         ['name' => 'Archive#archive', 'url' => '/api/archive/{id}', 'verb' => 'PATCH'],
 
+        ['name' => 'Video#transcode', 'url' => '/api/video/transcode/{client}/{fileid}/{profile}', 'verb' => 'GET'],
+
         // Config API
         ['name' => 'Other#setUserConfig', 'url' => '/api/config/{key}', 'verb' => 'PUT'],
 

l10n/af.js

@@ -1,18 +1,22 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Instellings",
     "Folders" : "Vouers",
     "Favorites" : "Gunstelinge",
     "Videos" : "Video's ",
     "Archive" : "Argief",
     "Tags" : "Etikette",
     "Maps" : "Kaarte",
-    "Settings" : "Instellings",
+    "Unsaved changes" : "Onbewaarde veranderinge",
+    "Edit" : "Wysig",
+    "Loading …" : "Laai …",
     "Cancel" : "Kanselleer",
     "Delete" : "Skrap",
     "Download" : "Laai af",
     "Favorite" : "Gunsteling",
     "View in folder" : "Vertoon in gids",
+    "Share" : "Deel",
     "Public link" : "Openbare skakel",
     "Back" : "Terug",
     "Save" : "Bewaar",
@@ -22,7 +26,16 @@ OC.L10N.register(
     "Hour" : "Uur",
     "Name" : "Naam",
     "Update" : "Werk by",
-    "Loading …" : "Laai …",
-    "Refresh" : "Verfris"
+    "Refresh" : "Verfris",
+    "Remove" : "Verwyder",
+    "Reset" : "Herstel",
+    "Continue" : "Gaan voort",
+    "Original" : "Oorspronklik",
+    "Custom" : "Eie",
+    "Value" : "Waarde",
+    "Text" : "Teks",
+    "Size" : "Grootte",
+    "Position" : "Posisie",
+    "Quality" : "Kwaliteit"
 },
 "nplurals=2; plural=(n != 1);");

l10n/af.json

@@ -1,16 +1,20 @@
 { "translations": {
+    "Settings" : "Instellings",
     "Folders" : "Vouers",
     "Favorites" : "Gunstelinge",
     "Videos" : "Video's ",
     "Archive" : "Argief",
     "Tags" : "Etikette",
     "Maps" : "Kaarte",
-    "Settings" : "Instellings",
+    "Unsaved changes" : "Onbewaarde veranderinge",
+    "Edit" : "Wysig",
+    "Loading …" : "Laai …",
     "Cancel" : "Kanselleer",
     "Delete" : "Skrap",
     "Download" : "Laai af",
     "Favorite" : "Gunsteling",
     "View in folder" : "Vertoon in gids",
+    "Share" : "Deel",
     "Public link" : "Openbare skakel",
     "Back" : "Terug",
     "Save" : "Bewaar",
@@ -20,7 +24,16 @@
     "Hour" : "Uur",
     "Name" : "Naam",
     "Update" : "Werk by",
-    "Loading …" : "Laai …",
-    "Refresh" : "Verfris"
+    "Refresh" : "Verfris",
+    "Remove" : "Verwyder",
+    "Reset" : "Herstel",
+    "Continue" : "Gaan voort",
+    "Original" : "Oorspronklik",
+    "Custom" : "Eie",
+    "Value" : "Waarde",
+    "Text" : "Teks",
+    "Size" : "Grootte",
+    "Position" : "Posisie",
+    "Quality" : "Kwaliteit"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/an.js

@@ -1,14 +1,17 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "Configurazión",
     "Favorites" : "Favoritos",
     "Tags" : "Etiquetas",
-    "Settings" : "Configurazión",
     "Cancel" : "Canzelar",
     "Delete" : "Borrar",
     "Download" : "Escargar",
     "Favorite" : "Favorito",
+    "Share" : "Compartir",
     "Back" : "Ta zaga",
-    "Name" : "Nombre"
+    "Name" : "Nombre",
+    "Continue" : "Continar",
+    "Size" : "Grandaria"
 },
 "nplurals=2; plural=(n != 1);");

l10n/an.json

@@ -1,12 +1,15 @@
 { "translations": {
+    "Settings" : "Configurazión",
     "Favorites" : "Favoritos",
     "Tags" : "Etiquetas",
-    "Settings" : "Configurazión",
     "Cancel" : "Canzelar",
     "Delete" : "Borrar",
     "Download" : "Escargar",
     "Favorite" : "Favorito",
+    "Share" : "Compartir",
     "Back" : "Ta zaga",
-    "Name" : "Nombre"
+    "Name" : "Nombre",
+    "Continue" : "Continar",
+    "Size" : "Grandaria"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/ar.js

@@ -1,19 +1,22 @@
 OC.L10N.register(
     "memories",
     {
+    "Settings" : "الإعدادات",
     "Timeline" : "الجدول الزمني",
     "Folders" : "المجلدات",
     "Favorites" : "المفضلات",
     "Videos" : "فيديوهات",
     "Archive" : "الأرشيف",
     "Tags" : "الوسوم",
     "Maps" : "الخرائط",
-    "Settings" : "الإعدادات",
+    "Edit" : "تعديل",
+    "Loading …" : "جاري التحميل …",
     "Cancel" : "إلغاء",
     "Delete" : "إزالة",
     "Download" : "تنزيل",
     "Favorite" : "المفضلة",
     "View in folder" : "اعرض في المجلد",
+    "Share" : "مشاركة",
     "Copy public link" : "نسخ الرابط العام",
     "Back" : "العودة",
     "Save" : "Save",
@@ -23,7 +26,21 @@ OC.L10N.register(
     "Hour" : "الساعة",
     "Name" : "الاسم",
     "Update" : "تحديث",
-    "Loading …" : "جاري التحميل …",
-    "Refresh" : "إنعاش"
+    "Refresh" : "إنعاش",
+    "Remove" : "حذف",
+    "Reset" : "إعادة الضبط",
+    "Continue" : "متابعة",
+    "Undo" : "تراجع",
+    "Redo" : "إعادة",
+    "Original" : "أصلي",
+    "Custom" : "مخصّص",
+    "Value" : "القيمة",
+    "Line" : "خط",
+    "Text" : "نص",
+    "Size" : "الحجم",
+    "Position" : "الموقع",
+    "Name is required." : "حقل الاسم مطلوب",
+    "Quality" : "الجودة",
+    "Auto" : "تلقائي"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");

l10n/ar.json

@@ -1,17 +1,20 @@
 { "translations": {
+    "Settings" : "الإعدادات",
     "Timeline" : "الجدول الزمني",
     "Folders" : "المجلدات",
     "Favorites" : "المفضلات",
     "Videos" : "فيديوهات",
     "Archive" : "الأرشيف",
     "Tags" : "الوسوم",
     "Maps" : "الخرائط",
-    "Settings" : "الإعدادات",
+    "Edit" : "تعديل",
+    "Loading …" : "جاري التحميل …",
     "Cancel" : "إلغاء",
     "Delete" : "إزالة",
     "Download" : "تنزيل",
     "Favorite" : "المفضلة",
     "View in folder" : "اعرض في المجلد",
+    "Share" : "مشاركة",
     "Copy public link" : "نسخ الرابط العام",
     "Back" : "العودة",
     "Save" : "Save",
@@ -21,7 +24,21 @@
     "Hour" : "الساعة",
     "Name" : "الاسم",
     "Update" : "تحديث",
-    "Loading …" : "جاري التحميل …",
-    "Refresh" : "إنعاش"
+    "Refresh" : "إنعاش",
+    "Remove" : "حذف",
+    "Reset" : "إعادة الضبط",
+    "Continue" : "متابعة",
+    "Undo" : "تراجع",
+    "Redo" : "إعادة",
+    "Original" : "أصلي",
+    "Custom" : "مخصّص",
+    "Value" : "القيمة",
+    "Line" : "خط",
+    "Text" : "نص",
+    "Size" : "الحجم",
+    "Position" : "الموقع",
+    "Name is required." : "حقل الاسم مطلوب",
+    "Quality" : "الجودة",
+    "Auto" : "تلقائي"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }