Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Chat Logs] Break out migrateFile from makeLogFileName for use elsewhere

Browse Source
This commit is contained in:
Liru Færs
2020-04-19 15:50:50 -04:00
parent 788b83bff3
commit 343be08467
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/lllogchat.cpp
View File

@@ -61,6 +61,14 @@ std::string LLLogChat::makeLogFileNameInternal(std::string filename)
return get_log_dir_file(filename + ".txt"); return get_log_dir_file(filename + ".txt");
} }
bool LLLogChat::migrateFile(const std::string& old_name, const std::string& filename)
{
std::string oldfile = makeLogFileNameInternal(old_name);
if (!LLFile::isfile(oldfile)) return false; // An old file by this name doesn't exist
LLFile::rename(oldfile, filename); // Move the existing file to the new name
return true; // Report success
}
static LLSD sIDMap; static LLSD sIDMap;
static std::string get_ids_map_file() { return get_log_dir_file("ids_to_names.json"); } static std::string get_ids_map_file() { return get_log_dir_file("ids_to_names.json"); }
@@ -101,21 +109,15 @@ std::string LLLogChat::makeLogFileName(const std::string& username, const LLUUID
const bool empty = !entry.size(); const bool empty = !entry.size();
if (empty || entry != name) // If we haven't seen this entry yet, or the name is different than we remember if (empty || entry != name) // If we haven't seen this entry yet, or the name is different than we remember
{ {
const auto migrateFile = [&filename](const std::string& name) {
std::string oldname = makeLogFileNameInternal(name);
if (!LLFile::isfile(oldname)) return false; // An old file by this name doesn't exist
LLFile::rename(oldname, filename); // Move the existing file to the new name
return true; // Report success
};
if (empty) // We didn't see this entry on load if (empty) // We didn't see this entry on load
{ {
// Ideally, we would look up the old names here via server request // Ideally, we would look up the old names here via server request
// In lieu of that, our reverse cache has old names and new names that we've gained since our initialization of the ID map // In lieu of that, our reverse cache has old names and new names that we've gained since our initialization of the ID map
for (const auto& r : gCacheName->getReverseMap()) for (const auto& r : gCacheName->getReverseMap())
if (r.second == id && migrateFile(r.first)) if (r.second == id && migrateFile(r.first, filename))
break; break;
} }
else migrateFile(entry.asStringRef()); // We've seen this entry before, migrate old file if it exists else migrateFile(entry.asStringRef(), filename); // We've seen this entry before, migrate old file if it exists
entry = name; // Update the entry to point to the new name entry = name; // Update the entry to point to the new name

1
indra/newview/lllogchat.h
View File

@@ -53,6 +53,7 @@ public:
std::function<void (ELogLineType, const std::string&)> callback); std::function<void (ELogLineType, const std::string&)> callback);
private: private:
static std::string makeLogFileNameInternal(std::string filename); static std::string makeLogFileNameInternal(std::string filename);
static bool migrateFile(const std::string& old_name, const std::string& filename);
static void cleanFileName(std::string& filename); static void cleanFileName(std::string& filename);
}; };