Update scripts

scripts/commands/playlist/format.ts

@@ -1,10 +1,10 @@
+import { getStreamInfo, loadStreamData } from '../../utils'
 import { Collection, Logger } from '@freearhey/core'
 import { OptionValues, program } from 'commander'
 import { Stream, Playlist } from '../../models'
 import { Storage } from '@freearhey/storage-js'
 import { STREAMS_DIR } from '../../constants'
 import { PlaylistParser } from '../../core'
-import { getStreamInfo } from '../../utils'
 import { loadData, data } from '../../api'
 import cliProgress from 'cli-progress'
 import { eachLimit } from 'async'
@@ -83,7 +83,7 @@ async function main() {
     return stream
   })
 
-  logger.info('adding the missing quality...')
+  logger.info('adding the missing quality and label...')
   const progressBar = new cliProgress.SingleBar({
     clearOnComplete: true,
     format: '[{bar}] {percentage}% | {value}/{total}'
@@ -91,21 +91,28 @@ async function main() {
   progressBar.start(streams.count(), 0)
   await eachLimit(streams.all(), options.parallel, async (stream: Stream) => {
     progressBar.increment()
-    if (stream.quality) return
+    if (stream.quality && stream.label) return
 
-    const streamInfo = await getStreamInfo(stream.url, {
+    const { data: streamData, error } = await loadStreamData(stream.url, {
       httpUserAgent: stream.user_agent,
       httpReferrer: stream.referrer,
       timeout: options.timeout,
       proxy: options.proxy
     })
 
-    if (streamInfo) {
-      const height = streamInfo?.resolution?.height
+    if (error?.code === 403 && !stream.label) {
+      stream.label = 'Geo-blocked'
+    }
 
-      if (height) {
-        stream.quality = `${height}p`
-      }
+    if (stream.quality) return
+    if (!streamData) return
+
+    const streamInfo = getStreamInfo(stream.url, streamData)
+    if (!streamInfo) return
+
+    const height = streamInfo?.resolution?.height
+    if (height) {
+      stream.quality = `${height}p`
     }
   })
   progressBar.stop()

scripts/commands/playlist/update.ts

@@ -1,4 +1,4 @@
-import { getStreamInfo, loadIssues, createThread } from '../../utils'
+import { getStreamInfo, loadIssues, createThread, loadStreamData } from '../../utils'
 import { STREAMS_DIR, LOGS_DIR } from '../../constants'
 import { Playlist, Issue, Stream } from '../../models'
 import { loadData, data as apiData } from '../../api'
@@ -241,14 +241,24 @@ async function addStream(issue: Issue) {
   const httpReferrer = data.getString('http_referrer') || null
 
   let quality = data.getString('quality') || null
-  if (!quality) {
-    const streamInfo = await getStreamInfo(streamUrl, { httpUserAgent, httpReferrer })
+  let label = data.getString('label') || null
+  if (!quality || !label) {
+    const { data: streamData, error } = await loadStreamData(streamUrl, {
+      httpUserAgent,
+      httpReferrer
+    })
 
-    if (streamInfo) {
-      const height = streamInfo?.resolution?.height
+    if (error?.code === 403 && !label) {
+      label = `Geo-blocked`
+    }
 
-      if (height) {
-        quality = `${height}p`
+    if (streamData && !quality) {
+      const streamInfo = getStreamInfo(streamUrl, streamData)
+      if (streamInfo) {
+        const height = streamInfo?.resolution?.height
+        if (height) {
+          quality = `${height}p`
+        }
       }
     }
   }
@@ -261,7 +271,7 @@ async function addStream(issue: Issue) {
     user_agent: httpUserAgent,
     referrer: httpReferrer,
     quality,
-    label: data.getString('label') || ''
+    label
   })
 
   stream.updateTitle().updateFilepath()