livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-712 FIXED IM log files renamed with ll.txt will create double files for users

meow-7.2.2
maksymsproductengine 2013-02-06 20:51:14 +02:00
parent f944608ab9
commit ec0ac12eba
5 changed files with 82 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llconversationlog.cpp
View File

@ -532,14 +532,8 @@ void LLConversationLog::onClearLogResponse(const LLSD& notification, const LLSD&
{
if (0 == LLNotificationsUtil::getSelectedOption(notification, response))
{
deleteTranscripts();
LLLogChat::deleteTranscripts();
mConversations.clear();
notifyObservers();
}
}
void LLConversationLog::deleteTranscripts()
{
gDirUtilp->deleteFilesInDir(gDirUtilp->getPerAccountChatLogsDir(), "*." + LL_TRANSCRIPT_FILE_EXTENSION);
LLFloaterIMSessionTab::processChatHistoryStyleUpdate(true);
}

1
indra/newview/llconversationlog.h
View File

@ -140,7 +140,6 @@ public:
void onClearLog();
void onClearLogResponse(const LLSD& notification, const LLSD& response);
void deleteTranscripts();
bool getIsLoggingEnabled() { return mLoggingEnabled; }
bool isLogEmpty() { return mConversations.empty(); }

2
indra/newview/llfloaterpreference.cpp
View File

@ -1584,7 +1584,7 @@ void LLFloaterPreference::onDeleteTranscriptsResponse(const LLSD& notification,
{
if (0 == LLNotificationsUtil::getSelectedOption(notification, response))
{
LLConversationLog::instance().deleteTranscripts();
LLLogChat::deleteTranscripts();
updateDeleteTranscriptsButton();
}
}

147
indra/newview/lllogchat.cpp
View File

@ -33,6 +33,7 @@
#include "llviewercontrol.h"
#include "lldiriterator.h"
#include "llfloaterimsessiontab.h"
#include "llinstantmessage.h"
#include "llsingleton.h" // for LLSingleton
@ -40,6 +41,7 @@
#include <boost/algorithm/string/replace.hpp>
#include <boost/regex.hpp>
#include <boost/regex/v4/match_results.hpp>
#include <boost/foreach.hpp>
#if LL_MSVC
#pragma warning(push)
@ -62,7 +64,7 @@ const std::string LL_IM_TIME("time");
const std::string LL_IM_TEXT("message");
const std::string LL_IM_FROM("from");
const std::string LL_IM_FROM_ID("from_id");
const std::string LL_TRANSCRIPT_FILE_EXTENSION("ll.txt");
const std::string LL_TRANSCRIPT_FILE_EXTENSION("txt");
const static std::string IM_SEPARATOR(": ");
const static std::string NEW_LINE("\n");
@ -85,6 +87,7 @@ const static std::string MULTI_LINE_PREFIX(" ");
* Note: "You" was used as an avatar names in viewers of previous versions
*/
const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}\\]\\s+)?(.*)$");
const static boost::regex TIMESTAMP("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}\\]|\\[\\d{1,2}:\\d{2}\\]).*");
/**
* Regular expression suitable to match names like
@ -328,69 +331,6 @@ void LLLogChat::saveHistory(const std::string& filename,
}
}
void LLLogChat::loadHistory(const std::string& filename, void (*callback)(ELogLineType, const LLSD&, void*), void* userdata)
{
if(!filename.size())
{
llwarns << "Filename is Empty!" << llendl;
return ;
}
LLFILE* fptr = LLFile::fopen(makeLogFileName(filename), "r"); /*Flawfinder: ignore*/
if (!fptr)
{
callback(LOG_EMPTY, LLSD(), userdata);
return; //No previous conversation with this name.
}
else
{
char buffer[LOG_RECALL_SIZE]; /*Flawfinder: ignore*/
char *bptr;
S32 len;
bool firstline=TRUE;
if ( fseek(fptr, (LOG_RECALL_SIZE - 1) * -1 , SEEK_END) )
{ //File is smaller than recall size. Get it all.
firstline = FALSE;
if ( fseek(fptr, 0, SEEK_SET) )
{
fclose(fptr);
return;
}
}
while ( fgets(buffer, LOG_RECALL_SIZE, fptr) && !feof(fptr) )
{
len = strlen(buffer) - 1; /*Flawfinder: ignore*/
for ( bptr = (buffer + len); (*bptr == '\n' || *bptr == '\r') && bptr>buffer; bptr--) *bptr='\0';
if (!firstline)
{
LLSD item;
std::string line(buffer);
std::istringstream iss(line);
if (!LLChatLogParser::parse(line, item))
{
item["message"] = line;
callback(LOG_LINE, item, userdata);
}
else
{
callback(LOG_LLSD, item, userdata);
}
}
else
{
firstline = FALSE;
}
}
callback(LOG_END, LLSD(), userdata);
fclose(fptr);
}
}
// static
void LLLogChat::loadChatHistory(const std::string& file_name, std::list<LLSD>& messages, const LLSD& load_params)
{
@ -506,19 +446,46 @@ std::string LLLogChat::oldLogFileName(std::string filename)
void LLLogChat::getListOfTranscriptFiles(std::vector<std::string>& list_of_transcriptions)
{
// get Users log directory
std::string directory = gDirUtilp->getPerAccountChatLogsDir();
std::string dirname = gDirUtilp->getPerAccountChatLogsDir();
// add final OS dependent delimiter
directory += gDirUtilp->getDirDelimiter();
dirname += gDirUtilp->getDirDelimiter();
// create search pattern
std::string pattern = "*." + LL_TRANSCRIPT_FILE_EXTENSION;
LLDirIterator iter(directory, pattern);
std::string scanResult;
while (iter.next(scanResult))
LLDirIterator iter(dirname, pattern);
std::string filename;
while (iter.next(filename))
{
list_of_transcriptions.push_back(scanResult);
std::string fullname = gDirUtilp->add(dirname, filename);
LLFILE * filep = LLFile::fopen(fullname, "rb");
if (NULL != filep)
{
char buffer[LOG_RECALL_SIZE];
fseek(filep, 0, SEEK_END); // seek to end of file
S32 bytes_to_read = ftell(filep); // get current file pointer
fseek(filep, 0, SEEK_SET); // seek back to beginning of file
// limit the number characters to read from file
if (bytes_to_read >= LOG_RECALL_SIZE)
{
bytes_to_read = LOG_RECALL_SIZE - 1;
}
if (bytes_to_read > 0 && NULL != fgets(buffer, bytes_to_read, filep))
{
//matching a timestamp
boost::match_results<std::string::const_iterator> matches;
if (boost::regex_match(std::string(buffer), matches, TIMESTAMP))
{
list_of_transcriptions.push_back(gDirUtilp->add(dirname, filename));
}
}
LLFile::close(filep);
}
}
}
@ -533,6 +500,46 @@ boost::signals2::connection LLLogChat::setSaveHistorySignal(const save_history_s
return sSaveHistorySignal->connect(cb);
}
//static
void LLLogChat::deleteTranscripts()
{
std::vector<std::string> list_of_transcriptions;
getListOfTranscriptFiles(list_of_transcriptions);
BOOST_FOREACH(const std::string& fullpath, list_of_transcriptions)
{
S32 retry_count = 0;
while (retry_count < 5)
{
if (0 != LLFile::remove(fullpath))
{
retry_count++;
S32 result = errno;
LL_WARNS("LLLogChat::deleteTranscripts") << "Problem removing " << fullpath << " - errorcode: "
<< result << " attempt " << retry_count << LL_ENDL;
if(retry_count >= 5)
{
LL_WARNS("LLLogChat::deleteTranscripts") << "Failed to remove " << fullpath << LL_ENDL;
return;
}
ms_sleep(100);
}
else
{
if (retry_count)
{
LL_WARNS("LLLogChat::deleteTranscripts") << "Successfully removed " << fullpath << LL_ENDL;
}
break;
}
}
}
LLFloaterIMSessionTab::processChatHistoryStyleUpdate(true);
}
//*TODO mark object's names in a special way so that they will be distinguishable form avatar name
//which are more strict by its nature (only firstname and secondname)
//Example, an object's name can be written like "Object <actual_object's_name>"

9
indra/newview/lllogchat.h
View File

@ -51,16 +51,13 @@ public:
const std::string& line);
static void getListOfTranscriptFiles(std::vector<std::string>& list);
/** @deprecated @see loadChatHistory() */
static void loadHistory(const std::string& filename,
void (*callback)(ELogLineType, const LLSD&, void*),
void* userdata);
static void loadChatHistory(const std::string& file_name, std::list<LLSD>& messages, const LLSD& load_params = LLSD());
typedef boost::signals2::signal<void ()> save_history_signal_t;
static boost::signals2::connection setSaveHistorySignal(const save_history_signal_t::slot_type& cb);
static void deleteTranscripts();
private:
static std::string cleanFileName(std::string filename);
static save_history_signal_t * sSaveHistorySignal;
@ -123,6 +120,6 @@ extern const std::string LL_IM_TIME; //("time");
extern const std::string LL_IM_TEXT; //("message");
extern const std::string LL_IM_FROM; //("from");
extern const std::string LL_IM_FROM_ID; //("from_id");
extern const std::string LL_TRANSCRIPT_FILE_EXTENSION; //("ll.txt");
extern const std::string LL_TRANSCRIPT_FILE_EXTENSION; //("txt");
#endif