From 3777382ebb5cdffb091b3b53634524a5aa53fe3f Mon Sep 17 00:00:00 2001 From: the1812 Date: Sat, 3 Oct 2020 13:37:31 +0800 Subject: [PATCH] Stop convert when video has series --- bilibili-evolved.offline.user.js | 2 +- bilibili-evolved.preview-offline.user.js | 2 +- bilibili-evolved.preview.user.js | 2 +- bilibili-evolved.user.js | 2 +- min/bundle.json | 2 +- min/bundle.zip | Bin 2369425 -> 2369478 bytes min/bvid-convert.min.js | 2 +- src/video/bvid-convert/bvid-convert.ts | 4 ++++ 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bilibili-evolved.offline.user.js b/bilibili-evolved.offline.user.js index 33131cd7d..2e1f6bcaf 100644 --- a/bilibili-evolved.offline.user.js +++ b/bilibili-evolved.offline.user.js @@ -1291,7 +1291,7 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/blur-video-control.min.css"] = `.video-control-blur-layer{width:100%;height:100%;position:absolute;-webkit-backdrop-filter:blur(48px);backdrop-filter:blur(48px);z-index:-1;top:0}.bilibili-player-video-control-mask{background:0 0!important}.bilibili-player-video-control-bottom,.bui-slider .bui-track.bui-track-video-progress .bui-bar-wrap{background-color:transparent!important}.bilibili-player-video-control-bottom{position:relative}.bilibili-player-area .bilibili-player-video-control-bottom,.bilibili-player-area .bilibili-player-video-control-wrap{transition:none!important}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/blur-video-control.min.js"] = (()=>{return(o,e)=>{const l=async()=>{const o=await SpinQuery.count(".bui-slider .bui-track.bui-track-video-progress,.bilibili-player-video-control-bottom",2);o.forEach(o=>{if(!o.classList.contains("video-control-blur-container")){o.classList.add("video-control-blur-container");o.insertAdjacentHTML("afterbegin",`
`)}})};e.applyStyle("blurVideoControlStyle");Observer.videoChange(l);return{reload:()=>{document.querySelectorAll(".video-control-blur-layer").forEach(o=>o.style.display="block");e.applyStyle("blurVideoControlStyle")},unload:()=>{document.querySelectorAll(".video-control-blur-layer").forEach(o=>o.style.display="none");e.removeStyle("blurVideoControlStyle")}}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/bvid-convert.min.css"] = `.bvid-convert{border:2px solid #8882;border-radius:8px;padding:6px 8px;margin:4px 0;order:-1;width:100%;box-sizing:border-box;user-select:text}.bvid-convert-item{font-size:14px}`; -offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/bvid-convert.min.js"] = (()=>{return(i,e)=>{const n=["https://www.bilibili.com/video/","https://www.bilibili.com/bangumi/"].some(i=>document.URL.startsWith(i));if(i.preferAvUrl&&document.URL.startsWith("https://www.bilibili.com/video/")){SpinQuery.select(()=>unsafeWindow.aid).then(i=>{if(!i){return}const e=document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i,(e,n)=>{return`/${n}/av${i}`});if(document.URL!==e){history.replaceState({},document.title,e)}})}return{widget:{content:`
`,condition:async()=>{if(n){return Boolean(await SpinQuery.select(()=>unsafeWindow.aid||unsafeWindow.bvid))}else{return false}},success:()=>{e.applyStyle("bvidConvertStyle");const i=async()=>{const i=dq(".bvid-convert");i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${unsafeWindow.bvid}
\n`;const e=await SpinQuery.select(".av-link,.bv-link,.bvid-link");if(e){i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${e.innerHTML}
\n`}};Observer.videoChange(i)}}}}})(); +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/bvid-convert.min.js"] = (()=>{return(i,e)=>{const n=["https://www.bilibili.com/video/","https://www.bilibili.com/bangumi/"].some(i=>document.URL.startsWith(i));if(i.preferAvUrl&&document.URL.startsWith("https://www.bilibili.com/video/")){SpinQuery.select(()=>unsafeWindow.aid).then(i=>{if(!i){return}if(document.URL.includes("videocard_series")){return}const e=document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i,(e,n)=>{return`/${n}/av${i}`});if(document.URL!==e){history.replaceState({},document.title,e)}})}return{widget:{content:`
`,condition:async()=>{if(n){return Boolean(await SpinQuery.select(()=>unsafeWindow.aid||unsafeWindow.bvid))}else{return false}},success:()=>{e.applyStyle("bvidConvertStyle");const i=async()=>{const i=dq(".bvid-convert");i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${unsafeWindow.bvid}
\n`;const e=await SpinQuery.select(".av-link,.bv-link,.bvid-link");if(e){i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${e.innerHTML}
\n`}};Observer.videoChange(i)}}}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/category-regions.min.js"] = (()=>{return(i,n)=>{const e={anime:1,bangumi:13,china:167,manga:-1,music:3,dance:129,game:4,tech:36,digital:188,life:160,food:211,kichiku:119,fashion:155,information:202,entertainment:5,column:-1,movie:181,tv:11,film:23,documentary:177};const a={anime:"v/douga",bangumi:"anime",china:"guochuang",manga:"",music:"v/music",dance:"v/dance",game:"v/game",tech:"v/technology",digital:"v/digital",life:"v/life",food:"v/food",kichiku:"v/kichiku",fashion:"v/fashion",information:"v/information/",entertainment:"v/ent",column:"",movie:"v/cinephile",tv:"tv",film:"cinema",documentary:"documentary"};return{export:{RegionCodes:e,RegionLinks:a}}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/clear-cache.min.js"] = (()=>{return(n,c)=>{return{widget:{content:`\n\n\n清除缓存\n`,condition:()=>typeof offlineData==="undefined",success:()=>{$("#clear-cache").on("click",()=>{n.cache={};Toast.success("已删除全部缓存.","清除缓存",5e3)})}}}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/collapse-live-side-bar.min.css"] = `.side-bar-cntr{transition:.24s ease-out!important;overflow:visible!important;transform:translateZ(0) translateX(100%)!important}.side-bar-cntr:hover{transform:translateZ(0)!important}.side-bar-cntr::after{right:calc(100% + 4px);transform:translateY(-50%) rotate(45deg);width:8px;height:8px;border-radius:2px;box-sizing:border-box;border:4px solid #aaa;border-top-color:transparent;border-right-color:transparent}body.dark .side-bar-cntr::after{border:4px solid #eee;border-top-color:transparent;border-right-color:transparent}.side-bar-cntr::before{right:calc(100% - 8px);transform:translateY(-50%);width:32px;height:48px;border-radius:8px 0 0 8px;background-color:#fff;border:1px solid #e9eaec}body.dark .side-bar-cntr::before{background-color:#222;border-color:transparent}.side-bar-cntr::after,.side-bar-cntr::before{content:"";transition:.24s ease-out;cursor:pointer;position:fixed;top:50%}.side-bar-cntr:hover::after,.side-bar-cntr:hover::before{opacity:0}`; diff --git a/bilibili-evolved.preview-offline.user.js b/bilibili-evolved.preview-offline.user.js index aad421ba4..b07bf64e6 100644 --- a/bilibili-evolved.preview-offline.user.js +++ b/bilibili-evolved.preview-offline.user.js @@ -1291,7 +1291,7 @@ offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/m offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/blur-video-control.min.css"] = `.video-control-blur-layer{width:100%;height:100%;position:absolute;-webkit-backdrop-filter:blur(48px);backdrop-filter:blur(48px);z-index:-1;top:0}.bilibili-player-video-control-mask{background:0 0!important}.bilibili-player-video-control-bottom,.bui-slider .bui-track.bui-track-video-progress .bui-bar-wrap{background-color:transparent!important}.bilibili-player-video-control-bottom{position:relative}.bilibili-player-area .bilibili-player-video-control-bottom,.bilibili-player-area .bilibili-player-video-control-wrap{transition:none!important}`; offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/blur-video-control.min.js"] = (()=>{return(o,e)=>{const l=async()=>{const o=await SpinQuery.count(".bui-slider .bui-track.bui-track-video-progress,.bilibili-player-video-control-bottom",2);o.forEach(o=>{if(!o.classList.contains("video-control-blur-container")){o.classList.add("video-control-blur-container");o.insertAdjacentHTML("afterbegin",`
`)}})};e.applyStyle("blurVideoControlStyle");Observer.videoChange(l);return{reload:()=>{document.querySelectorAll(".video-control-blur-layer").forEach(o=>o.style.display="block");e.applyStyle("blurVideoControlStyle")},unload:()=>{document.querySelectorAll(".video-control-blur-layer").forEach(o=>o.style.display="none");e.removeStyle("blurVideoControlStyle")}}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/bvid-convert.min.css"] = `.bvid-convert{border:2px solid #8882;border-radius:8px;padding:6px 8px;margin:4px 0;order:-1;width:100%;box-sizing:border-box;user-select:text}.bvid-convert-item{font-size:14px}`; -offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/bvid-convert.min.js"] = (()=>{return(i,e)=>{const n=["https://www.bilibili.com/video/","https://www.bilibili.com/bangumi/"].some(i=>document.URL.startsWith(i));if(i.preferAvUrl&&document.URL.startsWith("https://www.bilibili.com/video/")){SpinQuery.select(()=>unsafeWindow.aid).then(i=>{if(!i){return}const e=document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i,(e,n)=>{return`/${n}/av${i}`});if(document.URL!==e){history.replaceState({},document.title,e)}})}return{widget:{content:`
`,condition:async()=>{if(n){return Boolean(await SpinQuery.select(()=>unsafeWindow.aid||unsafeWindow.bvid))}else{return false}},success:()=>{e.applyStyle("bvidConvertStyle");const i=async()=>{const i=dq(".bvid-convert");i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${unsafeWindow.bvid}
\n`;const e=await SpinQuery.select(".av-link,.bv-link,.bvid-link");if(e){i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${e.innerHTML}
\n`}};Observer.videoChange(i)}}}}})(); +offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/bvid-convert.min.js"] = (()=>{return(i,e)=>{const n=["https://www.bilibili.com/video/","https://www.bilibili.com/bangumi/"].some(i=>document.URL.startsWith(i));if(i.preferAvUrl&&document.URL.startsWith("https://www.bilibili.com/video/")){SpinQuery.select(()=>unsafeWindow.aid).then(i=>{if(!i){return}if(document.URL.includes("videocard_series")){return}const e=document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i,(e,n)=>{return`/${n}/av${i}`});if(document.URL!==e){history.replaceState({},document.title,e)}})}return{widget:{content:`
`,condition:async()=>{if(n){return Boolean(await SpinQuery.select(()=>unsafeWindow.aid||unsafeWindow.bvid))}else{return false}},success:()=>{e.applyStyle("bvidConvertStyle");const i=async()=>{const i=dq(".bvid-convert");i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${unsafeWindow.bvid}
\n`;const e=await SpinQuery.select(".av-link,.bv-link,.bvid-link");if(e){i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${e.innerHTML}
\n`}};Observer.videoChange(i)}}}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/category-regions.min.js"] = (()=>{return(i,n)=>{const e={anime:1,bangumi:13,china:167,manga:-1,music:3,dance:129,game:4,tech:36,digital:188,life:160,food:211,kichiku:119,fashion:155,information:202,entertainment:5,column:-1,movie:181,tv:11,film:23,documentary:177};const a={anime:"v/douga",bangumi:"anime",china:"guochuang",manga:"",music:"v/music",dance:"v/dance",game:"v/game",tech:"v/technology",digital:"v/digital",life:"v/life",food:"v/food",kichiku:"v/kichiku",fashion:"v/fashion",information:"v/information/",entertainment:"v/ent",column:"",movie:"v/cinephile",tv:"tv",film:"cinema",documentary:"documentary"};return{export:{RegionCodes:e,RegionLinks:a}}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/clear-cache.min.js"] = (()=>{return(n,c)=>{return{widget:{content:`\n\n\n清除缓存\n`,condition:()=>typeof offlineData==="undefined",success:()=>{$("#clear-cache").on("click",()=>{n.cache={};Toast.success("已删除全部缓存.","清除缓存",5e3)})}}}}})(); offlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/collapse-live-side-bar.min.css"] = `.side-bar-cntr{transition:.24s ease-out!important;overflow:visible!important;transform:translateZ(0) translateX(100%)!important}.side-bar-cntr:hover{transform:translateZ(0)!important}.side-bar-cntr::after{right:calc(100% + 4px);transform:translateY(-50%) rotate(45deg);width:8px;height:8px;border-radius:2px;box-sizing:border-box;border:4px solid #aaa;border-top-color:transparent;border-right-color:transparent}body.dark .side-bar-cntr::after{border:4px solid #eee;border-top-color:transparent;border-right-color:transparent}.side-bar-cntr::before{right:calc(100% - 8px);transform:translateY(-50%);width:32px;height:48px;border-radius:8px 0 0 8px;background-color:#fff;border:1px solid #e9eaec}body.dark .side-bar-cntr::before{background-color:#222;border-color:transparent}.side-bar-cntr::after,.side-bar-cntr::before{content:"";transition:.24s ease-out;cursor:pointer;position:fixed;top:50%}.side-bar-cntr:hover::after,.side-bar-cntr:hover::before{opacity:0}`; diff --git a/bilibili-evolved.preview.user.js b/bilibili-evolved.preview.user.js index 8fc1a1d5f..dee595076 100644 --- a/bilibili-evolved.preview.user.js +++ b/bilibili-evolved.preview.user.js @@ -1290,7 +1290,7 @@ onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/m onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/blur-video-control.min.css"] = `.video-control-blur-layer{width:100%;height:100%;position:absolute;-webkit-backdrop-filter:blur(48px);backdrop-filter:blur(48px);z-index:-1;top:0}.bilibili-player-video-control-mask{background:0 0!important}.bilibili-player-video-control-bottom,.bui-slider .bui-track.bui-track-video-progress .bui-bar-wrap{background-color:transparent!important}.bilibili-player-video-control-bottom{position:relative}.bilibili-player-area .bilibili-player-video-control-bottom,.bilibili-player-area .bilibili-player-video-control-wrap{transition:none!important}`; onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/blur-video-control.min.js"] = (()=>{return(o,e)=>{const l=async()=>{const o=await SpinQuery.count(".bui-slider .bui-track.bui-track-video-progress,.bilibili-player-video-control-bottom",2);o.forEach(o=>{if(!o.classList.contains("video-control-blur-container")){o.classList.add("video-control-blur-container");o.insertAdjacentHTML("afterbegin",`
`)}})};e.applyStyle("blurVideoControlStyle");Observer.videoChange(l);return{reload:()=>{document.querySelectorAll(".video-control-blur-layer").forEach(o=>o.style.display="block");e.applyStyle("blurVideoControlStyle")},unload:()=>{document.querySelectorAll(".video-control-blur-layer").forEach(o=>o.style.display="none");e.removeStyle("blurVideoControlStyle")}}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/bvid-convert.min.css"] = `.bvid-convert{border:2px solid #8882;border-radius:8px;padding:6px 8px;margin:4px 0;order:-1;width:100%;box-sizing:border-box;user-select:text}.bvid-convert-item{font-size:14px}`; -onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/bvid-convert.min.js"] = (()=>{return(i,e)=>{const n=["https://www.bilibili.com/video/","https://www.bilibili.com/bangumi/"].some(i=>document.URL.startsWith(i));if(i.preferAvUrl&&document.URL.startsWith("https://www.bilibili.com/video/")){SpinQuery.select(()=>unsafeWindow.aid).then(i=>{if(!i){return}const e=document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i,(e,n)=>{return`/${n}/av${i}`});if(document.URL!==e){history.replaceState({},document.title,e)}})}return{widget:{content:`
`,condition:async()=>{if(n){return Boolean(await SpinQuery.select(()=>unsafeWindow.aid||unsafeWindow.bvid))}else{return false}},success:()=>{e.applyStyle("bvidConvertStyle");const i=async()=>{const i=dq(".bvid-convert");i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${unsafeWindow.bvid}
\n`;const e=await SpinQuery.select(".av-link,.bv-link,.bvid-link");if(e){i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${e.innerHTML}
\n`}};Observer.videoChange(i)}}}}})(); +onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/bvid-convert.min.js"] = (()=>{return(i,e)=>{const n=["https://www.bilibili.com/video/","https://www.bilibili.com/bangumi/"].some(i=>document.URL.startsWith(i));if(i.preferAvUrl&&document.URL.startsWith("https://www.bilibili.com/video/")){SpinQuery.select(()=>unsafeWindow.aid).then(i=>{if(!i){return}if(document.URL.includes("videocard_series")){return}const e=document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i,(e,n)=>{return`/${n}/av${i}`});if(document.URL!==e){history.replaceState({},document.title,e)}})}return{widget:{content:`
`,condition:async()=>{if(n){return Boolean(await SpinQuery.select(()=>unsafeWindow.aid||unsafeWindow.bvid))}else{return false}},success:()=>{e.applyStyle("bvidConvertStyle");const i=async()=>{const i=dq(".bvid-convert");i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${unsafeWindow.bvid}
\n`;const e=await SpinQuery.select(".av-link,.bv-link,.bvid-link");if(e){i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${e.innerHTML}
\n`}};Observer.videoChange(i)}}}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/category-regions.min.js"] = (()=>{return(i,n)=>{const e={anime:1,bangumi:13,china:167,manga:-1,music:3,dance:129,game:4,tech:36,digital:188,life:160,food:211,kichiku:119,fashion:155,information:202,entertainment:5,column:-1,movie:181,tv:11,film:23,documentary:177};const a={anime:"v/douga",bangumi:"anime",china:"guochuang",manga:"",music:"v/music",dance:"v/dance",game:"v/game",tech:"v/technology",digital:"v/digital",life:"v/life",food:"v/food",kichiku:"v/kichiku",fashion:"v/fashion",information:"v/information/",entertainment:"v/ent",column:"",movie:"v/cinephile",tv:"tv",film:"cinema",documentary:"documentary"};return{export:{RegionCodes:e,RegionLinks:a}}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/clear-cache.min.js"] = (()=>{return(n,c)=>{return{widget:{content:`\n\n\n清除缓存\n`,condition:()=>typeof offlineData==="undefined",success:()=>{$("#clear-cache").on("click",()=>{n.cache={};Toast.success("已删除全部缓存.","清除缓存",5e3)})}}}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/preview/min/collapse-live-side-bar.min.css"] = `.side-bar-cntr{transition:.24s ease-out!important;overflow:visible!important;transform:translateZ(0) translateX(100%)!important}.side-bar-cntr:hover{transform:translateZ(0)!important}.side-bar-cntr::after{right:calc(100% + 4px);transform:translateY(-50%) rotate(45deg);width:8px;height:8px;border-radius:2px;box-sizing:border-box;border:4px solid #aaa;border-top-color:transparent;border-right-color:transparent}body.dark .side-bar-cntr::after{border:4px solid #eee;border-top-color:transparent;border-right-color:transparent}.side-bar-cntr::before{right:calc(100% - 8px);transform:translateY(-50%);width:32px;height:48px;border-radius:8px 0 0 8px;background-color:#fff;border:1px solid #e9eaec}body.dark .side-bar-cntr::before{background-color:#222;border-color:transparent}.side-bar-cntr::after,.side-bar-cntr::before{content:"";transition:.24s ease-out;cursor:pointer;position:fixed;top:50%}.side-bar-cntr:hover::after,.side-bar-cntr:hover::before{opacity:0}`; diff --git a/bilibili-evolved.user.js b/bilibili-evolved.user.js index d8f7dcd63..a7a3418e5 100644 --- a/bilibili-evolved.user.js +++ b/bilibili-evolved.user.js @@ -1290,7 +1290,7 @@ onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/mi onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/blur-video-control.min.css"] = `.video-control-blur-layer{width:100%;height:100%;position:absolute;-webkit-backdrop-filter:blur(48px);backdrop-filter:blur(48px);z-index:-1;top:0}.bilibili-player-video-control-mask{background:0 0!important}.bilibili-player-video-control-bottom,.bui-slider .bui-track.bui-track-video-progress .bui-bar-wrap{background-color:transparent!important}.bilibili-player-video-control-bottom{position:relative}.bilibili-player-area .bilibili-player-video-control-bottom,.bilibili-player-area .bilibili-player-video-control-wrap{transition:none!important}`; onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/blur-video-control.min.js"] = (()=>{return(o,e)=>{const l=async()=>{const o=await SpinQuery.count(".bui-slider .bui-track.bui-track-video-progress,.bilibili-player-video-control-bottom",2);o.forEach(o=>{if(!o.classList.contains("video-control-blur-container")){o.classList.add("video-control-blur-container");o.insertAdjacentHTML("afterbegin",`
`)}})};e.applyStyle("blurVideoControlStyle");Observer.videoChange(l);return{reload:()=>{document.querySelectorAll(".video-control-blur-layer").forEach(o=>o.style.display="block");e.applyStyle("blurVideoControlStyle")},unload:()=>{document.querySelectorAll(".video-control-blur-layer").forEach(o=>o.style.display="none");e.removeStyle("blurVideoControlStyle")}}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/bvid-convert.min.css"] = `.bvid-convert{border:2px solid #8882;border-radius:8px;padding:6px 8px;margin:4px 0;order:-1;width:100%;box-sizing:border-box;user-select:text}.bvid-convert-item{font-size:14px}`; -onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/bvid-convert.min.js"] = (()=>{return(i,e)=>{const n=["https://www.bilibili.com/video/","https://www.bilibili.com/bangumi/"].some(i=>document.URL.startsWith(i));if(i.preferAvUrl&&document.URL.startsWith("https://www.bilibili.com/video/")){SpinQuery.select(()=>unsafeWindow.aid).then(i=>{if(!i){return}const e=document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i,(e,n)=>{return`/${n}/av${i}`});if(document.URL!==e){history.replaceState({},document.title,e)}})}return{widget:{content:`
`,condition:async()=>{if(n){return Boolean(await SpinQuery.select(()=>unsafeWindow.aid||unsafeWindow.bvid))}else{return false}},success:()=>{e.applyStyle("bvidConvertStyle");const i=async()=>{const i=dq(".bvid-convert");i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${unsafeWindow.bvid}
\n`;const e=await SpinQuery.select(".av-link,.bv-link,.bvid-link");if(e){i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${e.innerHTML}
\n`}};Observer.videoChange(i)}}}}})(); +onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/bvid-convert.min.js"] = (()=>{return(i,e)=>{const n=["https://www.bilibili.com/video/","https://www.bilibili.com/bangumi/"].some(i=>document.URL.startsWith(i));if(i.preferAvUrl&&document.URL.startsWith("https://www.bilibili.com/video/")){SpinQuery.select(()=>unsafeWindow.aid).then(i=>{if(!i){return}if(document.URL.includes("videocard_series")){return}const e=document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i,(e,n)=>{return`/${n}/av${i}`});if(document.URL!==e){history.replaceState({},document.title,e)}})}return{widget:{content:`
`,condition:async()=>{if(n){return Boolean(await SpinQuery.select(()=>unsafeWindow.aid||unsafeWindow.bvid))}else{return false}},success:()=>{e.applyStyle("bvidConvertStyle");const i=async()=>{const i=dq(".bvid-convert");i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${unsafeWindow.bvid}
\n`;const e=await SpinQuery.select(".av-link,.bv-link,.bvid-link");if(e){i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${e.innerHTML}
\n`}};Observer.videoChange(i)}}}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/category-regions.min.js"] = (()=>{return(i,n)=>{const e={anime:1,bangumi:13,china:167,manga:-1,music:3,dance:129,game:4,tech:36,digital:188,life:160,food:211,kichiku:119,fashion:155,information:202,entertainment:5,column:-1,movie:181,tv:11,film:23,documentary:177};const a={anime:"v/douga",bangumi:"anime",china:"guochuang",manga:"",music:"v/music",dance:"v/dance",game:"v/game",tech:"v/technology",digital:"v/digital",life:"v/life",food:"v/food",kichiku:"v/kichiku",fashion:"v/fashion",information:"v/information/",entertainment:"v/ent",column:"",movie:"v/cinephile",tv:"tv",film:"cinema",documentary:"documentary"};return{export:{RegionCodes:e,RegionLinks:a}}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/clear-cache.min.js"] = (()=>{return(n,c)=>{return{widget:{content:`\n\n\n清除缓存\n`,condition:()=>typeof offlineData==="undefined",success:()=>{$("#clear-cache").on("click",()=>{n.cache={};Toast.success("已删除全部缓存.","清除缓存",5e3)})}}}}})(); onlineData["https://raw.githubusercontent.com/the1812/Bilibili-Evolved/master/min/collapse-live-side-bar.min.css"] = `.side-bar-cntr{transition:.24s ease-out!important;overflow:visible!important;transform:translateZ(0) translateX(100%)!important}.side-bar-cntr:hover{transform:translateZ(0)!important}.side-bar-cntr::after{right:calc(100% + 4px);transform:translateY(-50%) rotate(45deg);width:8px;height:8px;border-radius:2px;box-sizing:border-box;border:4px solid #aaa;border-top-color:transparent;border-right-color:transparent}body.dark .side-bar-cntr::after{border:4px solid #eee;border-top-color:transparent;border-right-color:transparent}.side-bar-cntr::before{right:calc(100% - 8px);transform:translateY(-50%);width:32px;height:48px;border-radius:8px 0 0 8px;background-color:#fff;border:1px solid #e9eaec}body.dark .side-bar-cntr::before{background-color:#222;border-color:transparent}.side-bar-cntr::after,.side-bar-cntr::before{content:"";transition:.24s ease-out;cursor:pointer;position:fixed;top:50%}.side-bar-cntr:hover::after,.side-bar-cntr:hover::before{opacity:0}`; diff --git a/min/bundle.json b/min/bundle.json index a6a6e9c7a..4fc321adf 100644 --- a/min/bundle.json +++ b/min/bundle.json @@ -22,7 +22,7 @@ "blur-video-control.min.css": "B72FA7AD198ED1C9A9620A83881441F96F9FF3083ED12203A324B9753A7CCFFD", "blur-video-control.min.js": "00A2AC837FC455DF2AED7D0C350265C7438CC6F5C203F085E19639DDB86D0E11", "bvid-convert.min.css": "F49ED1B27A86CC3957226474EE15E86D5B11974A2C9D6D4968B375222C802FD0", - "bvid-convert.min.js": "BF2C8205479384E8C076CDA26C8C0CDB2B9748780F0F323A7804F8AF80E8D95A", + "bvid-convert.min.js": "CDBFD6A9912E3F75C3FA2EE0D000FCCE73E117D8D2A1DCC8A89C20EBD5C4058D", "category-regions.min.js": "42137E9E3B27758FA070C2E9A5E06EBBAEE83FCA9FE51D07C9CFF1C38C046604", "clear-cache.min.js": "9AB1536D8278DA681831A589AD1414425BF206B36AE109FB4EC1E8A685BB2A9F", "collapse-live-side-bar.min.css": "22348786547D2D8DB659A306AF2E9C1F2050D66488778C71545AAEF785FD57E6", diff --git a/min/bundle.zip b/min/bundle.zip index d25fcab357199a2032e6fba20711db2739056c69..a7d4481f7864bbef6d99dc8434670e9f9f35b8a1 100644 GIT binary patch delta 2940 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 OT|yt9_-{_v$$tPA%fur9 delta 3103 zcmY*bX>e3k7Jm1=PD1ETr^D+#o!85~gqo1Bh?)(ObQVTJ2+a`GaV3%{Vd-WUoRI>> zWzb@A#BTr{h<{L2b`VEIuu3)&wWL4-NEjJ0WFy2tfRN1TZn4^~`uf(r=Pu`-?>pzd zL*J}os|njoyOLH+%$@MUv>oqf>m(_AXWFhI?8PO!UsO5f zgsX}Fg#{66;-$=oT}`}DKCut}D?ANI5h?~=;ZFIh1L2V|a^T=U>kq2faD`{E92~pC zi`Xa7H*-H5jd9ISb3V-EU^5v()of2lpj$e71(mPX!Ku~AHU#-G`v@Wj6 z4XZJ#ix;w`c)pAK<*OTUpopV}t_~rnqruM1O{NNNEY~to9lW$$8 zNWOsW*ZDZ6pzk`bV0%$2D^VZebKbk1=-8gEb}D^(R6RWeNrlQgW4 z7Kq6G!@=EM94?CRP^0ao!EAnt`<@GksdWx6fa@R9pd9z zwBF%kSRJx^DJ$Q@!d^a3?k>gQUSc;F`aWJFe-%KWkAx7w8-0AV-1QI|`uLcHrbo@v z({&5+*iEiQ^tq-&IOYF6wq~mEvjb~3)4yp=izre$o;Jf2G@D~C^B@yW_5o%yQL5~p z88KUNf{6@b`X&=&m>DIqC}jiisw_%KiN|FzTDC95*Rrr9QxTc*UoSFC&pd_d4w6lT z?ga|%X~Jqn6vz!N_)ZZ;tQZ4yqBtS(KNjhk`E^LS!ClzcMbZ45j(olK9iS71%Hr=W z`1X5?E1HE-`$cq!n&U*V+;bX3jsaaJIg%{YcDN#84jrWjY zN+<}{OG8wEH8vQ1i6W0ZfV}<`)2*{@U~_DC^fysS*w~*YJb=&plPG3@=|yqkg{8DZ zu%>n)CWOs=rB;gvv6+`ag$l0VR41#j+UZ#lW1NZ4kn3m_67__F_zwehmEAVwrUMUPia$8s7eyW>ewO;rnEoor|_)F`7hs zpGg!XY+j^Ep&2!pU?mqa7ir#y% z%`D2~4|Bt<9my7vNvarWAwPdC#8PS#_ZE4iIkllVHSi}1OZ1KU*+Plc^blmL@XIGB zqs%G_lH`y_nmc7qZEbMw)DWs$C}l|zad_V<9Q{j{MU0^tGq5s6*zl88Xu8i{@A?TdiZtZAH z6Pa>PK8zZb%2i0xXl%MhW0yx^twy@6M588h=o8A}7J16L{XVqp_c<}kO(o{1Lq2?a z*yq6cUY?9E-E`~4ha*F&(U&YztnjTbR$5ia^boJVoJPn)nOT6X9!l5e(Bu($32LWL znir}@pq)EV;-y<`#uHvjrk!}lOX5AF!0V%jiarpN5qZ<@&*ia&turS)p^%M2wU3fc zKbhn4$vifBn(KJ1JMW>@C-Ujp`V*(5a0NMnL2gHmS(xx9Cn27jjcr``jguB|X+c)a zoY1VA(6f=El?tbz30D^5enElG!J=?82>S%Zdpmjs`CX1t1I0M@E?yf*y+t@Skfzii zDV=;=hjHmN_yJx|r{K@Rcj=;7S9OX@X#9b$KWvb=$53^aOV3u%n=*Aq^}J|`yf{c` l13&yPIa51lZe1uiWZuGgfw6J%;ZF`mzYV35bdJoD^nW>`6fFP% diff --git a/min/bvid-convert.min.js b/min/bvid-convert.min.js index 3df2cce85..be1fae64a 100644 --- a/min/bvid-convert.min.js +++ b/min/bvid-convert.min.js @@ -1 +1 @@ -(()=>{return(i,e)=>{const n=["https://www.bilibili.com/video/","https://www.bilibili.com/bangumi/"].some(i=>document.URL.startsWith(i));if(i.preferAvUrl&&document.URL.startsWith("https://www.bilibili.com/video/")){SpinQuery.select(()=>unsafeWindow.aid).then(i=>{if(!i){return}const e=document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i,(e,n)=>{return`/${n}/av${i}`});if(document.URL!==e){history.replaceState({},document.title,e)}})}return{widget:{content:`
`,condition:async()=>{if(n){return Boolean(await SpinQuery.select(()=>unsafeWindow.aid||unsafeWindow.bvid))}else{return false}},success:()=>{e.applyStyle("bvidConvertStyle");const i=async()=>{const i=dq(".bvid-convert");i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${unsafeWindow.bvid}
\n`;const e=await SpinQuery.select(".av-link,.bv-link,.bvid-link");if(e){i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${e.innerHTML}
\n`}};Observer.videoChange(i)}}}}})(); \ No newline at end of file +(()=>{return(i,e)=>{const n=["https://www.bilibili.com/video/","https://www.bilibili.com/bangumi/"].some(i=>document.URL.startsWith(i));if(i.preferAvUrl&&document.URL.startsWith("https://www.bilibili.com/video/")){SpinQuery.select(()=>unsafeWindow.aid).then(i=>{if(!i){return}if(document.URL.includes("videocard_series")){return}const e=document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i,(e,n)=>{return`/${n}/av${i}`});if(document.URL!==e){history.replaceState({},document.title,e)}})}return{widget:{content:`
`,condition:async()=>{if(n){return Boolean(await SpinQuery.select(()=>unsafeWindow.aid||unsafeWindow.bvid))}else{return false}},success:()=>{e.applyStyle("bvidConvertStyle");const i=async()=>{const i=dq(".bvid-convert");i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${unsafeWindow.bvid}
\n`;const e=await SpinQuery.select(".av-link,.bv-link,.bvid-link");if(e){i.innerHTML=`\n
av${unsafeWindow.aid}
\n
${e.innerHTML}
\n`}};Observer.videoChange(i)}}}}})(); \ No newline at end of file diff --git a/src/video/bvid-convert/bvid-convert.ts b/src/video/bvid-convert/bvid-convert.ts index 5f3a44e1e..26009ad37 100644 --- a/src/video/bvid-convert/bvid-convert.ts +++ b/src/video/bvid-convert/bvid-convert.ts @@ -9,6 +9,10 @@ if (settings.preferAvUrl && document.URL.startsWith('https://www.bilibili.com/vi if (!aid) { return } + if (document.URL.includes('videocard_series')) { + // 系列视频不能转换, 否则会无限刷新 + return + } const newUrl = document.URL.replace(/\/(video|bangumi)\/(BV[\w]+)/i, (_, type) => { return `/${type}/av${aid}` })