Completed platform refactoring and fixed paths for resources/writable dirs

1 files changed, 15 insertions, 5 deletions

diff --git a/platform/platform.hpp b/platform/platform.hpp
index 793f8bacb1..ad745ae478 100644
--- a/platform/platform.hpp
+++ b/platform/platform.hpp
@@ -16,8 +16,22 @@ class Platform
 protected:
   string m_writableDir, m_resourcesDir;
   class PlatformImpl;
+  /// Used only on those platforms where needed
   PlatformImpl * m_impl;
 
+  /// Internal function to use files from writable dir if they override the same in the resources
+  string ReadPathForFile(string const & file) const
+  {
+    string fullPath = m_writableDir + file;
+    if (!IsFileExists(fullPath))
+    {
+      fullPath = m_resourcesDir + file;
+      if (!IsFileExists(fullPath))
+        MYTHROW(FileAbsentException, ("File doesn't exist", fullPath));
+    }
+    return fullPath;
+  }
+
 public:
   Platform();
   ~Platform();
@@ -46,11 +60,7 @@ public:
   /// @return false if file is not exist
   bool GetFileSize(string const & file, uint64_t & size) const;
   /// Simple file existing check
-  bool IsFileExists(string const & file) const
-  {
-    uint64_t dummy;
-    return GetFileSize(file, dummy);
-  }
+  bool IsFileExists(string const & file) const;
   //@}
 
   int CpuCores() const;