Merge branch 'master' into belleza2

scripts/commands/channels/validate.ts

@@ -9,9 +9,9 @@ import { program } from 'commander'
 import chalk from 'chalk'
 import langs from 'langs'
 
-program.argument('[filepath...]', 'Path to *.channels.xml files to validate').parse(process.argv)
+program.argument('[filepath]', 'Path to *.channels.xml files to validate').parse(process.argv)
 
-interface ValidationError {
+type ValidationError = {
   type: 'duplicate' | 'wrong_channel_id' | 'wrong_feed_id' | 'wrong_lang'
   name: string
   lang?: string
@@ -32,6 +32,7 @@ async function main() {
 
   let totalFiles = 0
   let totalErrors = 0
+  let totalWarnings = 0
 
   const storage = new Storage()
   const files = program.args.length ? program.args : await storage.list('sites/**/*.channels.xml')
@@ -63,14 +64,14 @@ async function main() {
       const foundChannel = channelsKeyById.get(channelId)
       if (!foundChannel) {
         errors.push({ type: 'wrong_channel_id', ...channel })
-        totalErrors++
+        totalWarnings++
       }
 
       if (feedId) {
         const foundFeed = feedsKeyByStreamId.get(channel.xmltv_id)
         if (!foundFeed) {
           errors.push({ type: 'wrong_feed_id', ...channel })
-          totalErrors++
+          totalWarnings++
         }
       }
     })
@@ -83,9 +84,16 @@ async function main() {
     }
   }
 
-  if (totalErrors > 0) {
+  const totalProblems = totalWarnings + totalErrors
-    console.log(chalk.red(`${totalErrors} error(s) in ${totalFiles} file(s)`))
+  if (totalProblems > 0) {
-    process.exit(1)
+    console.log(
+      chalk.red(
+        `${totalProblems} problems (${totalErrors} errors, ${totalWarnings} warnings) in ${totalFiles} file(s)`
+      )
+    )
+    if (totalErrors > 0) {
+      process.exit(1)
+    }
   }
 }
 

tests/commands/channels/validate.test.ts

@@ -1,6 +1,6 @@
 import { execSync } from 'child_process'
 
-interface ExecError {
+type ExecError = {
   status: number
   stdout: string
 }
@@ -23,48 +23,36 @@ describe('channels:validate', () => {
 │ 0       │ 'duplicate' │ 'en' │ 'Bravo.us@East' │ '140'   │ 'Bravo' │
 └─────────┴─────────────┴──────┴─────────────────┴─────────┴─────────┘
 
-1 error(s) in 1 file(s)
+1 problems (1 errors, 0 warnings) in 1 file(s)
 `)
     }
   })
 
   it('will show a message if the file contains a channel with wrong channel id', () => {
-    try {
+    const cmd = `${ENV_VAR} npm run channels:validate --- tests/__data__/input/channels_validate/wrong_channel_id.channels.xml`
-      const cmd = `${ENV_VAR} npm run channels:validate --- tests/__data__/input/channels_validate/wrong_channel_id.channels.xml`
+    const stdout = execSync(cmd, { encoding: 'utf8' })
-      const stdout = execSync(cmd, { encoding: 'utf8' })
+    expect(stdout).toContain(`
-      if (process.env.DEBUG === 'true') console.log(cmd, stdout)
-      process.exit(1)
-    } catch (error) {
-      expect((error as ExecError).status).toBe(1)
-      expect((error as ExecError).stdout).toContain(`
 ┌─────────┬────────────────────┬──────┬────────────────────┬─────────┬─────────────────────┐
 │ (index) │ type               │ lang │ xmltv_id           │ site_id │ name                │
 ├─────────┼────────────────────┼──────┼────────────────────┼─────────┼─────────────────────┤
 │ 0       │ 'wrong_channel_id' │ 'en' │ 'CNNInternational' │ '140'   │ 'CNN International' │
 └─────────┴────────────────────┴──────┴────────────────────┴─────────┴─────────────────────┘
 
-1 error(s) in 1 file(s)
+1 problems (0 errors, 1 warnings) in 1 file(s)
 `)
-    }
   })
 
   it('will show a message if the file contains a channel with wrong feed id', () => {
-    try {
+    const cmd = `${ENV_VAR} npm run channels:validate --- tests/__data__/input/channels_validate/wrong_feed_id.channels.xml`
-      const cmd = `${ENV_VAR} npm run channels:validate --- tests/__data__/input/channels_validate/wrong_feed_id.channels.xml`
+    const stdout = execSync(cmd, { encoding: 'utf8' })
-      const stdout = execSync(cmd, { encoding: 'utf8' })
+    expect(stdout).toContain(`
-      if (process.env.DEBUG === 'true') console.log(cmd, stdout)
-      process.exit(1)
-    } catch (error) {
-      expect((error as ExecError).status).toBe(1)
-      expect((error as ExecError).stdout).toContain(`
 ┌─────────┬─────────────────┬──────┬─────────────────┬─────────┬─────────┐
 │ (index) │ type            │ lang │ xmltv_id        │ site_id │ name    │
 ├─────────┼─────────────────┼──────┼─────────────────┼─────────┼─────────┤
 │ 0       │ 'wrong_feed_id' │ 'en' │ 'Bravo.us@West' │ '150'   │ 'Bravo' │
 └─────────┴─────────────────┴──────┴─────────────────┴─────────┴─────────┘
 
-1 error(s) in 1 file(s)
+1 problems (0 errors, 1 warnings) in 1 file(s)
 `)
-    }
   })
 })