Search WIP.

Other small refactors.

.dockerignore

@@ -1,2 +0,0 @@
-**
-!files

web/root/index.css

@@ -1,5 +1,5 @@
 body {
-    padding-top: 50px;
+    padding-top: 10px;
     background-color: black;
 }
 .green {
@@ -20,6 +20,10 @@ body {
     background-color: aliceblue;
 }
 
+.result {
+    padding: 5px;
+}
+
 .selected {
     background-color: cyan;
 }

web/root/index.js

@@ -4,10 +4,10 @@ const template = `
 		    <div class="col-7">
 		        <h1>DayZ Docker Server</h1>
 		    </div>
-		    <div class="col-3 text-center">
+		    <div class="col-3 form-control-lg">
-		        <form @submit="handleSubmit">
+                <form @submit="handleSubmit">
-		            <input size="30" name="search" placeholder="Search for workshop mods...">
+                    <input name="search" placeholder="Search mods...">
-		        </form>		        
+                </form>
 		    </div>
             <div class="col-2">
                 <div>
@@ -53,9 +53,29 @@ const template = `
                 </table>
             </div>
             <div class="col-9 modInfo" v-if="searchResults != ''">
-                <div v-for="result in this.searchResults.response.publishedfiledetails">
+                <table>
-                    {{ result.publishedfileid }} - {{ result.title }}
+                    <tr>
-                </div>
+                        <th>Steam Link</th>
+                        <th>Title</th>
+                        <th>Size</th>
+                        <th>Last Updated</th>
+                        <th>Subscriptions</th>
+                    </tr>
+                    <tr v-for="result in searchResults">
+                        <td>
+                            <a
+                                target="_blank"
+                                :href="'https://steamcommunity.com/sharedfiles/filedetails/?id=' + result.publishedfileid"
+                            >
+                                <img data-bs-toggle="tooltip" data-bs-placement="right" :title="result.short_description" width="160" height="90" :src="result.preview_url">
+                            </a>
+                        </td>
+                        <td>{{ result.title }}</td>                        
+                        <td>{{ result.file_size }}</td>                        
+                        <td>{{ new Date(result.time_updated * 1000) }}</td>
+                        <td>{{ result.lifetime_subscriptions }}</td>                   
+                    </tr>                
+                </table>
             </div>
             <div class="col-9 modInfo" v-if="modInfo != ''">
                 <div class="text-center col-12">
@@ -90,7 +110,6 @@ const template = `
             </div>
         </div>
 	</div>
-</template>
 `
 
 export default {
@@ -142,8 +161,20 @@ export default {
                 .then(response => response.json())
                 .then(response => {
                     this.modInfo = ""
-                    this.searchResults = response
                     this.XMLInfo = ""
+                    // const sortField = "time_updated"
+                    const sortField = "lifetime_subscriptions"
+                    response.response.publishedfiledetails.sort((a, b) =>
+                        a[sortField] < b[sortField] ? 1 : -1
+                    )
+                    this.searchResults = response.response.publishedfiledetails
+                })
+                .then(() => {
+                    // Enable all tooltips
+                    const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
+                    tooltipTriggerList.map(function (tooltipTriggerEl) {
+                        return new bootstrap.Tooltip(tooltipTriggerEl)
+                    })
                 })
                 .catch((error) => {
                     console.error(error)
@@ -169,3 +200,9 @@ export default {
             })
     }
 }
+
+/*
+
+{ "result": 1, "publishedfileid": "2489240546", "creator": "76561199068873691", "creator_appid": 221100, "consumer_appid": 221100, "consumer_shortcutid": 0, "filename": "", "file_size": "276817803", "preview_file_size": "27678", "preview_url": "https://steamuserimages-a.akamaihd.net/ugc/2011465736408144669/A7137390FBB9F4F94E0BFE5389932F6DE7AB7B87/", "url": "", "hcontent_file": "4050838808220661564", "hcontent_preview": "2011465736408144669", "title": "LastDayZ_Helis", "short_description": "The author of the helicopter mod https://sibnic.info on the site you can download the latest version of free helicopters, If you need help with installation, go to discord https://sibnic.info/discord", "time_created": 1621186063, "time_updated": 1684985831, "visibility": 0, "flags": 5632, "workshop_file": false, "workshop_accepted": false, "show_subscribe_all": false, "num_comments_public": 0, "banned": false, "ban_reason": "", "banner": "76561197960265728", "can_be_deleted": true, "app_name": "DayZ", "file_type": 0, "can_subscribe": true, "subscriptions": 7935, "favorited": 3, "followers": 0, "lifetime_subscriptions": 22759, "lifetime_favorited": 5, "lifetime_followers": 0, "lifetime_playtime": "0", "lifetime_playtime_sessions": "0", "views": 535, "num_children": 0, "num_reports": 0, "tags": [ { "tag": "Animation", "display_name": "Animation" }, { "tag": "Environment", "display_name": "Environment" }, { "tag": "Sound", "display_name": "Sound" }, { "tag": "Vehicle", "display_name": "Vehicle" }, { "tag": "Mod", "display_name": "Mod" } ], "language": 0, "maybe_inappropriate_sex": false, "maybe_inappropriate_violence": false, "revision_change_number": "14", "revision": 1, "ban_text_check_result": 5 }
+
+ */

web/start.sh

@@ -13,4 +13,4 @@ fi
 cd /web
 npm i
 export DEBUG='express:*'
-npx nodemon index.js
+npx nodemon web.js

web/web.js

@@ -30,6 +30,9 @@ const client_appid = "221100"
 const modDir = "/mods"
 const serverFiles = "/serverfiles"
 
+/*
+ File path delimiter
+ */
 const d = '/'
 
 /*
@@ -95,35 +98,29 @@ const getMods = () => {
 
 app.use(express.static('root'))
 
-app.route('/mod/:modId')
+// Get mod metadata by ID
-    .get((req, res) => {
+app.get('/mod/:modId', (req, res) => {
-        // Get mod metadata by ID
+    const modId = req.params["modId"]
-        const modId = req.params["modId"]
+    const modDir = config.modDir + d + modId
-        const modDir = config.modDir + d + modId
+    const customXML = getCustomXML(modId)
-        const customXML = getCustomXML(modId)
+    const ret = {
-        const ret = {
+        id: modId,
-            id: modId,
+        name: getModNameById(modId),
-            name: getModNameById(modId),
+        size: getDirSize(modDir),
-            size: getDirSize(modDir),
+        customXML: customXML
-            customXML: customXML
+    }
-        }
+    res.send(ret)
-        res.send(ret)
+})
-    })
-    .post((req, res) => {
-        // Add a mod by ID
-    })
-    .put((req, res) => {
-        // Update a mod by ID
-    })
 
-app.route('/mod/:modId/:file')
+// Get a mod's XML file
-    .get((req, res) => {
+app.get('/mod/:modId/:file', (req, res) => {
-        const modId = req.params["modId"]
+    const modId = req.params["modId"]
-        const file = req.params["file"]
+    const file = req.params["file"]
-        const contents = fs.readFileSync(config.modDir + d + modId + d + file)
+    const contents = fs.readFileSync(config.modDir + d + modId + d + file)
-        res.send(contents)
+    res.send(contents)
-    })
+})
 
+// Search for a mod
 app.get(('/search/:searchString'), (req, res) => {
     const searchString = req.params["searchString"]
     const url = "https://api.steampowered.com/IPublishedFileService/QueryFiles/v1/?numperpage=1000&appid=221100&return_short_description=true&strip_description_bbcode=true&key=" + config.steamAPIKey + "&search_text=" + searchString
@@ -140,8 +137,12 @@ app.get(('/search/:searchString'), (req, res) => {
     })
 })
 
+/*
+ Get the status of things:
+ If the base files are installed, the version of the server, a list of mods, etc.
+ */
 app.get('/status', (req, res) => {
-    // FIXME! Group these into a Promise.All()
+    // FIXME Async/await this stuff...
     const installed = fs.existsSync(config.installFile)
     const mods = getMods()
     const ret = {