@xriss/weerss 0.0.11 → 0.0.13

package/hoard.js

@@ -69,7 +69,7 @@ hoard.fetch_text=async function(url,refresh)
 			let timeout_id
 			let res=await Promise.race([
 				fetch(corsurl),
-				new Promise(function(_, reject){ timeout_id=setTimeout(function(){reject("timeout")}, 2*1000) } ),
+				new Promise(function(_, reject){ timeout_id=setTimeout(function(){reject("timeout")}, 10*1000) } ),
 			])
 			if(timeout_id) { clearTimeout(timeout_id) }
 

package/package.json

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

package/shows.js

@@ -41,6 +41,7 @@ shows.fetch=async function(url,force)
 	}
 	
 	let data = await fetch(url).then(res => res.json())
+	data=data && data[0] && data[0].show // get first item from array returned from search
 	if(data)
 	{
 		await shows.set({url:url,data:data})
@@ -75,14 +76,14 @@ shows.get_tvmaze_episode=async function(showid,season,episode)
 // lookup show on tvmaze
 shows.get_tvmaze=async function(show,force)
 {
-	await new Promise(resolve => setTimeout(resolve, 500)) // do not spam requests
 
 	try{ // on network errors, just return non tvmaze info
 
 		let show_year
 		let show_country
 		let show_name=show.name
-		let qurl="https://api.tvmaze.com/singlesearch/shows?q="+show_name.replaceAll(" ","+")
+		let qurl="https://api.tvmaze.com/search/shows?q="+show_name.replaceAll(" ","+")
+		await new Promise(resolve => setTimeout(resolve, 500)) // do not spam requests
 		let tvmaze=await shows.fetch(qurl,force)
 
 		if(!tvmaze) // maybe try again
@@ -91,7 +92,8 @@ 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/singlesearch/shows?q="+show_name.replaceAll(" ","+")
+				qurl="https://api.tvmaze.com/search/shows?q="+show_name.replaceAll(" ","+")
+				await new Promise(resolve => setTimeout(resolve, 500)) // do not spam requests
 				tvmaze=await shows.fetch(qurl,force)
 				if(tvmaze)
 				{
@@ -106,7 +108,8 @@ 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/singlesearch/shows?q="+show_name.replaceAll(" ","+")
+				qurl="https://api.tvmaze.com/search/shows?q="+show_name.replaceAll(" ","+")
+				await new Promise(resolve => setTimeout(resolve, 500)) // do not spam requests
 				tvmaze=await shows.fetch(qurl,force)
 				if(tvmaze)
 				{
@@ -139,6 +142,8 @@ shows.get_show=async function(filename)
 	
 	let name=filename
 	if(!name){return} // give up
+
+	item_tags=name.replace(/[^a-zA-Z0-9]/g," ").replace(/\s+/g," ").trim().toLowerCase().split(" ")
 	
 	if(!item_name)
 	{
@@ -148,7 +153,6 @@ shows.get_show=async function(filename)
 			item_name=shows.clean_name(aa[1])
 			item_season=Number(aa[2])
 			item_episode=Number(aa[3])
-			item_tags=shows.clean_name(aa[4]).split(" ")
 		}
 	}
 
@@ -161,7 +165,6 @@ shows.get_show=async function(filename)
 			item_name=aa[1].replace(/[^a-zA-Z0-9]/g," ").replace(/\s+/g," ").trim().toLowerCase()
 			item_season=Number(aa[2]) // season is the year
 			item_episode=Number(aa[3]+aa[4]) // join month and day to make a 4 digit episode number
-			item_tags=aa[5].replace(/[^a-zA-Z0-9]/g," ").replace(/\s+/g," ").trim().toLowerCase().split(" ")
 			item_date=aa[2]+"-"+aa[3]+"-"+aa[4]
 		}
 	}
@@ -273,7 +276,17 @@ shows.good_episode=function(show,rules)
 {
 	if( !rules ) { return true }
 
+	let tvmaze=show.tvmaze||{}
 	let flags={}
+
+	if( tvmaze.language ) { flags[ tvmaze.language.trim().toLowerCase() ]=true }
+	if( tvmaze.type     ) { flags[ tvmaze.type.trim().toLowerCase()     ]=true }
+	if( tvmaze.genres )
+	for( let genre of tvmaze.genres || [] )
+	{
+		flags[ genre.trim().toLowerCase() ]=true
+	}
+
 	for( let tag of show.tags || [] )
 	{
 		flags[ tag.trim().toLowerCase() ]=true

package/weerss.js

@@ -288,6 +288,19 @@ weerss.getlist=async function()
 					}
 				}
 
+				for( let idx=bucket.length-1 ; idx>0 ; idx-- ) // remove huge/small files
+				{
+					if( bucket[ idx ].torrent.file_length > weerss.config.episode.maxsize ) // 3GB
+					{
+						bucket.splice( idx , 1 )
+					}
+
+					if( bucket[ idx ].torrent.file_length < weerss.config.episode.minsize ) // 3GB
+					{
+						bucket.splice( idx , 1 )
+					}
+				}
+
 
 				if( weerss.config.episode.best == "small" )
 				{
@@ -307,23 +320,7 @@ weerss.getlist=async function()
 					error("unknown config.episode.best option")
 				}
 				
-				while( bucket.length>0 ) // be real picky about size
-				{
-					if( bucket[ bucket.length-1 ].torrent.file_length > weerss.config.episode.maxsize ) // 3GB
-					{
-						bucket.pop()
-					}
-					else
-					if( bucket[ 0 ].torrent.file_length < weerss.config.episode.minsize ) // 3GB
-					{
-						bucket.shift()
-					}
-					else
-					{
-						break
-					}
-				}
-				while( bucket.length>0 ) // check episode flags
+				while( bucket.length>0 ) // check episode flags ( uses words from filename + all the show flags )
 				{
 					if( ! shows.good_episode(bucket[ 0 ].show,weerss.config.episode.rules) ) // skip this episode?
 					{