minor fixes, version bump

BeamMP · Jul 31, 2021 · 3d0d5e9 · 3d0d5e9
1 parent a1ca8e0
commit 3d0d5e9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/include/Common.h b/include/Common.h
@@ -50,7 +50,7 @@ class Application final {
     // Causes all threads to finish up and exit gracefull gracefully
     static void GracefullyShutdown();
     static TConsole& Console() { return *mConsole; }
-    static std::string ServerVersion() { return "2.1.4"; }
+    static std::string ServerVersion() { return "2.2.0"; }
     static std::string ClientVersion() { return "2.0"; }
     static std::string PPS() { return mPPS; }
     static void SetPPS(std::string NewPPS) { mPPS = NewPPS; }

diff --git a/include/TConfig.h b/include/TConfig.h
@@ -8,13 +8,13 @@ class TConfig {
 public:
     explicit TConfig();
 
-    bool Failed() const { return mFailed; }
+    [[nodiscard]] bool Failed() const { return mFailed; }
 
 private:
     void CreateConfigFile(std::string_view name);
     void ParseFromFile(std::string_view name);
     void PrintDebug();
-    
+
     void ParseOldFormat();
 
     bool mFailed { false };

diff --git a/src/TNetwork.cpp b/src/TNetwork.cpp
@@ -702,19 +702,29 @@ void TNetwork::Parse(TClient& c, const std::string& Packet) {
     }
 }
 
-void TNetwork::SendFile(TClient& c, const std::string& Name) {
-    info(c.GetName() + " requesting : " + Name.substr(Name.find_last_of('/')));
+void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
+    info(c.GetName() + " requesting : " + UnsafeName.substr(UnsafeName.find_last_of('/')));
 
-    if (!std::filesystem::exists(Name)) {
+    if (!fs::path(UnsafeName).has_filename()) {
         if (!TCPSend(c, "CO")) {
             // TODO: handle
         }
-        warn("File " + Name + " could not be accessed!");
+        warn("File " + UnsafeName + " is not a file!");
         return;
-    } else {
-        if (!TCPSend(c, "AG")) {
+    }
+    auto FileName = fs::path(UnsafeName).filename().string();
+    FileName = Application::Settings.Resource + "/Client/" + FileName;
+
+    if (!std::filesystem::exists(FileName)) {
+        if (!TCPSend(c, "CO")) {
             // TODO: handle
         }
+        warn("File " + UnsafeName + " could not be accessed!");
+        return;
+    }
+
+    if (!TCPSend(c, "AG")) {
+        // TODO: handle
     }
 
     ///Wait for connections
@@ -731,14 +741,14 @@ void TNetwork::SendFile(TClient& c, const std::string& Name) {
         return;
     }
 
-    size_t Size = size_t(std::filesystem::file_size(Name)), MSize = Size / 2;
+    size_t Size = size_t(std::filesystem::file_size(FileName)), MSize = Size / 2;
 
     std::thread SplitThreads[2] {
         std::thread([&] {
-            SplitLoad(c, 0, MSize, false, Name);
+            SplitLoad(c, 0, MSize, false, FileName);
         }),
         std::thread([&] {
-            SplitLoad(c, MSize, Size, true, Name);
+            SplitLoad(c, MSize, Size, true, FileName);
         })
     };
 

diff --git a/src/TResourceManager.cpp b/src/TResourceManager.cpp
@@ -19,7 +19,7 @@ TResourceManager::TResourceManager() {
                     ++i;
                     File = File.substr(i,pos-i);
                 }
-                mTrimmedList += File + ';';
+                mTrimmedList += "/" + fs::path(File).filename().string() + ';';
                 mFileSizes += std::to_string(size_t(fs::file_size(entry.path()))) + ';';
                 mMaxModSize += size_t(fs::file_size(entry.path()));
                 mModsLoaded++;