From eb9aed441b0e32ada256baabea906f8bd18a7c4f Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Sun, 13 Nov 2022 23:35:01 -0800 Subject: [PATCH 1/9] Make video fill up space --- src/components/Viewer.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue index 3b268ddb..df06ffd4 100644 --- a/src/components/Viewer.vue +++ b/src/components/Viewer.vue @@ -534,10 +534,21 @@ export default class Viewer extends Mixins(GlobalMixin) { previewUrl = generateUrl(getDownloadLink(photo)); } + // Get height and width + let w = photo.w; + let h = photo.h; + + if (isvideo && w && h) { + // For videos, make sure the screen is filled up, + // by scaling up the video by a maximum of 4x + w *= 4; + h *= 4; + } + return { src: previewUrl, - width: photo.w || undefined, - height: photo.h || undefined, + width: w || undefined, + height: h || undefined, thumbCropped: true, photo: photo, type: isvideo ? "video" : "image", From ed898cdd8d84e2b42353b35eedb669650a8033a5 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Sun, 13 Nov 2022 23:48:44 -0800 Subject: [PATCH 2/9] Update sponsorship in readme --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c17e36fc..0ee99595 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ [![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) Memories is a _batteries-included_ photo management solution for Nextcloud with advanced features including: @@ -42,12 +43,12 @@ Memories is a _batteries-included_ photo management solution for Nextcloud with 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. **🪙 Sponsorship**: If you want to support the project financially, you can donate to the project on [GitHub](https://github.com/sponsors/pulsejet). +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). ## Special Thanks From bd8a8c15797f24ed868afd0afa2d69c44b435a7b Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Mon, 14 Nov 2022 00:03:46 -0800 Subject: [PATCH 3/9] readme: thank you @mpodshivalin! --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 0ee99595..c7febf29 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,10 @@ Memories is a _batteries-included_ photo management solution for Nextcloud with 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. + +[](https://github.com/mpodshivalin) + ## Special Thanks Nextcloud team. A lot of this work is based on [Photos](https://github.com/nextcloud/photos). From 649c0659c73cdf709bce36f2a30ec72ace970225 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Mon, 14 Nov 2022 00:05:29 -0800 Subject: [PATCH 4/9] readme: make sponsors badge a link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7febf29..0cc2aa36 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![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) +[![GitHub Sponsor](https://img.shields.io/github/sponsors/pulsejet?logo=GitHub)](https://github.com/sponsors/pulsejet) Memories is a _batteries-included_ photo management solution for Nextcloud with advanced features including: From 39daae1cb765dc9ed26bdace3aa22351d168121a Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Mon, 14 Nov 2022 00:24:23 -0800 Subject: [PATCH 5/9] Make sure transcoder is executable (fix #193) --- lib/Controller/VideoController.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php index 66f14345..bf8d531f 100644 --- a/lib/Controller/VideoController.php +++ b/lib/Controller/VideoController.php @@ -90,6 +90,11 @@ class VideoController extends ApiBase return new JSONResponse(['message' => 'Transcoder not configured'], Http::STATUS_INTERNAL_SERVER_ERROR); } + // Make transcoder executable + if (!is_executable($transcoder)) { + chmod($transcoder, 0755); + } + // Check for environment variables $vaapi = $this->config->getSystemValue('memories.qsv', false); $env = ''; From d9e3d3e0c1c117daf1dea66a285642f404b521c4 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Mon, 14 Nov 2022 01:02:14 -0800 Subject: [PATCH 6/9] Update go-vod --- scripts/get-exiftool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh index af50615c..980f0095 100755 --- a/scripts/get-exiftool.sh +++ b/scripts/get-exiftool.sh @@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool rm -rf *.zip exiftool/t exiftool/html chmod 755 exiftool/exiftool -govod="0.0.9" +govod="0.0.10" wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64" wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64" chmod 755 go-vod-* From 103cce1a353b3569a1b956ba77da8a11ef29c51a Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Mon, 14 Nov 2022 01:10:43 -0800 Subject: [PATCH 7/9] video: fix initial quality switch --- src/components/PsVideo.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/components/PsVideo.ts b/src/components/PsVideo.ts index 6cbddbb5..1d35a678 100644 --- a/src/components/PsVideo.ts +++ b/src/components/PsVideo.ts @@ -215,6 +215,12 @@ class VideoContentSetup { this.initPlyr(content); }); + content.videojs.qualityLevels()?.on("addqualitylevel", (e) => { + window.setTimeout(() => { + this.initPlyr(content); + }, 0); + }); + // Get correct orientation axios .get( @@ -251,6 +257,9 @@ class VideoContentSetup { initPlyr(content: any) { if (content.plyr) return; + content.videoElement = content.videojs?.el()?.querySelector("video"); + if (!content.videoElement) return; + // Retain original parent for video element const origParent = content.videoElement.parentElement; From c237d27e8226248ea44ae5b5f7541a8471e1cfab Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Mon, 14 Nov 2022 01:26:21 -0800 Subject: [PATCH 8/9] Bump go-vod --- scripts/get-exiftool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/get-exiftool.sh b/scripts/get-exiftool.sh index 980f0095..6f78f136 100755 --- a/scripts/get-exiftool.sh +++ b/scripts/get-exiftool.sh @@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool rm -rf *.zip exiftool/t exiftool/html chmod 755 exiftool/exiftool -govod="0.0.10" +govod="0.0.11" wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-amd64" wget -q "https://github.com/pulsejet/go-vod/releases/download/$govod/go-vod-aarch64" chmod 755 go-vod-* From 36a809149b696e4362902815a1853fbb7cad82d7 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Mon, 14 Nov 2022 01:27:04 -0800 Subject: [PATCH 9/9] release: v4.7.1 --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index e875b863..e5282414 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with 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. ]]> - 4.7.0 + 4.7.1 agpl Varun Patil Memories