Merge branch 'master' into stable24
commit
d13bb3379a
|
@ -17,7 +17,7 @@ mv "exiftool-$exifver" exiftool
|
|||
rm -rf *.zip exiftool/t exiftool/html
|
||||
chmod 755 exiftool/exiftool
|
||||
|
||||
govod="0.0.6"
|
||||
govod="0.0.7"
|
||||
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-*
|
||||
|
|
|
@ -191,6 +191,7 @@ class VideoContentSetup {
|
|||
|
||||
content.videojs.src({
|
||||
src: content.data.src,
|
||||
type: "video/mp4",
|
||||
});
|
||||
this.updateRotation(content, 0);
|
||||
}
|
||||
|
|
|
@ -102,5 +102,10 @@ export function getDownloadLink(photo: IPhoto) {
|
|||
}
|
||||
}
|
||||
|
||||
return `/remote.php/dav${photo.filename}`; // normal route
|
||||
try {
|
||||
const file = "/" + photo.filename.split("/").slice(3).join("/");
|
||||
return `/apps/files/ajax/download.php?files=${file}`; // normal route
|
||||
} catch {
|
||||
return `/remote.php/dav${photo.filename}`; // fallback
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue