Merge branch 'patch-2025.01.7' into patch-2025.01.2

scripts/commands/channels/parse.ts

@@ -26,7 +26,7 @@ async function main() {
   const logger = new Logger()
   const file = new File(options.config)
   const dir = file.dirname()
-  const config = (await import(pathToFileURL(options.config))).default
+  const config = (await import(pathToFileURL(options.config).toString())).default
   const outputFilepath = options.output || `${dir}/${config.site}.channels.xml`
 
   let channels = new Collection()

scripts/commands/epg/grab.ts

@@ -25,6 +25,7 @@ program
       'DELAY'
     )
   )
+  .addOption(new Option('-x, --proxy <url>', 'Use the specified proxy').env('PROXY'))
   .addOption(
     new Option(
       '--days <days>',
@@ -55,6 +56,7 @@ export type GrabOptions = {
   delay?: string
   lang?: string
   days?: number
+  proxy?: string
 }
 
 const options: GrabOptions = program.opts()

scripts/commands/sites/update.ts

@@ -1,51 +1,64 @@
+import { Channel } from 'epg-grabber'
 import { Logger, Storage, Collection } from '@freearhey/core'
-import { IssueLoader, HTMLTable, Markdown } from '../../core'
+import { IssueLoader, HTMLTable, ChannelsParser } from '../../core'
 import { Issue, Site } from '../../models'
-import { SITES_DIR, DOT_SITES_DIR } from '../../constants'
-import path from 'path'
+import { SITES_DIR, ROOT_DIR } from '../../constants'
 
 async function main() {
   const logger = new Logger({ disabled: true })
   const loader = new IssueLoader()
-  const storage = new Storage(SITES_DIR)
+  const sitesStorage = new Storage(SITES_DIR)
+  const channelsParser = new ChannelsParser({ storage: sitesStorage })
   const sites = new Collection()
 
   logger.info('loading list of sites')
-  const folders = await storage.list('*/')
+  const folders = await sitesStorage.list('*/')
 
   logger.info('loading issues...')
   const issues = await loadIssues(loader)
 
   logger.info('putting the data together...')
-  folders.forEach((domain: string) => {
+  for (const domain of folders) {
     const filteredIssues = issues.filter((issue: Issue) => domain === issue.data.get('site'))
     const site = new Site({
       domain,
       issues: filteredIssues
     })
 
+    const files = await sitesStorage.list(`${domain}/*.channels.xml`)
+    for (const filepath of files) {
+      const channels = await channelsParser.parse(filepath)
+
+      site.totalChannels += channels.count()
+      site.markedChannels += channels.filter((channel: Channel) => channel.xmltv_id).count()
+    }
+
     sites.add(site)
-  })
+  }
 
   logger.info('creating sites table...')
   const data = new Collection()
   sites.forEach((site: Site) => {
     data.add([
-      `<a href="sites/${site.domain}">${site.domain}</a>`,
-      site.getStatus().emoji,
-      site.getIssues().all().join(', ')
+      { value: `<a href="sites/${site.domain}">${site.domain}</a>` },
+      { value: site.totalChannels, align: 'right' },
+      { value: site.markedChannels, align: 'right' },
+      { value: site.getStatus().emoji, align: 'center' },
+      { value: site.getIssues().all().join(', ') }
     ])
   })
 
-  const table = new HTMLTable(data.all(), [{ name: 'Site' }, { name: 'Status' }, { name: 'Notes' }])
-
-  const readmeStorage = new Storage(DOT_SITES_DIR)
-  await readmeStorage.save('_table.md', table.toString())
-
   logger.info('updating sites.md...')
-  const configPath = path.join(DOT_SITES_DIR, 'config.json')
-  const sitesMarkdown = new Markdown(configPath)
-  sitesMarkdown.compile()
+  const table = new HTMLTable(data.all(), [
+    { name: 'Site', align: 'left' },
+    { name: 'Channels<br>(total / with xmltv-id)', colspan: 2, align: 'left' },
+    { name: 'Status', align: 'left' },
+    { name: 'Notes', align: 'left' }
+  ])
+  const rootStorage = new Storage(ROOT_DIR)
+  const sitesTemplate = await new Storage().load('scripts/templates/_sites.md')
+  const sitesContent = sitesTemplate.replace('_TABLE_', table.toString())
+  await rootStorage.save('SITES.md', sitesContent)
 }
 
 main()