@xriss/weerss 0.0.24 → 0.0.26

package/cmd.js

@@ -35,34 +35,34 @@ if( arg1=="help" )
 
 options:
 
-	Load config file, you should always load your custom config for all 
+	Load config file, you should always load your custom config for all
 	of the following commands...
 
 		--config=weerss.config
 
-	environment variables can also set options with the prefix WEERSS_ 
+	environment variables can also set options with the prefix WEERSS_
 	and the option name in all uppercase. eg:
 
 		export WEERSS_CONFIG=/home/dave/weerss.config
 
-All options are loaded into this config structure with . used as an 
+All options are loaded into this config structure with . used as an
 object seperator and the value parsed as json.
 
-EG To choose the number of items in your rss feed from the command line 
+EG To choose the number of items in your rss feed from the command line
 and thus overide the config file setting.
 
 	--rss.length=100
 or
 	--rss='{length:100}'
 
-With the later removing any other values in the rss object while the 
+With the later removing any other values in the rss object while the
 former just changes the legth value.
 
 commands:
 
 weerss config
-	Create a default to config file if we do not already have one and 
-	then print the current config. I recomend reading the default 
+	Create a default to config file if we do not already have one and
+	then print the current config. I recomend reading the default
 	config file for comments about how to configure weerss.
 
 weerss config --force
@@ -78,12 +78,12 @@ weerss rss
 	Save torrents as rss.
 
 weerss move
-	Move downloaded chaotic files to an organised jellyfin style 
+	Move downloaded chaotic files to an organised jellyfin style
 	directory.
 
 weerss dirs
-	Create a script to cleanup TV dirs using tvmaze. This does not do 
-	any cleanup just prints bash commands that you may wish to run 
+	Create a script to cleanup TV dirs using tvmaze. This does not do
+	any cleanup just prints bash commands that you may wish to run
 	later.
 
 weerss help
@@ -123,13 +123,18 @@ if( arg1=="dirs" )
 	await weerss.dirs(args)
 }
 else
+if( arg1=="clean" )
+{
+	await weerss.clean(args)
+}
+else
 {
 	console.log(` Unknown weerss command "${arg1}" `)
 }
 
 if(args.wtf)
 {
-	console.log(` Forcing exit `)	
+	console.log(` Forcing exit `)
 	wtf.dump()
 	process.exit(0)
 }

package/db.js

@@ -166,6 +166,23 @@ db.delete=async function(table,key)
 	`,{$key:key})
 }
 
+db.clean=async function(table)
+{
+	await db.handle.each(`
+
+		SELECT * FROM ${table}
+
+	`,{},function(row)
+	{
+		try{
+			JSON.parse(row.value)
+		}catch(e){
+			console.log("removing broken json for "+row.key)
+			db.delete(table,row.key)
+		}
+	})
+}
+
 db.list=async function(table,filter)
 {
 	table=table||"keyval"
@@ -241,8 +258,6 @@ db.list=async function(table,filter)
 	}
 //	console.log(filters)
 
-try{
-
 	await db.handle.each(`
 
 		SELECT * FROM ${table}
@@ -250,19 +265,8 @@ try{
 
 	`,{},function(row)
 	{
-try{
-                rs.push(JSON.parse(row.value))
-}catch(e){
-console.log("BROKEN SQLITE RESULT")
-console.log(row.value)
-console.log(e)
-}
+		rs.push(JSON.parse(row.value))
 	})
 
-}catch(e){
-console.log("BROKEN SQLITE QUERY")
-console.log(e)
-}
-
 	return rs // filtered only, sorted by date
 }

package/feeds.js

@@ -206,7 +206,7 @@ feeds.fetch_all=async function()
 		return ( b.items_date || 0 ) - ( a.items_date || 0 )
 	})
 	
-	let topitem=(await db.list("items",{},"date","prev",1))[0] ; topitem=topitem && topitem.uuid
+//	let topitem=(await db.list("items",{},"date","prev",1))[0] ; topitem=topitem && topitem.uuid
 
 	for(let feed of list )
 	{

package/package.json

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

package/weerss.js

@@ -39,14 +39,14 @@ weerss.config_default=`
   // number of episodes to list in the rss files
   length = 100
  }
- // decide which shows we like ( data from tvmaze ) 
+ // decide which shows we like ( data from tvmaze )
  show = {
   rules = [
    [ TRUE ]
    [ "!english" FALSE ]
   ]
  }
- // decide which episode we like tags come from filename 
+ // decide which episode we like tags come from filename
  episode = {
   best = "small"
   maxsize = 4000000000
@@ -76,7 +76,7 @@ weerss.load_config=async function(args)
 		{
 			console.log(` Loading config from `+args.config)
 			weerss.config=djon.load_file(args.config)
-			
+
 			let def=djon.load(weerss.config_default)
 			for(let n in def )
 			{
@@ -145,7 +145,7 @@ weerss.get_config_path=function(name)
 	{
 		f=path.join( d , f )
 	}
-	
+
 	return f
 }
 
@@ -205,9 +205,9 @@ weerss.fetch=async function()
 			await torrents.fill_torrent(item)
 			console.log(item.torrent)
 			items.set(item)
-		} 
+		}
 	}
-  
+
 	{
 		let its=await db.list("items",{show_is_null:1,torrent_is_not_null:1})
 		console.log("Checking shows : "+its.length)
@@ -218,7 +218,7 @@ weerss.fetch=async function()
 			console.log( item_to_string(item) )
 
 			items.set(item)
-		} 
+		}
 	}
 
 
@@ -226,14 +226,14 @@ weerss.fetch=async function()
 	await db.close()
 }
 
-weerss.getlist=async function()
+weerss.getlist=async function(filters)
 {
 	// all items then we sort and filter and list
-	let its=await db.list("items",{})
-	
+	let its=await db.list("items",filters||{})
+
 	let buckets={}
 	let itemshows={}
-	
+
 	for(let item of its)
 	{
 		if(!item.show) { continue }
@@ -245,18 +245,18 @@ weerss.getlist=async function()
 		let SxxExx=("S"+item.show.season.toString().padStart(2, "0")+"E"+item.show.episode.toString().padStart(2, "0") )
 
 		if(!buckets[item.show.id]){buckets[item.show.id]={}}
-		if(!buckets[item.show.id][SxxExx]){buckets[item.show.id][SxxExx]=[]}		
+		if(!buckets[item.show.id][SxxExx]){buckets[item.show.id][SxxExx]=[]}
 
 		buckets[item.show.id][SxxExx].push(item)
 
 		itemshows[item.show.id] = item.show
 	}
-	
+
 	let list=[]
 	for( let showid in itemshows )
 	{
 		let show=itemshows[showid]
-		
+
 		if( show.tvmaze )
 		{
 			if( ! shows.good_show(show,weerss.config.show.rules) ) // skip this show?
@@ -327,7 +327,7 @@ weerss.getlist=async function()
 				{
 					error("unknown config.episode.best option")
 				}
-				
+
 				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?
@@ -360,9 +360,14 @@ weerss.getlist=async function()
 
 weerss.list=async function(args)
 {
+	let past=new Date()
+	past.setDate( past.getDate()-28 )
+	past=past.toISOString()
+	let filters={date_gt:past}
+
 	await db.setup()
 
-	let list=(await weerss.getlist()).slice(0,weerss.config.rss.length)
+	let list=(await weerss.getlist(filters)).slice(0,weerss.config.rss.length)
 	for(let item of list)
 	{
 		console.log( item_to_string(item))
@@ -397,7 +402,7 @@ weerss.save_rss=async function(args)
 
 		let dates=(new Date(item.date)).toUTCString()
 		let isodates=(new Date(item.date)).toISOString()
-		
+
 		let it={
 "/guid" : url ,
 "/link" : url ,
@@ -416,7 +421,11 @@ weerss.save_rss=async function(args)
 		rss_items.push(it)
 	}
 
-	let list=(await weerss.getlist(weerss.config.show.rules)).slice(0,weerss.config.rss.length)
+	let past=new Date()
+	past.setDate( past.getDate()-28 )
+	past=past.toISOString()
+	let filters={date_gt:past}
+	let list=(await weerss.getlist(filters)).slice(0,weerss.config.rss.length)
 	for(let item of list)
 	{
 		push_item(item)
@@ -439,12 +448,21 @@ weerss.save_rss=async function(args)
 }
 
 
+weerss.clean=async function(args)
+{
+	await db.setup()
+
+	await db.clean("items")
+
+	await db.close()
+}
+
 weerss.move=async function(args)
 {
-	
+
 	let from=weerss.get_config_path("download") //args._[2] // optional dest dir
 	let dest=weerss.get_config_path("tv") //args._[2] // optional dest dir
-	
+
 	if(dest)
 	{
 		console.log( "Moving file from "+from+" to "+dest )
@@ -453,9 +471,9 @@ weerss.move=async function(args)
 	{
 		console.log( "Testing moving files from "+from )
 	}
-	
+
 	await db.setup()
-	
+
 	let getallfiles=function(dir, a)
 	{
 		a = a || []
@@ -485,7 +503,7 @@ weerss.move=async function(args)
 	for( let file of files )
 	{
 		try{ // continue if we get file errors?
-			
+
 			let ext=path.extname(file).toLowerCase()
 			let base=path.basename(file)
 			if( exts[ext] )
@@ -515,7 +533,7 @@ weerss.move=async function(args)
 
 					let to = tvname+"/Season "+show.season+"/"+tvname+" "+SxxExx+ext
 					console.log(file)
-					
+
 					if( dest )
 					{
 						to=path.join(dest , to)
@@ -539,12 +557,12 @@ weerss.move=async function(args)
 
 
 weerss.dirs=async function(args)
-{	
-	let dest=weerss.get_config_path("tv") 
+{
+	let dest=weerss.get_config_path("tv")
+
 
-	
 	await db.setup()
-	
+
 	let getdirs=function(dir, a)
 	{
 		a = a || []
@@ -568,10 +586,10 @@ weerss.dirs=async function(args)
 //		if( ! file.match(/\((\d\d\d\d)\)/) ) { continue }
 
 		try{ // continue if we get file errors?
-			
+
 			let escfiles=`'${file.replace(/'/g, `'\\''`)}/.'`
 			let escdir=`'${file.replace(/'/g, `'\\''`)}'`
-			
+
 //			console.log(file)
 			let show={
 				name:shows.clean_name(file),
@@ -618,7 +636,7 @@ weerss.dirs=async function(args)
 			{
 				console.log(`rm -rf ${escdir}`)
 			}
-			
+
 //			await new Promise(resolve => setTimeout(resolve, 500))
 
 		}catch(e){console.log(e)}