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) {
-    console.log(chalk.red(`${totalErrors} error(s) in ${totalFiles} file(s)`))
-    process.exit(1)
+  const totalProblems = totalWarnings + totalErrors
+  if (totalProblems > 0) {
+    console.log(
+      chalk.red(
+        `${totalProblems} problems (${totalErrors} errors, ${totalWarnings} warnings) in ${totalFiles} file(s)`
+      )
+    )
+    if (totalErrors > 0) {
+      process.exit(1)
+    }
   }
 }