From cd9f9f82f53c025cd7478547174d3d3115dcf82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Dahlgren?= <bjorn@dahlgren.at>
Date: Sun, 23 Jun 2019 20:04:28 +0200
Subject: [PATCH] Split mission and world name in missions list

---
 lib/missions.js                                         | 9 ++++++++-
 public/js/tpl/missions/list.html                        | 1 +
 public/js/tpl/missions/list_item.html                   | 3 ++-
 public/js/tpl/servers/missions/available/list.html      | 1 +
 public/js/tpl/servers/missions/available/list_item.html | 5 ++++-
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/missions.js b/lib/missions.js
index f75dc85..060a37f 100644
--- a/lib/missions.js
+++ b/lib/missions.js
@@ -43,12 +43,19 @@ Missions.prototype.updateMissions = function (cb) {
           return cb(err)
         }
 
+        var filenameWithoutPbo = path.basename(filename, '.pbo')
+        var worldName = path.extname(filenameWithoutPbo)
+        var missionName = path.basename(filenameWithoutPbo, worldName)
+        worldName = worldName.replace('.', '')
+
         cb(null, {
           dateCreated: new Date(stat.ctime),
           dateModified: new Date(stat.mtime),
+          missionName: missionName,
           name: filename,
           size: stat.size,
-          sizeFormatted: filesize(stat.size)
+          sizeFormatted: filesize(stat.size),
+          worldName: worldName
         })
       })
     }, function (err, missions) {
diff --git a/public/js/tpl/missions/list.html b/public/js/tpl/missions/list.html
index 5370c02..b2ef2c3 100644
--- a/public/js/tpl/missions/list.html
+++ b/public/js/tpl/missions/list.html
@@ -2,6 +2,7 @@
   <thead>
     <tr>
       <th>Mission</th>
+      <th>World</th>
       <th>Size</th>
       <th>Updated</th>
       <th></th>
diff --git a/public/js/tpl/missions/list_item.html b/public/js/tpl/missions/list_item.html
index 176a451..adcc36c 100644
--- a/public/js/tpl/missions/list_item.html
+++ b/public/js/tpl/missions/list_item.html
@@ -1,6 +1,7 @@
 <td style="width: 100%;">
-  <a href='/api/missions/<%-encodeURI(name)%>'><%-name%></a>
+  <a href='/api/missions/<%-encodeURI(name)%>'><%-missionName%></a>
 </td>
+<td><%-worldName%></td>
 <td class="text-nowrap"><%-sizeFormatted%></td>
 <td class="text-nowrap"><%-dateModified.substring(0, 10)%></td>
 <td>
diff --git a/public/js/tpl/servers/missions/available/list.html b/public/js/tpl/servers/missions/available/list.html
index f76ff03..baa0586 100644
--- a/public/js/tpl/servers/missions/available/list.html
+++ b/public/js/tpl/servers/missions/available/list.html
@@ -3,6 +3,7 @@
     <thead>
       <tr>
         <th>Mission</th>
+        <th>World</th>
         <th>&nbsp;</th>
       </tr>
     </thead>
diff --git a/public/js/tpl/servers/missions/available/list_item.html b/public/js/tpl/servers/missions/available/list_item.html
index 970eaf3..0c72dd9 100644
--- a/public/js/tpl/servers/missions/available/list_item.html
+++ b/public/js/tpl/servers/missions/available/list_item.html
@@ -1,5 +1,8 @@
 <td>
-  <%-name%>
+  <%-missionName%>
+</td>
+<td>
+  <%-worldName%>
 </td>
 <td>
   <a class="btn btn-primary btn-xs add pull-right">