Merge branch 'master' into Carlinhos027-patch-2

scripts/commands/playlist/validate.ts

@@ -5,6 +5,7 @@ import chalk from 'chalk'
 import { transliterate } from 'transliteration'
 import _ from 'lodash'
 import { DATA_DIR, STREAMS_DIR } from '../../constants'
+import path from 'path'
 
 program.argument('[filepath]', 'Path to file to validate').parse(process.argv)
 
@@ -40,7 +41,7 @@ async function main() {
     const log = new Collection()
     const buffer = new Dictionary()
     try {
-      const relativeFilepath = filepath.replace(STREAMS_DIR, '')
+      const relativeFilepath = filepath.replace(path.normalize(STREAMS_DIR), '')
       const playlist = await parser.parse(relativeFilepath)
       playlist.streams.forEach((stream: Stream) => {
         const channelNotInDatabase =

scripts/core/file.ts

@@ -5,7 +5,7 @@ export class File {
   content: string
 
   constructor(filepath: string, content?: string) {
-    this.filepath = filepath
+    this.filepath = path.normalize(filepath)
     this.content = content || ''
   }
 

scripts/core/storage.ts

@@ -7,7 +7,7 @@ export class Storage {
   rootDir: string
 
   constructor(rootDir?: string) {
-    this.rootDir = rootDir || './'
+    this.rootDir = path.normalize(rootDir || './')
   }
 
   list(pattern: string): Promise<string[]> {