@xriss/weerss 0.0.10 → 0.0.12

package/package.json

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

package/shows.js

@@ -16,6 +16,7 @@ import weerss from "./weerss.js"
 // cleanup a file name as best we can to be used in search
 shows.clean_name=function(name)
 {
+	name=name.replace(/\s*\[.*?\]\s*/g, ' ') // remove any [tags]
 	return name.replace(/'|’/g,"").replace(/[^a-zA-Z0-9]/g," ").replace(/\s+/g," ").trim().toLowerCase()
 }
 
@@ -40,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})
@@ -54,15 +56,34 @@ shows.prepare=function(show)
 }
 
 
+// lookup show episode on tvmaze, this needs a valid tvmaze id
+shows.get_tvmaze_episode=async function(showid,season,episode)
+{
+	await new Promise(resolve => setTimeout(resolve, 500)) // do not spam requests
+
+	let ret=null
+	
+	try{ // on network errors, just return nil
+
+		let qurl="https://api.tvmaze.com/shows/"+showid+"/episodebynumber?season="+season+"&number="+episode
+		let text=await hoard.fetch_text(qurl)
+		ret=JSON.parse(text)
+	}catch(e){console.log(e)}
+
+	return ret
+}
+
 // lookup show on tvmaze
 shows.get_tvmaze=async function(show,force)
 {
+
 	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
@@ -71,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)
 				{
@@ -86,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)
 				{
@@ -115,6 +138,7 @@ shows.get_show=async function(filename)
 	let item_name
 	let item_season
 	let item_episode
+	let item_date
 	
 	let name=filename
 	if(!name){return} // give up
@@ -141,6 +165,7 @@ shows.get_show=async function(filename)
 			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]
 		}
 	}
 	
@@ -151,6 +176,7 @@ shows.get_show=async function(filename)
 		tags:item_tags,
 		season:item_season,
 		episode:item_episode,
+		date:item_date,
 	}
 	
 	await shows.get_tvmaze(show)
@@ -163,6 +189,17 @@ shows.fill_show=async function(item)
 {	
 
 	item.show=await shows.get_show(item.torrent.file_name)	
+	if( (item.show) && (item.show.tvmaze) )
+	{
+		if( !item.show.date ) // need a date so ask tvmaze
+		{
+			item.tvmaze_episode=await shows.get_tvmaze_episode( item.show.id , item.show.season , item.show.episode )
+			if( item.tvmaze_episode )
+			{
+				item.show.date=item.tvmaze_episode.airdate
+			}
+		}
+	}
 	
 	item.show=item.show||{fail:true}
 

package/weerss.js

@@ -159,7 +159,8 @@ let item_to_string=function(item)
 	let tvmaze=show.tvmaze || {}
 	let siz=Math.floor((torrent.file_length||0)/(1024*1024)).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")+".MB"
 	let SxxExx=("S"+(show.season||0).toString().padStart(2, "0")+"E"+(show.episode||0).toString().padStart(2, "0") )
-	return ( siz.padStart(9, " ")+" "+(tvmaze.name||torrent.file_name||item.uuid)+" "+SxxExx)
+	let airdate=show.date || ""
+	return ( siz.padStart(9, " ")+" "+(tvmaze.name||torrent.file_name||item.uuid)+" "+SxxExx+" "+airdate)
 }
 
 weerss.fetch=async function()
@@ -268,6 +269,26 @@ weerss.getlist=async function()
 			{
 				let bucket=buckets[showid][SxxExx]
 //				console.log( SxxExx + " x " + bucket.length )
+
+				if( weerss.config.episode.maxage )
+				{
+					for( let it of bucket )
+					{
+						if( (it.show) && (it.show.date) ) // check all for first episode we find with valid date
+						{
+							let now=(new Date()).getTime()
+							let test=Date.parse(it.show.date)
+							let days=Math.floor((now-test)/(1000*60*60*24))
+							if( days > weerss.config.episode.maxage ) // this episode is too old
+							{
+								while( bucket.length > 0){ bucket.pop() } // empty array
+							}
+							break;
+						}
+					}
+				}
+
+
 				if( weerss.config.episode.best == "small" )
 				{
 					bucket.sort(function(a,b){