fix: change the cc license position to video description

Author: SudharakaP

src/renderer/components/WatchVideoDescription/WatchVideoDescription.css

@@ -43,3 +43,7 @@
   max-block-size: 4lh;
   overflow: hidden;
 }
+
+.license {
+  margin-block: 1em;
+}

src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue

@@ -22,6 +22,12 @@
       @timestamp-event="onTimestamp"
       @click.native="expandDescriptionWithClick"
     />
+    <span
+      v-if="license"
+      class="license"
+    >
+      {{ license }}
+    </span>
     <span
       v-if="showControls && showFullDescription"
       class="descriptionStatus"
@@ -51,6 +57,10 @@ const props = defineProps({
   descriptionHtml: {
     type: String,
     default: ''
+  },
+  license: {
+    type: String,
+    default: null,
   }
 })
 

src/renderer/components/watch-video-info/watch-video-info.js

@@ -114,10 +114,6 @@ export default defineComponent({
     isUnlisted: {
       type: Boolean,
       required: false
-    },
-    license: {
-      type: String,
-      default: null,
     }
   },
   emits: ['change-format', 'pause-player', 'set-info-area-sticky', 'scroll-to-info-area'],

src/renderer/components/watch-video-info/watch-video-info.vue

@@ -141,12 +141,6 @@
         />
       </div>
     </div>
-    <div
-      v-if="license"
-      class="license"
-    >
-      {{ license }}
-    </div>
   </ft-card>
 </template>
 

src/renderer/views/Watch/Watch.js

@@ -82,7 +82,6 @@ export default defineComponent({
       isUpcoming: false,
       isPostLiveDvr: false,
       isUnlisted: false,
-      license: null,
       upcomingTimestamp: null,
       upcomingTimeLeft: null,
       /** @type {'dash' | 'audio' | 'legacy'} */
@@ -409,7 +408,7 @@ export default defineComponent({
         // extract localised title first and fall back to the not localised one
         this.videoTitle = result.primary_info?.title.text ?? result.basic_info.title
         this.videoViewCount = result.basic_info.view_count ?? (result.primary_info.view_count ? extractNumberFromString(result.primary_info.view_count.text) : null)
-        this.license = result.secondary_info.metadata.rows.matchCondition(element => element.title.text === 'License')?.contents[0].text
+        this.license = result.secondary_info.metadata.rows.find(element => element.title.text === 'License')?.contents[0].text
 
         this.channelId = result.basic_info.channel_id ?? result.secondary_info.owner?.author.id
         this.channelName = result.basic_info.author ?? result.secondary_info.owner?.author.name

src/renderer/views/Watch/Watch.vue

@@ -150,7 +150,6 @@
         :in-user-playlist="!!selectedUserPlaylist"
         class="watchVideo"
         :class="{ theatreWatchVideo: useTheatreMode }"
-        :license="license"
         @change-format="handleFormatChange"
         @pause-player="pausePlayer"
         @set-info-area-sticky="infoAreaSticky = $event"
@@ -169,6 +168,7 @@
         v-if="!isLoading && !hideVideoDescription"
         :description="videoDescription"
         :description-html="videoDescriptionHtml"
+        :license="license"
         class="watchVideo"
         :class="{ theatreWatchVideo: useTheatreMode }"
         @timestamp-event="changeTimestamp"