popcon: app sorting (and debug logs)

apps/popconlaunch/boot.ts

@@ -1,43 +1,104 @@
 // TODO: fastload
-const oldRead = require("Storage").readJSON;
-let cache;
+type Timestamp = number;
 
-const ensureCache = () => {
+const oldRead = require("Storage").readJSON;
+const monthAgo = Date.now() - 1000 * 86400 * 28;
+let cache: undefined | {
+	[key: string]: {
+		sortorder: number,
+		pop: number, // amount of launches
+		last: Timestamp,
+	}
+};
+let orderchanged = false;
+
+const ensureCache = (): NonNull<typeof cache> => {
 	if(!cache){
-		cache = oldRead("popcon.cache.json", 1);
+		cache = oldRead("popcon.cache.json", true);
 		if(!cache)
 			cache = {};
 	}
+	return cache;
 };
 
 const saveCache = () => {
 	require("Storage").writeJSON("popcon.cache.json", cache);
+	console.log("saved cache:" + JSON.stringify(cache, 0, 2));
+	if(orderchanged){
+		// wipe launcher cache
+		require("Storage")
+			.list(/launch.*cache/)
+			.forEach(f => require("Storage").erase(f))
+	}
 };
 
 const sortCache = () => {
-	// TODO
+	const ents = Object.values(cache);
+
+	ents.sort((a, b) => {
+		// group the most recently launched apps in the last month,
+		// then sort by launch count
+		// then by name
+		let n;
+
+		const am = (a.last > monthAgo) as unknown as number;
+		const bm = (b.last > monthAgo) as unknown as number;
+		n = bm - am;
+		if(n) return n;
+
+		n = b.pop - a.pop;
+		if(n) return n;
+
+		// pops are the same, sort by most recent
+		n = b.last - a.last;
+		if(n) return n;
+
+		if(a.name<b.name) return -1;
+		if(a.name>b.name) return 1;
+		return 0;
+	});
+
+	let i = 0;
+	for(const ent of ents){
+		if(ent.sortorder !== i) orderchanged = true;
+		ent.sortorder = i++;
+	}
 };
 
-require("Storage").readJSON = (fname, skipExceptions) => {
-	const j = oldRead(fname, skipExceptions);
+require("Storage").readJSON = ((fname, skipExceptions) => {
+	const j: AppInfo = oldRead(fname, skipExceptions);
+	//       ^ technically only AppInfo if we're "*.info"
 
-	if(fname.test(/\.info$/)){
-		ensureCache();
+	if(/\.info$/.test(fname)){
+		const cache = ensureCache();
+		let so;
 
-		if(j.src && cache[j.src]?.sortorder)
-			j.sortorder = cache[j.src].sortorder;
+		if(j.src && (so = cache[j.src]?.sortorder) != null)
+			j.sortorder = so,
+			console.log("readJSON(), modifying " + fname + "'s sort order to " + j.sortorder);
+		else
+			j.sortorder = 99,
+			console.log("readJSON(), leaving " + fname + "'s sort order as 99");
 	}
 
 	return j;
-} satisfies typeof oldRead;
+}) satisfies typeof oldRead;
 
 const oldLoad = load;
-load = (src) => {
-	ensureCache();
-	cache[src].pop++;
-	cache[src].last = Date.now();
+global.load = (src: string) => {
+	if(src){
+		const cache = ensureCache();
+		console.log("load(\"" + src + "\")");
+		const ent = cache[src] ||= (console.log("new cache entry"), {
+			pop: 0,
+			last: 0,
+			sortorder: -10,
+		});
+		ent.pop++;
+		ent.last = Date.now();
 		sortCache();
 		saveCache();
+	}
 
 	return oldLoad(src);
 };