@xriss/weerss 0.0.42 → 0.0.45

package/cmd.js

@@ -126,11 +126,6 @@ if( arg1=="dirs" )
 	await weerss.dirs(args)
 }
 else
-if( arg1=="clean" )
-{
-	await weerss.clean(args)
-}
-else
 if( arg1=="purge" )
 {
 	await weerss.purge(args)

package/db.js

@@ -3,7 +3,7 @@ let db={}
 export default db
 
 
-import { AsyncDatabase } from "promised-sqlite3"
+import { DatabaseSync } from 'node:sqlite';
 
 import { configure } from 'safe-stable-stringify'
 const stringify = configure({})
@@ -29,18 +29,18 @@ db.name="weerss"
 db.setup=async function()
 {
 
-	db.handle = await AsyncDatabase.open( weerss.get_config_path("sqlite") );
+	db.handle = new DatabaseSync( weerss.get_config_path("sqlite") );
 
 //	db.handle.inner.on("trace", (sql) => console.log("[TRACE]", sql));
 
-	await db.handle.run("PRAGMA synchronous = 0 ;");
-	await db.handle.run("PRAGMA encoding = \"UTF-8\" ;");
-	await db.handle.run("PRAGMA journal_mode=WAL;");
-	await db.handle.run("PRAGMA mmap_size=268435456;");
-	await db.handle.run("PRAGMA temp_store=2;");
+	db.handle.exec("PRAGMA synchronous = 0 ;");
+	db.handle.exec("PRAGMA encoding = \"UTF-8\" ;");
+	db.handle.exec("PRAGMA journal_mode=WAL;");
+	db.handle.exec("PRAGMA mmap_size=268435456;");
+	db.handle.exec("PRAGMA temp_store=2;");
 
 
-	await db.handle.run(`
+	db.handle.exec(`
 
 		CREATE TABLE IF NOT EXISTS keyval
 		(
@@ -50,7 +50,7 @@ db.setup=async function()
 
     `);
 
-	await db.handle.run(`
+	db.handle.exec(`
 
 		CREATE TABLE IF NOT EXISTS hoard
 		(
@@ -60,7 +60,7 @@ db.setup=async function()
 
     `);
 
-	await db.handle.run(`
+	db.handle.exec(`
 
 		CREATE TABLE IF NOT EXISTS feeds
 		(
@@ -70,7 +70,7 @@ db.setup=async function()
 
     `);
 
-	await db.handle.run(`
+	db.handle.exec(`
 
 		CREATE TABLE IF NOT EXISTS items
 		(
@@ -80,7 +80,7 @@ db.setup=async function()
 
     `);
 
-	await db.handle.run(`
+	db.handle.exec(`
 
 		CREATE TABLE IF NOT EXISTS torrents
 		(
@@ -90,7 +90,7 @@ db.setup=async function()
 
     `);
 
-	await db.handle.run(`
+	db.handle.exec(`
 
 		CREATE TABLE IF NOT EXISTS shows
 		(
@@ -123,56 +123,57 @@ db.get=async function(table,key)
 db.set=async function(table,key,value)
 {
 	table=table||"keyval"
-	await db.handle.run(`
+	value=stringify(value)
+	db.handle.exec(`
 
 		INSERT INTO ${table} (key,value)
-		VALUES ($key,$value)
+		VALUES (${key},${value})
 		ON CONFLICT (key)
 		DO
-			UPDATE SET value = $value
-			WHERE key = $key;
+			UPDATE SET value = ${value}
+			WHERE key = ${key};
 
-	`,{$key:key,$value:stringify(value)})
+	`)
 }
 
 
 db.clear=async function(table)
 {
 	table=table||"keyval"
-	await db.handle.run(`
+	db.handle.exec(`
 
 		DELETE FROM ${table};
 
-	`,{})
+	`)
 
 }
 
 db.vacuum=async function()
 {
-	await db.handle.run(`
+	db.handle.exec(`
 
 		VACUUM;
 
-	`,{})
+	`)
 }
 
 db.delete=async function(table,key)
 {
 	table=table||"keyval"
-	await db.handle.run(`
+	db.handle.exec(`
 
-		DELETE FROM ${table} WHERE key=$key;
+		DELETE FROM ${table} WHERE key=${key};
 
-	`,{$key:key})
+	`)
 }
 
 db.clean=async function(table)
 {
-	await db.handle.each(`
+	for ( const row of db.handle.prepare(`
 
 		SELECT * FROM ${table}
 
-	`,{},function(row)
+	`).iterate({}) )
 	{
 		try{
 			JSON.parse(row.value)
@@ -180,7 +181,7 @@ db.clean=async function(table)
 			console.log("removing broken json for "+row.key)
 			db.delete(table,row.key)
 		}
-	})
+	}
 }
 
 db.list=async function(table,filter,cb)
@@ -258,19 +259,19 @@ db.list=async function(table,filter,cb)
 	}
 //	console.log(filters)
 
-	await db.handle.each(`
+	for ( const row of db.handle.prepare(`
 
 		SELECT * FROM ${table}
 		${filters}
 
-	`,{},function(row)
+	`).iterate({}) )
 	{
 		let v=JSON.parse(row.value)
 		if((!cb)||(cb(row.key,v)))
 		{
 			rs.push(v)
 		}
-	})
+	}
 
 	return rs // filtered only, sorted by date
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xriss/weerss",
-	"version": "0.0.42",
+	"version": "0.0.45",
 	"source": "weerss.js",
 	"type": "module",
 	"repository": {
@@ -22,11 +22,9 @@
 		"mri": "^1.2.0",
 		"parse-torrent": "^11.0.17",
 		"path-browserify": "^1.0.1",
-		"promised-sqlite3": "^2.1.0",
 		"safe-stable-stringify": "^2.5.0",
 		"sanitize-filename": "^1.6.3",
 		"sax": "^1.4.1",
-		"sqlite3": "^5.1.7",
 		"stream-browserify": "^3.0.0",
 		"webpack": "^5.94.0",
 		"webtorrent": "^2.5.1",

package/weerss.js

@@ -320,7 +320,9 @@ weerss.getlist=async function(filters)
 		}
 	}
 	list.sort( function(a,b){
-		return new Date(b.date) - new Date(a.date)
+		// sort by date of episode ?
+//		return new Date(b.show.date || 0) - new Date(a.show.date || 0)
+		return new Date(b.date || 0) - new Date(a.date || 0)
 	})
 	return list
 }
@@ -413,15 +415,6 @@ 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)
 {
 
@@ -619,16 +612,25 @@ weerss.purge=async function(args)
 
 	let keep=0
 	let drop=0
-	
-	await db.handle.run(`
 
+// delete bad json, wtf	
+	await db.handle.run(`
 		DELETE FROM keyval WHERE json_valid(value)==0 ;
+	`)
+	await db.handle.run(`
 		DELETE FROM hoard WHERE json_valid(value)==0 ;
+	`)
+	await db.handle.run(`
 		DELETE FROM feeds WHERE json_valid(value)==0 ;
+	`)
+	await db.handle.run(`
 		DELETE FROM items WHERE json_valid(value)==0 ;
+	`)
+	await db.handle.run(`
 		DELETE FROM torrents WHERE json_valid(value)==0 ;
+	`)
+	await db.handle.run(`
 		DELETE FROM shows WHERE json_valid(value)==0 ;
-
 	`)
 
 	await db.handle.each(`