Merge branch 'pre-build'

package.json

@@ -3,7 +3,8 @@
   "scripts": {
     "dev": "solid-start dev",
     "build": "solid-start build",
-    "start": "solid-start start"
+    "start": "solid-start start",
+    "prepare-ranks": "echo 'npx ts-node-esm --experimentalSpecifierResolution node src/prepare-predefined-ranks.ts'"
   },
   "type": "module",
   "devDependencies": {
@@ -11,6 +12,7 @@
     "postcss": "^8.4.18",
     "solid-start-node": "^0.2.0",
     "tailwindcss": "^3.2.0",
+    "ts-node": "^10.9.1",
     "typescript": "^4.8.4",
     "vite": "^3.1.8"
   },

src/models/db.ts

@@ -8,10 +8,11 @@ import fs from 'fs'
 
 let _db:sqlite.Database<sqlite3.Database, sqlite3.Statement> = null;
 
-const dataPath = process.env.DATA_PATH || '/data';
+export const dataPath = process.env.DATA_PATH || '/data';
 const dbPath = dataPath+'/db.sqlite';
 const dbVersionPath = dataPath+'/db.version';
 
+
 export async function init() {
 
     // Check the version of the database
@@ -43,7 +44,7 @@ export async function init() {
                         file.on("finish", () => {
                             file.close();
                             console.log("Download Completed");
-                            resolve();
+                            resolve(true);
                         });
                         file.on("error", (err) => {
                             console.log("Error while downloading the database file");

src/models/rank.ts

 
-
-import server$ from "solid-start/server";
-import {db, init} from "~/models/db";
-import predefinedCommunities from "~/predefined-communities";
+import {db, init, dataPath} from "./db";
+import predefinedCommunities from "../predefined-communities";
+import fs from 'fs';
 import rankToABC from "~/models/rank-to-abc";
 
 interface Row {
@@ -28,6 +27,11 @@ export const initRanks = async () => {
     await init();
 
     predefinedCommunityRanks = {};
+    if(fs.existsSync(dataPath+'/ranks.json')) {
+        console.log('Loading predefined community ranks from', dataPath+'/ranks.json');
+        loadRanks(dataPath+'/ranks.json');
+        return;
+    }
 
     console.log('Initializing predefined community ranks');
 
@@ -79,6 +83,16 @@ export const initRanks = async () => {
             }
         }
     }
+    console.log('Done.');
+}
+
+export function saveRanks(filename: string) 
+{
+    fs.writeFileSync(filename, JSON.stringify(predefinedCommunityRanks));
+}
+export function loadRanks(filename: string)
+{
+    predefinedCommunityRanks = JSON.parse(fs.readFileSync(filename).toString());
 }
 
 export default {

src/prepare-predefined-ranks.ts

+
+import predefinedCommunities from "./predefined-communities";
+import { initRanks, saveRanks } from './models/rank'
+
+
+async function main() {
+    await initRanks();
+    saveRanks('./ignore/ranks.json');
+}
+
+main();
\ No newline at end of file

src/routes/rank/[category].tsx

@@ -5,7 +5,6 @@ import { createServerData$ } from "solid-start/server";
 
 import Rank from "~/models/rank";
 import rankToABC from "~/models/rank-to-abc";
-
 import predefinedCommunities from "~/predefined-communities";