v1.0.0

froquede · Sep 13, 2022 · d28f5bd · d28f5bd
1 parent 76ad44e
commit d28f5bd
Show file tree

Hide file tree

Showing 9 changed files with 1,454 additions and 30 deletions.
diff --git a/index.js b/index.js
@@ -10,7 +10,7 @@ module.exports = (app_path) => {
 
 	last_maps = {};
 
-	function listMaps(filter = "mtimeMs") {
+	function listMaps(filter = "mtimeMs", sorting = "desc") {
 		return new Promise((resolve, reject) => {
 			glob(maps_path + "**/*", { dot: true }, async (err, files) => {
 				if(!err) {
@@ -19,7 +19,7 @@ module.exports = (app_path) => {
 						if(path.extname(file) == "") {
 							const stat = await fs.promises.lstat(path.resolve(maps_path, file));
 							let name = file.toLowerCase().split(maps_path.toLowerCase()).join("");
-							if(stat.isFile()) maps[name] = { file, ...stat };
+							if(stat.isFile()) maps[name] = { file, name, ...stat };
 						}
 						if(path.extname(file) == ".jpg" || path.extname(file) == ".png") {
 							let name = file.toLowerCase().split(".jpg").join("").split(".png").join("");
@@ -31,7 +31,11 @@ module.exports = (app_path) => {
 					}
 
 					last_maps = maps;
-					let result = Object.entries(maps).sort((a, b) => b[1][filter] - a[1][filter]);
+					let result = Object.entries(maps).sort((a, b) => {
+							if(b[1][filter] < a[1][filter]) return sorting == "desc" ? -1 : 1
+							if(b[1][filter] > a[1][filter]) return sorting == "desc" ? 1 : -1
+							return 0;
+					});
 					resolve(Object.fromEntries(result));
 				}
 				else reject(err);
@@ -40,11 +44,13 @@ module.exports = (app_path) => {
 	}
 
 	const request = require("request");
-	const token = "Bearer eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiUlNBLU9BRVAiLCJjdHkiOiJKV1QiLCJ6aXAiOiJERUYiLCJ4NXQiOiJzR0pJLUJhTmhlTDctUjBMejJFdlhhNlQweGsifQ.MEkyRzv6AV7YlJ4YAPESBSR5zzbOlFX94PixboHBrfnz8WZksyD8gbiE-5O1ntPcdkmLFrd87htACW37vEynXlkA8j86-wtfDqauDQoABUs9jaOv4sAAAoUSUgfELKY9S2cmoe_1bonwe9J-Y3BNgBOovf7ISHMw94QnD5Mr8fLxPoln56ICXBjOPxj3r2nLFR5SZ5svusnz6U6M-ihCs7goNRRavyJjpIklEaanrNebJYDucJ-A1ilEr0MkDuHft02FsCJz8J8AGpOsryNDUjX7hUKFJCU_6nM4qFV6B85UoFbAFSpCrqs-fZRtRk2sfQoMccpj5Ae_siK3dOr5wA.f8nAhipu883GfVBkvDDkpA.xqxWyY2Mganvz1ihslBLKII1VupRnkhgMz1a2IRnuzVpeRuItRLvtwyyc06Kl1ws97z6_aaT4bR3kRNm3Xf3DOZIwV7rHKudrt8qbWEIxh4sdBBXYDpww58VcRYut37F06_UuURAIEIOYEx2Busfr8rWQ1oXkcN5UY9vCgptAw5U3_Ksp-scO6j5w3q9EtPfPLjUVX_YsfUXxbUJHA_Z0Qjw8Tp32D7dNFubGzUFotm20d8XbwSJlUzovUzxjeb3mRMiC9hPh0e89TksUDnkkYxpxxRj_I7iuhkuE0PKfAtvapl8zsQQcy4QBYxn-tYWldW5NX0G3LibfTBkSM3W0H-rOe6OnUyoD9wbZteQM7mbY8-14R-2NF4G2nLIw-beZ5sgcUKO0OCGCl_CvvoZjmceZXII1JBnKPv6_MClmT73teVoGWw_JddTza9E6wnuTqYeR1dEKwK5UHgqdxlceMB02IrAL95DcR_CA-EVQNkTSGDM-0oGvcHSyEFrfiR_8yDCQHNSjc63fZ6OEOANzT99CSWQHaGW-4ZyFRuOFyYpN1TkUKgLHAm5JZsKS4FvrnqgbFQXGBZU57Pa4EezYvWGhPTaf8T4r63SQWholQ8UifFFvtSHdQSTlBb5m4QHFvGW9YiydY16VZ9e0wO7ehz4IpP5Un7RwJPhL_b9NiJJm2Nu00430rItny7yM4yALJ7EbhI9TWTory6x7F4lKQcalR93sFYXQtByFNf0sA1AbrMlwdWhhHl7LfJBBd1RI6O1zmEEVQ6fvqnkxAC3VnZYpeyczub-OvjNpTQ_p1qi7AjN27pd3drR2tJWFuTJPO_KVn-JYdx3FtJ7Q8ULFJPks6yAB12fkYx3h-ZIdK5r050tCkia4QfYp3R_zWVexP-6Jqr3llI7XWytVqkAZbBAWU7Jh8FwI1J7OX525xY-hJwcZtXvvU-9bkCUV1hTJta-5dR462NrDkFN50PRQsstw9z5k9QOawMxJ2A4dgEUoB4L5s4lON3PwYNjUtLiFLf372eGQ8I3oVoyLDUpwh3OLdHnQVVYIT9BfuGt7TyDyxsteH8RfCagKf33t2Ps.ZHJZ6AvheYNqGmq0jFuk4Q";
-	function listModioMaps(page = 0) {
-		let sort = "-date_updated", offset = 20 * page, limit = 20;
+	const ignore = ["console_selected_xbox", "console_selected_ps4", "console_selected_switch", "console_recheck_xbox", "console_recheck_ps4", "console_recheck_switch"].join(",");
+	function listModioMaps(page = 0, token, filter = "date_updated", sorting = "desc", search = "") {
+		if(filter == "downloads" || filter == "rating") sorting = sorting == "desc" ? "asc" : "desc";
+		let sort = (sorting == "desc" ? "-" : "") + filter, offset = 20 * page, limit = 20;
 		return new Promise((resolve, reject) => {
-			request(`https://api.mod.io/v1/games/629/mods?tags=Map&_sort=${sort}&_offset=${offset}&_limit=${limit}`, {headers: {Authorization: token}}, (err, res, body) => {
+			//console.log(`https://api.mod.io/v1/games/629/mods?tags=Map&tags-not-in=${ignore}&_sort=${sort}&_offset=${offset}&_limit=${limit}&name-not-lk=*dropper*&name-lk=*${search}*`);
+			request(`https://api.mod.io/v1/games/629/mods?tags=Map&tags-not-in=${ignore}&_sort=${sort}&_offset=${offset}&_limit=${limit}&name-not-lk=*dropper*&name-lk=*${search}*`, {headers: {Authorization: "Bearer " + token}}, (err, res, body) => {
 			try {
 				body = JSON.parse(body);
 			} catch(err) {
@@ -65,8 +71,8 @@ const DecompressZip = require('decompress-zip');
 let download_queue = [];
 let queue_running = false;
 
-function addToDownloadQueue(id) {
-	request(`https://api.mod.io/v1/games/629/mods/${id}`, {headers: {Authorization: token}}, (err, res, body) => {
+function addToDownloadQueue(id, token) {
+	request(`https://api.mod.io/v1/games/629/mods/${id}`, {headers: {Authorization: "Bearer " + token}}, (err, res, body) => {
 	try {
 		body = JSON.parse(body);
 	} catch(err) {
@@ -173,15 +179,15 @@ const bp = require('body-parser');
 app.use(bp.json())
 
 app.get('/modio/maps', (req, res) => {
-	listModioMaps(req.query.page).then(maps => {
+	listModioMaps(req.query.page, req.query.token, req.query.filter, req.query.sorting, req.query.search).then(maps => {
 		res.send(maps);
 	}).catch(err => {
 		res.status(500).send(err);
 	})
 });
 
 app.get('/local/maps', (req, res) => {
-	listMaps().then(maps => {
+	listMaps(req.query.filter, req.query.sorting).then(maps => {
 		res.send(maps);
 	}).catch(err => {
 		res.status(500).send(err);
@@ -205,7 +211,7 @@ app.get('/internal/open', (req, res) => {
 
 app.post('/modio/download', (req, res) => {
 	if(req.body.id) {
-		addToDownloadQueue(req.body.id);
+		addToDownloadQueue(req.body.id, req.body.token);
 		res.status(200).send();
 	}	
 	else {

diff --git a/main.js b/main.js
@@ -16,9 +16,15 @@ function createWindow () {
         webPreferences: {},
         icon: nativeImage.createFromPath(path.resolve(app_path, './webapp/MapHubIcon.ico'))
     });
+    mainWindow.webContents.setFrameRate(60);
     mainWindow.resizable = false;
     mainWindow.loadURL('http://localhost:420')
     mainWindow.setMenuBarVisibility(false);
+
+    // mainWindow.webContents.on('new-window', (e, url) => {
+    //     e.preventDefault();
+    //     require('electron').shell.openExternal(url);
+    // });
 }
 
 let icon;

diff --git a/package.json b/package.json
@@ -31,7 +31,9 @@
   },
   "config": {
     "forge": {
-      "packagerConfig": {},
+      "packagerConfig": {
+        "icon": "./webapp/MapHubIcon.ico"
+      },
       "makers": [
         {
           "name": "@electron-forge/maker-squirrel",