From 403b52243aae3dbbcbc8d668633d2682518c4f35 Mon Sep 17 00:00:00 2001 From: eason Date: Sun, 19 Nov 2023 12:58:24 +0800 Subject: [PATCH 1/3] - fix, video external playermissing domain. --- src/component/Viewer/Video.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/component/Viewer/Video.js b/src/component/Viewer/Video.js index 98e83910..42c995b6 100644 --- a/src/component/Viewer/Video.js +++ b/src/component/Viewer/Video.js @@ -17,7 +17,7 @@ import { Launch, PlaylistPlay, Subtitles } from "@material-ui/icons"; import TextLoading from "../Placeholder/TextLoading"; import SelectMenu from "./SelectMenu"; import { getDownloadURL } from "../../services/file"; -import { sortMethodFuncs } from "../FileManager/Sort"; +import { sortMethodFuncs } from "../../redux/explorer/action"; import { useTranslation } from "react-i18next"; const Artplayer = React.lazy(() => @@ -26,32 +26,34 @@ const Artplayer = React.lazy(() => ) ); +const domain = document.location.protocol + "//" + window.location.host; + const externalPlayers = [ { name: "PotPlayer", - url: (source, title) => `potplayer://${source}`, + url: (source, title) => `potplayer://${domain}${source}`, }, { name: "VLC", - url: (source, title) => `vlc://${source}`, + url: (source, title) => `vlc://${domain}${source}`, }, { name: "IINA", - url: (source, title) => `iina://weblink?url=${source}`, + url: (source, title) => `iina://weblink?url=${domain}${source}`, }, { name: "nPlayer", - url: (source, title) => `nplayer-${source}`, + url: (source, title) => `nplayer-${domain}${source}`, }, { name: "MXPlayer (Free)", url: (source, title) => - `intent:${source}#Intent;package=com.mxtech.videoplayer.ad;S.title=${title};end`, + `intent:${domain}${source}#Intent;package=com.mxtech.videoplayer.ad;S.title=${title};end`, }, { name: "MXPlayer (Pro)", url: (source, title) => - `intent:${source}#Intent;package=com.mxtech.videoplayer.pro;S.title=${title};end`, + `intent:${domain}${source}#Intent;package=com.mxtech.videoplayer.pro;S.title=${title};end`, }, ]; @@ -80,7 +82,7 @@ const useStyles = makeStyles((theme) => ({ marginTop: theme.spacing(1), }, "@global": { - "video,.art-video-player,.art-bottom":{ + "video,.art-video-player,.art-bottom": { borderRadius: theme.shape.borderRadius, } } From 54d08a5b0d02d6c5cae98bef12486be7d799641a Mon Sep 17 00:00:00 2001 From: eason Date: Thu, 7 Nov 2024 21:02:09 +0800 Subject: [PATCH 2/3] - fix external media player url mission protocal://domain --- src/component/Viewer/Video.js | 51 +++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 8 deletions(-) diff --git a/src/component/Viewer/Video.js b/src/component/Viewer/Video.js index 42c995b6..56f70f9d 100644 --- a/src/component/Viewer/Video.js +++ b/src/component/Viewer/Video.js @@ -31,29 +31,64 @@ const domain = document.location.protocol + "//" + window.location.host; const externalPlayers = [ { name: "PotPlayer", - url: (source, title) => `potplayer://${domain}${source}`, + url: (source, title) => { + if (source.startsWith('/')) { + return `potplayer://${domain}${source}` + } else { + return `potplayer://${source}` + } + }, }, { name: "VLC", - url: (source, title) => `vlc://${domain}${source}`, + url: (source, title) => { + if (source.startsWith('/')) { + return `vlc://${domain}${source}` + } else { + return `vlc://${source}` + } + }, }, { name: "IINA", - url: (source, title) => `iina://weblink?url=${domain}${source}`, + url: (source, title) => { + if (source.startsWith('/')) { + return `iina://weblink?url=${domain}${source}` + } else { + return `iina://weblink?url=${source}` + } + }, }, { name: "nPlayer", - url: (source, title) => `nplayer-${domain}${source}`, + url: (source, title) => { + if (source.startsWith('/')) { + return `nplayer-${domain}${source}` + } else { + return `nplayer-${source}` + } + }, }, { name: "MXPlayer (Free)", - url: (source, title) => - `intent:${domain}${source}#Intent;package=com.mxtech.videoplayer.ad;S.title=${title};end`, + url: (source, title) => { + if (source.startsWith('/')) { + return `intent:${domain}${source}#Intent;package=com.mxtech.videoplayer.ad;S.title=${title};end` + } else { + return `intent:${source}#Intent;package=com.mxtech.videoplayer.ad;S.title=${title};end` + } + }, }, { name: "MXPlayer (Pro)", - url: (source, title) => - `intent:${domain}${source}#Intent;package=com.mxtech.videoplayer.pro;S.title=${title};end`, + url: (source, title) => { + if (source.startsWith('/')) { + return `intent:${domain}${source}#Intent;package=com.mxtech.videoplayer.pro;S.title=${title};end` + } else { + return `intent:${source}#Intent;package=com.mxtech.videoplayer.pro;S.title=${title};end` + } + }, + }, ]; From fff8cf515c47a17551ab8dde5bf5da90cc92a700 Mon Sep 17 00:00:00 2001 From: eason Date: Thu, 7 Nov 2024 21:09:20 +0800 Subject: [PATCH 3/3] - fix import --- src/component/Viewer/Video.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/Viewer/Video.js b/src/component/Viewer/Video.js index 56f70f9d..51e019ae 100644 --- a/src/component/Viewer/Video.js +++ b/src/component/Viewer/Video.js @@ -17,7 +17,7 @@ import { Launch, PlaylistPlay, Subtitles } from "@material-ui/icons"; import TextLoading from "../Placeholder/TextLoading"; import SelectMenu from "./SelectMenu"; import { getDownloadURL } from "../../services/file"; -import { sortMethodFuncs } from "../../redux/explorer/action"; +import { sortMethodFuncs } from "../FileManager/Sort"; import { useTranslation } from "react-i18next"; const Artplayer = React.lazy(() =>