RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

download: always generate url

cap
Varun Patil 2022-12-02 23:30:18 -08:00
parent 274951b9f9
commit 3cb0abaea7
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/Viewer.vue
View File

@ -136,7 +136,6 @@ import { IDay, IPhoto, IRow, IRowType } from "../types";
import NcActions from "@nextcloud/vue/dist/Components/NcActions"; import NcActions from "@nextcloud/vue/dist/Components/NcActions";
import NcActionButton from "@nextcloud/vue/dist/Components/NcActionButton"; import NcActionButton from "@nextcloud/vue/dist/Components/NcActionButton";
import { subscribe, unsubscribe } from "@nextcloud/event-bus"; import { subscribe, unsubscribe } from "@nextcloud/event-bus";
import { generateUrl } from "@nextcloud/router";
import { showError } from "@nextcloud/dialogs"; import { showError } from "@nextcloud/dialogs";
import * as dav from "../services/DavRequests"; import * as dav from "../services/DavRequests";
@ -658,10 +657,8 @@ export default class Viewer extends Mixins(GlobalMixin) {
const isvideo = photo.flag & this.c.FLAG_IS_VIDEO; const isvideo = photo.flag & this.c.FLAG_IS_VIDEO;
// Preview aren't animated // Preview aren't animated
if (photo.mimetype === "image/gif") { if (isvideo || photo.mimetype === "image/gif") {
previewUrl = getDownloadLink(photo); previewUrl = getDownloadLink(photo);
} else if (isvideo) {
previewUrl = generateUrl(getDownloadLink(photo));
} }
// Get height and width // Get height and width

4
src/services/dav/download.ts
View File

@ -98,9 +98,9 @@ export function getDownloadLink(photo: IPhoto) {
route.params.name route.params.name
); );
if (fInfos.length) { if (fInfos.length) {
return `/remote.php/dav${fInfos[0].originalFilename}`; return generateUrl(`/remote.php/dav${fInfos[0].originalFilename}`);
} }
} }
return `/remote.php/dav${photo.filename}`; return generateUrl(`/remote.php/dav${photo.filename}`);
} }