@xriss/weerss 0.0.13 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xriss/weerss",
-	"version": "0.0.13",
+	"version": "0.0.15",
 	"source": "weerss.js",
 	"type": "module",
 	"repository": {

package/shows.js

@@ -82,7 +82,7 @@ shows.get_tvmaze=async function(show,force)
 		let show_year
 		let show_country
 		let show_name=show.name
-		let qurl="https://api.tvmaze.com/search/shows?q="+show_name.replaceAll(" ","+")
+		let qurl="https://api.tvmaze.com/search/shows?q="+show_name.replaceAll(" ","%20")
 		await new Promise(resolve => setTimeout(resolve, 500)) // do not spam requests
 		let tvmaze=await shows.fetch(qurl,force)
 
@@ -92,7 +92,7 @@ shows.get_tvmaze=async function(show,force)
 			{
 				show_year=show_name.substring(show_name.length-4)
 				show_name=show_name.substring(0,show_name.length-5)
-				qurl="https://api.tvmaze.com/search/shows?q="+show_name.replaceAll(" ","+")
+				qurl="https://api.tvmaze.com/search/shows?q="+show_name.replaceAll(" ","%20")
 				await new Promise(resolve => setTimeout(resolve, 500)) // do not spam requests
 				tvmaze=await shows.fetch(qurl,force)
 				if(tvmaze)
@@ -108,7 +108,7 @@ shows.get_tvmaze=async function(show,force)
 			{
 				show_country=show_name.substring(show_name.length-2)
 				show_name=show_name.substring(0,show_name.length-3)
-				qurl="https://api.tvmaze.com/search/shows?q="+show_name.replaceAll(" ","+")
+				qurl="https://api.tvmaze.com/search/shows?q="+show_name.replaceAll(" ","%20")
 				await new Promise(resolve => setTimeout(resolve, 500)) // do not spam requests
 				tvmaze=await shows.fetch(qurl,force)
 				if(tvmaze)

package/weerss.js

@@ -485,17 +485,25 @@ weerss.move=async function(args)
 				let show=await shows.get_show(base+ext)
 				if( show )
 				{
-					let xtra=""
-					if(show.year)
-					{
-						xtra=xtra+" ("+show.year+")"
-					}
-
 					let SxxExx=("S"+show.season.toString().padStart(2, "0")+"E"+show.episode.toString().padStart(2, "0") )
 
 	//				console.log(base , show.tvmaze.name , show.season , show.episode)
-					let showname=show.tvmaze.name.replace(/[/\\?%*:|"<>]/g, "-") // remove problematic chars
-					let to = showname+xtra+"/Season "+show.season+"/"+showname+" "+SxxExx+ext
+//					let showname=show.tvmaze.name.replace(/[/\\?%*:|"<>]/g, "-") // remove problematic chars
+
+					let tvname=sanitize(show.tvmaze.name,{replacement:""})
+					let country=show.tvmaze.network && show.tvmaze.network.country && show.tvmaze.network.country.code
+					let year=show.tvmaze.premiered && show.tvmaze.premiered.substr(0,4)
+					if(country)
+					{
+						tvname=tvname+" ("+country+")" // put country in dirname
+					}
+					if(year)
+					{
+						tvname=tvname+" ("+year+")" // put year in dirname
+					}
+					let esctvname=`'${tvname.replace(/'/g, `'\\''`)}'`
+
+					let to = tvname+"/Season "+show.season+"/"+tvname+" "+SxxExx+ext
 					console.log(file)
 					
 					if( dest )
@@ -566,12 +574,17 @@ weerss.dirs=async function(args)
 			console.log(`echo ${escfile}`)
 			if( show.tvmaze )
 			{
-				let tvname=sanitize(show.tvmaze.name)
-				let year=file.match(/\((\d\d\d\d)\)/);
-				year=year && year[1]
+//console.log(show.tvmaze)
+				let tvname=sanitize(show.tvmaze.name,{replacement:""})
+				let country=show.tvmaze.network && show.tvmaze.network.country && show.tvmaze.network.country.code
+				let year=show.tvmaze.premiered && show.tvmaze.premiered.substr(0,4)
+				if(country)
+				{
+					tvname=tvname+" ("+country+")" // put country in dirname
+				}
 				if(year)
 				{
-					tvname=tvname+" ("+year+")" // keep year in dirname
+					tvname=tvname+" ("+year+")" // put year in dirname
 				}
 				let esctvname=`'${tvname.replace(/'/g, `'\\''`)}'`
 				let good=shows.good_show(show,weerss.config.show.rules)
@@ -593,7 +606,7 @@ weerss.dirs=async function(args)
 				console.log(`rm -rf ${escfile}`)
 			}
 			
-			await new Promise(resolve => setTimeout(resolve, 500))
+//			await new Promise(resolve => setTimeout(resolve, 500))
 
 		}catch(e){console.log(e)}
 	}