refactor file module

Author: Nevermore1994

.gitignore

@@ -52,3 +52,4 @@ src/platform/Android/app/src/main/cpp/.idea
 src/platform/Android/sdk/.cxx
 demo/Android/.idea
 src/http/.idea
+config.json

CMakeLists.txt

@@ -27,7 +27,14 @@ option(DISABLE_TEST "disable test" OFF)
 option(DISABLE_HTTP "disable http" OFF)
 
 macro(read_config)
-    file(READ ${CMAKE_CURRENT_SOURCE_DIR}/config.json CONFIG_JSON_STRING)
+    # Check if config.json exists
+    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/config.json)
+        file(READ ${CMAKE_CURRENT_SOURCE_DIR}/config.json CONFIG_JSON_STRING)
+    else()
+        # Provide default configuration if file doesn't exist
+        set(CONFIG_JSON_STRING "{\"platform\": \"PC\", \"build_type\": \"Debug\", \"disable_http\": false, \"disable_test\": false }")
+        message(WARNING "config.json not found, using default configuration: ${CONFIG_JSON_STRING}")
+    endif()
 
     #parse build platform
     string(JSON BUILD_PLATFORM_VALUE GET ${CONFIG_JSON_STRING} platform)
@@ -81,7 +88,6 @@ macro(add_core_file TARGET_NAME)
         src/core/audio
         src/core/codec
         src/core/video
-        src/core/opengles
     )
 endmacro()
 

config.json

@@ -7,7 +7,7 @@
 #include "File.h"
 #include "Log.hpp"
 
-namespace slark::FileUtil {
+namespace slark::File {
 
 IFile::IFile(std::string path, FileMode mode)
     : path_(std::move(path))
@@ -40,7 +40,7 @@ bool IFile::open() noexcept {
 void IFile::seek(int64_t offset) noexcept {
     if (file_) {
         fseeko(file_, offset, SEEK_SET);
-        LogI("seek to offset:{}, file size:{}", offset, FileUtil::fileSize(path_));
+        LogI("seek to offset:{}, file size:{}", offset, File::fileSize(path_));
     }
 }
 
@@ -53,7 +53,7 @@ uint64_t IFile::tell() const noexcept {
 }
 
 uint64_t IFile::fileSize() const noexcept {
-    return FileUtil::fileSize(path_);
+    return File::fileSize(path_);
 }
 
 void IFile::close() noexcept {
@@ -221,4 +221,4 @@ void ReadFile::close() noexcept {
     }
 }
 
-}//end namespace slark::FileUtil
+}//end namespace slark::File

demo/iOS/demo/demo.xcworkspace/xcuserdata/pingtan.xcuserdatad/UserInterfaceState.xcuserstate

@@ -13,7 +13,7 @@
 #include "FileUtil.h"
 #include "Data.hpp"
 
-namespace slark::FileUtil {
+namespace slark::File {
 
 using FileHandle = FILE*;
 

src/base/File.cpp

@@ -6,7 +6,7 @@
 #include "FileUtil.h"
 #include <filesystem>
 
-namespace slark::FileUtil  {
+namespace slark::File {
 
 #if !SLARK_IOS && !SLARK_ANDROID
 std::string rootPath() noexcept {

src/base/File.h

@@ -9,7 +9,7 @@
 #include <cstdint>
 #include <string>
 
-namespace slark::FileUtil {
+namespace slark::File {
 
 [[maybe_unused]] extern std::string rootPath() noexcept;
 

src/base/FileUtil.cpp

@@ -31,7 +31,9 @@ void printLog(const std::string& log);
 template <typename ...Args>
 void outputLog(LogType level, std::string_view format, Args&& ...args) {
     auto logStr = std::vformat(format, std::make_format_args(args...));
-    LogOutput::shareInstance().write(logStr);
+    if (level != LogType::Print) {
+        LogOutput::shareInstance().write(logStr);
+    }   
     if (level == LogType::Record) {
         return;
     }

src/base/FileUtil.h

@@ -11,7 +11,7 @@
 namespace slark {
 
 std::string LogFileName() {
-    using namespace slark::FileUtil;
+    using namespace slark::File;
     const std::string logDir = cachePath() + "/logs";
     if (!isDirExist(logDir) && !createDir(logDir)) {
         LogP("create log folder failed.");
@@ -31,24 +31,25 @@ LogOutput& LogOutput::shareInstance(){
    return *instance_;
 }
 
-LogOutput::LogOutput() = default;
+LogOutput::LogOutput() {
+    writer_.withLock([&](auto& writer){
+        writer = std::make_unique<Writer>();
+        recreateFile(writer);
+    });
+}
 
 LogOutput::~LogOutput() = default;
 
 void LogOutput::write(const std::string& str) noexcept {
     writer_.withLock([&](auto& writer){
-        if (writer == nullptr) {
-            writer = std::make_unique<Writer>();
-            updateFile(writer);
-        }
         writer->write(str);
         if (writer->writeCount() >= kMaxWriteLogCount) {
-            updateFile(writer);
+            recreateFile(writer);
         }
     });
 }
 
-void LogOutput::updateFile(std::unique_ptr<Writer>& writer) noexcept {
+void LogOutput::recreateFile(std::unique_ptr<Writer>& writer) noexcept {
     auto path = LogFileName();
     if (path.empty()) {
         LogP("log file path is empty");