avoid deleting non-log file or not log files of current app

rime · Mar 6, 2024 · 4b09fe4 · 4b09fe4
1 parent d71b6ee
commit 4b09fe4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/rime/deployer.h b/src/rime/deployer.h
@@ -39,6 +39,7 @@ class Deployer : public Messenger {
   path sync_dir;
   string user_id;
   string distribution_name;
+  string app_name;
   string distribution_code_name;
   string distribution_version;
   // }

diff --git a/src/rime/lever/deployment_tasks.cc b/src/rime/lever/deployment_tasks.cc
@@ -633,6 +633,7 @@ bool CleanOldLogFiles::Run(Deployer* deployer) {
   DLOG(INFO) << "scanning " << dirs.size() << " temp directory for log files.";
 
   int removed = 0;
+  string app_name = deployer->app_name;
   for (const auto& dir : dirs) {
     // avoid iteration on non-existing directory, which may cause error
     if (!fs::exists(fs::path(dir)))
@@ -644,7 +645,8 @@ bool CleanOldLogFiles::Run(Deployer* deployer) {
       for (const auto& entry : fs::directory_iterator(dir)) {
         const string& file_name(entry.path().filename().string());
         if (entry.is_regular_file() && !entry.is_symlink() &&
-            boost::starts_with(file_name, "rime.") &&
+            boost::starts_with(file_name, app_name) &&
+            boost::ends_with(file_name, ".log") &&
             !boost::contains(file_name, today)) {
           files.push_back(entry.path());
         }

diff --git a/src/rime/setup.cc b/src/rime/setup.cc
@@ -53,6 +53,8 @@ RIME_API void SetupDeployer(RimeTraits* traits) {
     deployer.user_data_dir = path(traits->user_data_dir);
   if (PROVIDED(traits, distribution_name))
     deployer.distribution_name = traits->distribution_name;
+  if (PROVIDED(traits, app_name))
+    deployer.app_name = traits->app_name;
   if (PROVIDED(traits, distribution_code_name))
     deployer.distribution_code_name = traits->distribution_code_name;
   if (PROVIDED(traits, distribution_version))