Youtubeのショート動画URL対応。

NanasuNANA · Sep 29, 2024 · 22f3695 · 22f3695
1 parent 8f60154
commit 22f3695
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/app/class/cut-in.ts b/src/app/class/cut-in.ts
@@ -37,9 +37,14 @@ export class CutIn extends ObjectNode {
     let ret = '';
     if (StringUtil.validUrl(this.videoUrl)) {
       const hostname = (new URL(this.videoUrl)).hostname
-      if (hostname == 'youtube.com' || hostname == 'www.youtube.com') { 
-        let tmp = this.videoUrl.split('v=');
-        if (tmp[1]) ret = encodeURI(tmp[1].split(/[\?\&\#\/]/)[0]);
+      if (hostname == 'youtube.com' || hostname == 'www.youtube.com') {
+        if (this.videoUrl.indexOf('/shorts/') >= 0) {
+          let tmp = this.videoUrl.split('/shorts/');
+          if (tmp[1]) ret = encodeURI(tmp[1].split(/[\?\&\#\/]/)[0]);
+        } else if (this.videoUrl.indexOf('?v=') >= 0) {
+          let tmp = this.videoUrl.split('?v=');
+          if (tmp[1]) ret = encodeURI(tmp[1].split(/[\?\&\#\/]/)[0]);
+        }
       } else if (hostname == 'youtu.be') {
         let tmp = this.videoUrl.split('youtu.be/');
         if (tmp[1]) ret = encodeURI(tmp[1].split(/[\?\&\#\/]/)[0]);

diff --git a/src/app/component/cut-in/cut-in.component.ts b/src/app/component/cut-in/cut-in.component.ts
@@ -114,7 +114,9 @@ export class CutInComponent implements OnInit, OnDestroy {
   private _naturalWidth = 0;
   private _naturalHeight = 0;
   private get naturalWidth(): number {
-    if (this.videoId && !this.isSoundOnly) return 480;
+    if (this.videoId && !this.isSoundOnly) {
+      return (this.cutIn.videoUrl.indexOf('/shorts/') >= 0) ? 270 : 480;
+    }
     return this._naturalWidth;
   }
   private get naturalHeight(): number {