Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

UTF-8 login patcher, ryzom/ryzomcore#335

Browse Source
develop
kaetemi 4 years ago
parent c069b70ce8
commit 298e912949
5 changed files with 101 additions and 101 deletions
Show Stats Download Patch File Download Diff File

2
ryzom/client/src/item_group_manager.cpp
Unescape Escape View File

@ -698,7 +698,7 @@ void CItemGroupManager::listGroup()
{ {
CItemGroup group = _Groups[i]; CItemGroup group = _Groups[i];
string msg = NLMISC::CI18N::get("cmdListGroupLine"); string msg = NLMISC::CI18N::get("cmdListGroupLine");
//Use ucstring because group name can contain accentued characters (and stuff like that) //Use utf-8 string because group name can contain accentued characters (and stuff like that)
string nameUC = group.name; string nameUC = group.name;
NLMISC::strFindReplace(msg, "%name", nameUC); NLMISC::strFindReplace(msg, "%name", nameUC);
NLMISC::strFindReplace(msg, "%size", NLMISC::toString(group.Items.size())); NLMISC::strFindReplace(msg, "%size", NLMISC::toString(group.Items.size()));

90
ryzom/client/src/login.cpp
Unescape Escape View File

@ -199,7 +199,7 @@ void setLoginFinished( bool f )
// *************************************************************************** // ***************************************************************************
// Pop a fatal error message box, giving the option to 'quit' the client, plus a help button // Pop a fatal error message box, giving the option to 'quit' the client, plus a help button
static void fatalMessageBox(const ucstring &msg) static void fatalMessageBox(const std::string &msg)
{ {
CInterfaceManager *im = CInterfaceManager::getInstance(); CInterfaceManager *im = CInterfaceManager::getInstance();
im->messageBoxWithHelp(msg, "ui:login", "login_quit"); im->messageBoxWithHelp(msg, "ui:login", "login_quit");
@ -207,7 +207,7 @@ static void fatalMessageBox(const ucstring &msg)
// *************************************************************************** // ***************************************************************************
// Pop an error message box, giving the option to go back to main menu, plus a help button // Pop an error message box, giving the option to go back to main menu, plus a help button
static void errorMessageBox(const ucstring &msg) static void errorMessageBox(const std::string &msg)
{ {
CInterfaceManager *im = CInterfaceManager::getInstance(); CInterfaceManager *im = CInterfaceManager::getInstance();
im->messageBoxWithHelp(msg, "ui:login", "on_back_to_login"); im->messageBoxWithHelp(msg, "ui:login", "on_back_to_login");
@ -281,25 +281,25 @@ void initEula()
} }
// *************************************************************************** // ***************************************************************************
static void setDataScanLog(const ucstring &text) static void setDataScanLog(const std::string &text)
{ {
CInterfaceManager *pIM= CInterfaceManager::getInstance(); CInterfaceManager *pIM= CInterfaceManager::getInstance();
CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:datascan:content:log_txt:log")); CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:datascan:content:log_txt:log"));
if (pVT != NULL) if (pVT != NULL)
{ {
pVT->setText(text.toUtf8()); pVT->setText(text);
} }
} }
// *************************************************************************** // ***************************************************************************
static void setDataScanState(const ucstring &text, ucstring progress= ucstring()) static void setDataScanState(const std::string &text, const std::string &progress = string())
{ {
CInterfaceManager *pIM= CInterfaceManager::getInstance(); CInterfaceManager *pIM= CInterfaceManager::getInstance();
CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:datascan:content:state")); CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:datascan:content:state"));
if (pVT != NULL) pVT->setText(text.toUtf8()); if (pVT != NULL) pVT->setText(text);
pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:datascan:content:progress")); pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:datascan:content:progress"));
if (pVT != NULL) pVT->setText(progress.toUtf8()); if (pVT != NULL) pVT->setText(progress);
} }
void initCatDisplay() void initCatDisplay()
@ -332,24 +332,24 @@ void initReboot()
// *************************************************************************** // ***************************************************************************
static void setPatcherStateText(const std::string &baseUIPath, const ucstring &str) static void setPatcherStateText(const std::string &baseUIPath, const std::string &str)
{ {
CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceManager *pIM = CInterfaceManager::getInstance();
CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(baseUIPath + ":content:state")); CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(baseUIPath + ":content:state"));
if (pVT != NULL) if (pVT != NULL)
{ {
pVT->setText(str.toUtf8()); pVT->setText(str);
} }
} }
// *************************************************************************** // ***************************************************************************
static void setPatcherProgressText(const std::string &baseUIPath, const ucstring &str) static void setPatcherProgressText(const std::string &baseUIPath, const std::string &str)
{ {
CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceManager *pIM = CInterfaceManager::getInstance();
CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(baseUIPath + ":content:progress")); CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(baseUIPath + ":content:progress"));
if (pVT != NULL) if (pVT != NULL)
{ {
pVT->setText(str.toUtf8()); pVT->setText(str);
} }
} }
@ -365,7 +365,7 @@ static void updatePatchingInfoText(const std::string &baseUIPath)
if (bgDownloader.getDownloadThreadPriority() == BGDownloader::ThreadPriority_Paused) if (bgDownloader.getDownloadThreadPriority() == BGDownloader::ThreadPriority_Paused)
{ {
setPatcherStateText(baseUIPath, CI18N::get("uiBGD_Paused")); setPatcherStateText(baseUIPath, CI18N::get("uiBGD_Paused"));
setPatcherProgressText(baseUIPath, ucstring()); setPatcherProgressText(baseUIPath, string());
} }
else else
{ {
@ -376,15 +376,15 @@ static void updatePatchingInfoText(const std::string &baseUIPath)
} }
else else
{ {
setPatcherProgressText(baseUIPath, ucstring()); setPatcherProgressText(baseUIPath, string());
} }
} }
} }
else else
#endif #endif
{ {
ucstring state; string state;
vector<ucstring> log; vector<string> log;
if(pPM->getThreadState(state, log)) if(pPM->getThreadState(state, log))
{ {
setPatcherStateText(baseUIPath, state); setPatcherStateText(baseUIPath, state);
@ -394,7 +394,7 @@ static void updatePatchingInfoText(const std::string &baseUIPath)
} }
else else
{ {
setPatcherProgressText(baseUIPath, ucstring()); setPatcherProgressText(baseUIPath, string());
} }
} }
} }
@ -481,8 +481,8 @@ void loginMainLoop()
if (finished) if (finished)
{ {
setPatcherStateText("ui:login:checking", ucstring()); setPatcherStateText("ui:login:checking", string());
setPatcherProgressText("ui:login:checking", ucstring()); setPatcherProgressText("ui:login:checking", string());
#ifdef RYZOM_BG_DOWNLOADER #ifdef RYZOM_BG_DOWNLOADER
if (isBGDownloadEnabled()) if (isBGDownloadEnabled())
@ -561,7 +561,7 @@ void loginMainLoop()
} }
else else
{ {
ucstring errMsg = CI18N::get("uiErrChecking"); string errMsg = CI18N::get("uiErrChecking");
if (!pPM->getLastErrorMessage().empty()) if (!pPM->getLastErrorMessage().empty())
{ {
errMsg = pPM->getLastErrorMessage(); errMsg = pPM->getLastErrorMessage();
@ -604,14 +604,14 @@ void loginMainLoop()
setDataScanState(CI18N::get("uiScanDataSucess")); setDataScanState(CI18N::get("uiScanDataSucess"));
else else
{ {
ucstring fmt= CI18N::get("uiScanDataErrors"); string fmt= CI18N::get("uiScanDataErrors");
strFindReplace(fmt, "%d", toString(numFiles)); strFindReplace(fmt, "%d", toString(numFiles));
setDataScanState(fmt); setDataScanState(fmt);
} }
} }
else else
{ {
ucstring errMsg = CI18N::get("uiErrDataScanning"); string errMsg = CI18N::get("uiErrDataScanning");
if (!pPM->getLastErrorMessage().empty()) if (!pPM->getLastErrorMessage().empty())
{ {
errMsg = pPM->getLastErrorMessage(); errMsg = pPM->getLastErrorMessage();
@ -620,7 +620,7 @@ void loginMainLoop()
} }
// the log may have changed // the log may have changed
ucstring dsLog; string dsLog;
if(pPM->getDataScanLog(dsLog)) if(pPM->getDataScanLog(dsLog))
setDataScanLog(dsLog); setDataScanLog(dsLog);
} }
@ -628,8 +628,8 @@ void loginMainLoop()
else else
{ {
// update inteface content // update inteface content
ucstring state; string state;
vector<ucstring> log; vector<string> log;
// get state // get state
if(pPM->getThreadState(state, log)) if(pPM->getThreadState(state, log))
{ {
@ -637,7 +637,7 @@ void loginMainLoop()
setDataScanState(state, toString("%d/%d", pPM->getCurrentFilesToGet(), pPM->getTotalFilesToGet())); setDataScanState(state, toString("%d/%d", pPM->getCurrentFilesToGet(), pPM->getTotalFilesToGet()));
} }
// set special data scan log // set special data scan log
ucstring dsLog; string dsLog;
if(pPM->getDataScanLog(dsLog)) if(pPM->getDataScanLog(dsLog))
setDataScanLog(dsLog); setDataScanLog(dsLog);
} }
@ -704,7 +704,7 @@ void loginMainLoop()
} }
else else
{ {
ucstring errMsg = CI18N::get("uiErrPatchApply"); string errMsg = CI18N::get("uiErrPatchApply");
if (!pPM->getLastErrorMessage().empty()) if (!pPM->getLastErrorMessage().empty())
{ {
errMsg = pPM->getLastErrorMessage(); errMsg = pPM->getLastErrorMessage();
@ -1157,8 +1157,8 @@ void initPatchCheck()
#endif #endif
NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:SCREEN")->setValue32(UI_VARIABLES_SCREEN_CHECKING); NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:SCREEN")->setValue32(UI_VARIABLES_SCREEN_CHECKING);
setPatcherStateText("ui:login:checking", ucstring()); setPatcherStateText("ui:login:checking", string());
setPatcherProgressText("ui:login:checking", ucstring()); setPatcherProgressText("ui:login:checking", string());
} }
void initShardDisplay() void initShardDisplay()
@ -1717,8 +1717,8 @@ void initPatch()
if (closeBtn) if (closeBtn)
closeBtn->setActive(false); closeBtn->setActive(false);
setPatcherStateText("ui:login:patching", ucstring()); setPatcherStateText("ui:login:patching", string());
setPatcherProgressText("ui:login:patching", ucstring()); setPatcherProgressText("ui:login:patching", string());
} }
// *************************************************************************** // ***************************************************************************
@ -2274,7 +2274,7 @@ void initDataScan()
CPatchManager *pPM = CPatchManager::getInstance(); CPatchManager *pPM = CPatchManager::getInstance();
// reset the log // reset the log
setDataScanLog(ucstring()); setDataScanLog(string());
// Start Scanning // Start Scanning
pPM->startScanDataThread(); pPM->startScanDataThread();
@ -2442,26 +2442,26 @@ bool initCreateAccount()
if(!CurlHttpClient.sendGet(url, params, pPM->isVerboseLog())) if(!CurlHttpClient.sendGet(url, params, pPM->isVerboseLog()))
{ {
ucstring errorMessage("Can't send (error code 60)"); string errorMessage("Can't send (error code 60)");
errorMessageBox(errorMessage); errorMessageBox(errorMessage);
nlwarning(errorMessage.toString().c_str()); nlwarning(errorMessage.c_str());
return false; return false;
} }
string res; string res;
if(!CurlHttpClient.receive(res, pPM->isVerboseLog())) if(!CurlHttpClient.receive(res, pPM->isVerboseLog()))
{ {
ucstring errorMessage("Can't receive (error code 61)"); string errorMessage("Can't receive (error code 61)");
errorMessageBox(errorMessage); errorMessageBox(errorMessage);
nlwarning(errorMessage.toString().c_str()); nlwarning(errorMessage.c_str());
return false; return false;
} }
if(res.empty()) if(res.empty())
{ {
ucstring errorMessage("Empty result (error code 13)"); string errorMessage("Empty result (error code 13)");
errorMessageBox(errorMessage); errorMessageBox(errorMessage);
nlwarning(errorMessage.toString().c_str()); nlwarning(errorMessage.c_str());
return false; return false;
} }
@ -2618,9 +2618,9 @@ class CAHOnCreateAccountSubmit : public IActionHandler
if (!CurlHttpClient.connect(url)) if (!CurlHttpClient.connect(url))
{ {
ucstring errorMessage("Can't connect"); string errorMessage("Can't connect");
errorMessageBox(errorMessage); errorMessageBox(errorMessage);
nlwarning(errorMessage.toString().c_str()); nlwarning(errorMessage.c_str());
return; return;
} }
@ -2645,26 +2645,26 @@ class CAHOnCreateAccountSubmit : public IActionHandler
if(!CurlHttpClient.sendPost(url, params, pPM->isVerboseLog())) if(!CurlHttpClient.sendPost(url, params, pPM->isVerboseLog()))
{ {
ucstring errorMessage("Can't send (error code 60)"); string errorMessage("Can't send (error code 60)");
errorMessageBox(errorMessage); errorMessageBox(errorMessage);
nlwarning(errorMessage.toString().c_str()); nlwarning(errorMessage.c_str());
return; return;
} }
string res; string res;
if(!CurlHttpClient.receive(res, pPM->isVerboseLog())) if(!CurlHttpClient.receive(res, pPM->isVerboseLog()))
{ {
ucstring errorMessage("Can't receive (error code 61)"); string errorMessage("Can't receive (error code 61)");
errorMessageBox(errorMessage); errorMessageBox(errorMessage);
nlwarning(errorMessage.toString().c_str()); nlwarning(errorMessage.c_str());
return; return;
} }
if(res.empty()) if(res.empty())
{ {
ucstring errorMessage("Empty result (error code 13)"); string errorMessage("Empty result (error code 13)");
errorMessageBox(errorMessage); errorMessageBox(errorMessage);
nlwarning(errorMessage.toString().c_str()); nlwarning(errorMessage.c_str());
return; return;
} }

86
ryzom/client/src/login_patch.cpp
Unescape Escape View File

@ -189,7 +189,7 @@ void CPatchManager::setClientRootPath(const std::string& clientRootPath)
} }
// **************************************************************************** // ****************************************************************************
void CPatchManager::setErrorMessage(const ucstring &message) void CPatchManager::setErrorMessage(const std::string &message)
{ {
_ErrorMessage = message; _ErrorMessage = message;
} }
@ -656,7 +656,7 @@ bool CPatchManager::isPatchThreadEnded (bool &ok)
// **************************************************************************** // ****************************************************************************
// Called in main thread // Called in main thread
bool CPatchManager::getThreadState (ucstring &stateOut, vector<ucstring> &stateLogOut) bool CPatchManager::getThreadState (std::string &stateOut, vector<string> &stateLogOut)
{ {
if ((PatchThread == NULL) && (CheckThread == NULL) && (ScanDataThread==NULL)) if ((PatchThread == NULL) && (CheckThread == NULL) && (ScanDataThread==NULL))
return false; return false;
@ -685,7 +685,7 @@ bool CPatchManager::getThreadState (ucstring &stateOut, vector<ucstring> &stateL
// verbose log // verbose log
if (isVerboseLog() && !stateLogOut.empty()) if (isVerboseLog() && !stateLogOut.empty())
for (uint32 i = 0; i < stateLogOut.size(); ++i) for (uint32 i = 0; i < stateLogOut.size(); ++i)
nlinfo("%s", stateLogOut[i].toUtf8().c_str()); nlinfo("%s", stateLogOut[i].c_str());
return changed; return changed;
} }
@ -1120,28 +1120,28 @@ float CPatchManager::getCurrentFileProgress() const
// **************************************************************************** // ****************************************************************************
void CPatchManager::setRWAccess (const string &filename, bool bThrowException) void CPatchManager::setRWAccess (const string &filename, bool bThrowException)
{ {
ucstring s = CI18N::get("uiSetAttrib") + " " + CFile::getFilename(filename); string s = CI18N::get("uiSetAttrib") + " " + CFile::getFilename(filename);
setState(true, s); setState(true, s);
if (!NLMISC::CFile::setRWAccess(filename) && bThrowException) if (!NLMISC::CFile::setRWAccess(filename) && bThrowException)
{ {
s = CI18N::get("uiAttribErr") + " " + CFile::getFilename(filename) + " (" + toString(errno) + "," + strerror(errno) + ")"; s = CI18N::get("uiAttribErr") + " " + CFile::getFilename(filename) + " (" + toString(errno) + "," + strerror(errno) + ")";
setState(true, s); setState(true, s);
throw Exception (s.toUtf8()); throw Exception (s);
} }
} }
// **************************************************************************** // ****************************************************************************
string CPatchManager::deleteFile (const string &filename, bool bThrowException, bool bWarning) string CPatchManager::deleteFile (const string &filename, bool bThrowException, bool bWarning)
{ {
ucstring s = CI18N::get("uiDelFile") + " " + CFile::getFilename(filename); string s = CI18N::get("uiDelFile") + " " + CFile::getFilename(filename);
setState(true, s); setState(true, s);
if (!NLMISC::CFile::fileExists(filename)) if (!NLMISC::CFile::fileExists(filename))
{ {
s = CI18N::get("uiDelNoFile"); s = CI18N::get("uiDelNoFile");
setState(true, s); setState(true, s);
return s.toUtf8(); return s;
} }
if (!NLMISC::CFile::deleteFile(filename)) if (!NLMISC::CFile::deleteFile(filename))
@ -1150,8 +1150,8 @@ string CPatchManager::deleteFile (const string &filename, bool bThrowException,
if(bWarning) if(bWarning)
setState(true, s); setState(true, s);
if(bThrowException) if(bThrowException)
throw Exception (s.toUtf8()); throw Exception (s);
return s.toUtf8(); return s;
} }
return ""; return "";
} }
@ -1159,20 +1159,20 @@ string CPatchManager::deleteFile (const string &filename, bool bThrowException,
// **************************************************************************** // ****************************************************************************
void CPatchManager::renameFile (const string &src, const string &dst) void CPatchManager::renameFile (const string &src, const string &dst)
{ {
ucstring s = CI18N::get("uiRenameFile") + " " + NLMISC::CFile::getFilename(src); string s = CI18N::get("uiRenameFile") + " " + NLMISC::CFile::getFilename(src);
setState(true, s); setState(true, s);
if (!NLMISC::CFile::moveFile(dst, src)) if (!NLMISC::CFile::moveFile(dst, src))
{ {
s = CI18N::get("uiRenameErr") + " " + src + " -> " + dst + " (" + toString(errno) + "," + strerror(errno) + ")"; s = CI18N::get("uiRenameErr") + " " + src + " -> " + dst + " (" + toString(errno) + "," + strerror(errno) + ")";
setState(true, s); setState(true, s);
throw Exception (s.toUtf8()); throw Exception (s);
} }
} }
// **************************************************************************** // ****************************************************************************
// Take care this function is called by the thread // Take care this function is called by the thread
void CPatchManager::setState (bool bOutputToLog, const ucstring &ucsNewState) void CPatchManager::setState (bool bOutputToLog, const string &ucsNewState)
{ {
{ {
CSynchronized<CState>::CAccessor as(&State); CSynchronized<CState>::CAccessor as(&State);
@ -1342,7 +1342,7 @@ void CPatchManager::getServerFile (const std::string &name, bool bZipped, const
try try
{ {
ucstring s = CI18N::get("uiLoginGetFile") + " " + NLMISC::CFile::getFilename(srcName); string s = CI18N::get("uiLoginGetFile") + " " + NLMISC::CFile::getFilename(srcName);
setState(true, s); setState(true, s);
// get the new file // get the new file
@ -1364,13 +1364,13 @@ void CPatchManager::getServerFile (const std::string &name, bool bZipped, const
// if emergency patch server, this is a real issue, rethrow exception // if emergency patch server, this is a real issue, rethrow exception
if (UsedServer < 0) if (UsedServer < 0)
{ {
ucstring s = CI18N::get("uiDLFailed"); string s = CI18N::get("uiDLFailed");
setState(true, s); setState(true, s);
throw Exception(e.what()); throw Exception(e.what());
} }
ucstring s = CI18N::get("uiDLURIFailed") + " " + serverDisplayPath; string s = CI18N::get("uiDLURIFailed") + " " + serverDisplayPath;
setState(true, s); setState(true, s);
// this server is unavailable // this server is unavailable
@ -1384,7 +1384,7 @@ void CPatchManager::getServerFile (const std::string &name, bool bZipped, const
// scanned all servers? use alternative // scanned all servers? use alternative
if (nextServer == UsedServer) if (nextServer == UsedServer)
{ {
ucstring s = CI18N::get("uiNoMoreURI"); string s = CI18N::get("uiNoMoreURI");
setState(true, s); setState(true, s);
UsedServer = -1; UsedServer = -1;
nlwarning("EXCEPTION CATCH: getServerFile() failed - no alternative found"); nlwarning("EXCEPTION CATCH: getServerFile() failed - no alternative found");
@ -1409,7 +1409,7 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de
try try
{ {
#ifdef USE_CURL #ifdef USE_CURL
ucstring s = CI18N::get("uiDLWithCurl") + " " + CFile::getFilename(dest); string s = CI18N::get("uiDLWithCurl") + " " + CFile::getFilename(dest);
setState(true, s); setState(true, s);
// user agent = nel_launcher // user agent = nel_launcher
@ -1417,7 +1417,7 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de
CURL *curl; CURL *curl;
CURLcode res; CURLcode res;
ucstring sTranslate = CI18N::get("uiLoginGetFile") + " " + NLMISC::CFile::getFilename (source); string sTranslate = CI18N::get("uiLoginGetFile") + " " + NLMISC::CFile::getFilename (source);
setState(true, sTranslate); setState(true, sTranslate);
CurrentFile = NLMISC::CFile::getFilename (source); CurrentFile = NLMISC::CFile::getFilename (source);
@ -1566,7 +1566,7 @@ void CPatchManager::downloadFile (const string &source, const string &dest, NLMI
void CPatchManager::decompressFile (const string &filename) void CPatchManager::decompressFile (const string &filename)
{ {
ucstring sTranslate = CI18N::get("uiDecompressing") + " " + NLMISC::CFile::getFilename(filename); string sTranslate = CI18N::get("uiDecompressing") + " " + NLMISC::CFile::getFilename(filename);
setState(true, sTranslate); setState(true, sTranslate);
//if(isVerboseLog()) nlinfo("Calling gzopen('%s','rb')", filename.c_str()); //if(isVerboseLog()) nlinfo("Calling gzopen('%s','rb')", filename.c_str());
@ -1664,7 +1664,7 @@ void CPatchManager::applyDate (const string &sFilename, uint32 nDate)
if(nDate != 0) if(nDate != 0)
{ {
setRWAccess(sFilename, false); setRWAccess(sFilename, false);
ucstring s = CI18N::get("uiChangeDate") + " " + NLMISC::CFile::getFilename(sFilename) + " " + timestampToHumanReadable(NLMISC::CFile::getFileModificationDate (sFilename)) + string s = CI18N::get("uiChangeDate") + " " + NLMISC::CFile::getFilename(sFilename) + " " + timestampToHumanReadable(NLMISC::CFile::getFileModificationDate (sFilename)) +
" -> " + timestampToHumanReadable(nDate); " -> " + timestampToHumanReadable(nDate);
setState(true,s); setState(true,s);
@ -1786,7 +1786,7 @@ void CPatchManager::getPatchFromDesc(SFileToPatch &ftpOut, const CBNPFile &fIn,
// If the version cannot be found with size and time try with sha1 // If the version cannot be found with size and time try with sha1
if (nVersionFound == 0xFFFFFFFF) if (nVersionFound == 0xFFFFFFFF)
{ {
ucstring sTranslate = CI18N::get("uiCheckInt") + " " + rFilename; string sTranslate = CI18N::get("uiCheckInt") + " " + rFilename;
setState(true, sTranslate); setState(true, sTranslate);
CHashKey hkLocalSHA1 = getSHA1(sFilePath); CHashKey hkLocalSHA1 = getSHA1(sFilePath);
for (j = 0; j < rFile.versionCount(); ++j) for (j = 0; j < rFile.versionCount(); ++j)
@ -1806,7 +1806,7 @@ void CPatchManager::getPatchFromDesc(SFileToPatch &ftpOut, const CBNPFile &fIn,
// No version available found // No version available found
if (nVersionFound == 0xFFFFFFFF) if (nVersionFound == 0xFFFFFFFF)
{ {
ucstring sTranslate = CI18N::get("uiNoVersionFound"); string sTranslate = CI18N::get("uiNoVersionFound");
setState(true, sTranslate); setState(true, sTranslate);
// Get all patches from beginning (first patch is reference file) // Get all patches from beginning (first patch is reference file)
ftpOut.FileName = rFilename; ftpOut.FileName = rFilename;
@ -1827,7 +1827,7 @@ void CPatchManager::getPatchFromDesc(SFileToPatch &ftpOut, const CBNPFile &fIn,
} }
else // A version of the file has been found else // A version of the file has been found
{ {
ucstring sTranslate = CI18N::get("uiVersionFound") + " " + toString(nVersionFound); string sTranslate = CI18N::get("uiVersionFound") + " " + toString(nVersionFound);
setState(true, sTranslate); setState(true, sTranslate);
// Get All patches from this version ! // Get All patches from this version !
ftpOut.FileName = rFilename; ftpOut.FileName = rFilename;
@ -1883,7 +1883,7 @@ bool CPatchManager::bnpUnpack(const string &srcBigfile, const string &dstPath, v
else else
DestPath = CPath::standardizePath (dstPath); DestPath = CPath::standardizePath (dstPath);
ucstring s = CI18N::get("uiUnpack") + " " + NLMISC::CFile::getFilename(SourceName); string s = CI18N::get("uiUnpack") + " " + NLMISC::CFile::getFilename(SourceName);
setState(true,s); setState(true,s);
// Read Header of the BNP File // Read Header of the BNP File
@ -1892,7 +1892,7 @@ bool CPatchManager::bnpUnpack(const string &srcBigfile, const string &dstPath, v
if (!bnpFile.readHeader()) if (!bnpFile.readHeader())
{ {
ucstring s = CI18N::get("uiUnpackErrHead") + " " + CFile::getFilename(SourceName); string s = CI18N::get("uiUnpackErrHead") + " " + CFile::getFilename(SourceName);
setState(true,s); setState(true,s);
return false; return false;
} }
@ -1938,8 +1938,8 @@ int CPatchManager::validateProgress(void *foo, double t, double d, double /* ult
CPatchManager *pPM = CPatchManager::getInstance(); CPatchManager *pPM = CPatchManager::getInstance();
double pour1 = t!=0.0?d*100.0/t:0.0; double pour1 = t!=0.0?d*100.0/t:0.0;
ucstring sTranslate = CI18N::get("uiLoginGetFile") + ucstring::makeFromUtf8(toString(" %s : %s / %s (%.02f %%)", NLMISC::CFile::getFilename(pPM->CurrentFile).c_str(), string sTranslate = CI18N::get("uiLoginGetFile") + toString(" %s : %s / %s (%.02f %%)", NLMISC::CFile::getFilename(pPM->CurrentFile).c_str(),
NLMISC::bytesToHumanReadableUnits((uint64)d, units).c_str(), NLMISC::bytesToHumanReadableUnits((uint64)t, units).c_str(), pour1)); NLMISC::bytesToHumanReadableUnits((uint64)d, units).c_str(), NLMISC::bytesToHumanReadableUnits((uint64)t, units).c_str(), pour1);
pPM->setState(false, sTranslate); pPM->setState(false, sTranslate);
if (foo) if (foo)
{ {
@ -1953,7 +1953,7 @@ void CPatchManager::MyPatchingCB::progress(float f)
{ {
CPatchManager *pPM = CPatchManager::getInstance(); CPatchManager *pPM = CPatchManager::getInstance();
double p = 100.0*f; double p = 100.0*f;
ucstring sTranslate = CI18N::get("uiApplyingDelta") + ucstring::makeFromUtf8(toString(" %s (%.02f %%)", CFile::getFilename(patchFilename).c_str(), p)); string sTranslate = CI18N::get("uiApplyingDelta") + toString(" %s (%.02f %%)", CFile::getFilename(patchFilename).c_str(), p);
pPM->setState(false, sTranslate); pPM->setState(false, sTranslate);
} }
@ -2079,7 +2079,7 @@ uint CPatchManager::applyScanDataResult()
} }
// *************************************************************************** // ***************************************************************************
bool CPatchManager::getDataScanLog(ucstring &text) bool CPatchManager::getDataScanLog(string &text)
{ {
text.clear(); text.clear();
bool changed= false; bool changed= false;
@ -2092,7 +2092,7 @@ bool CPatchManager::getDataScanLog(ucstring &text)
{ {
for(uint i=0;i<val.FilesWithScanDataError.size();i++) for(uint i=0;i<val.FilesWithScanDataError.size();i++)
{ {
ucstring str; string str;
getCorruptedFileInfo(val.FilesWithScanDataError[i], str); getCorruptedFileInfo(val.FilesWithScanDataError[i], str);
text+= str + "\n"; text+= str + "\n";
} }
@ -2127,9 +2127,9 @@ void CPatchManager::clearDataScanLog()
} }
// *************************************************************************** // ***************************************************************************
void CPatchManager::getCorruptedFileInfo(const SFileToPatch &ftp, ucstring &sTranslate) void CPatchManager::getCorruptedFileInfo(const SFileToPatch &ftp, string &sTranslate)
{ {
sTranslate = CI18N::get("uiCorruptedFile") + " " + ucstring::makeFromUtf8(ftp.FileName) + " (" + sTranslate = CI18N::get("uiCorruptedFile") + " " + ftp.FileName + " (" +
toString("%.1f ", (float)ftp.FinalFileSize/1000000.f) + CI18N::get("uiMb") + ")"; toString("%.1f ", (float)ftp.FinalFileSize/1000000.f) + CI18N::get("uiMb") + ")";
} }
@ -2167,7 +2167,7 @@ void CCheckThread::run ()
// Check if the client version is the same as the server version // Check if the client version is the same as the server version
string sClientVersion = pPM->getClientVersion(); string sClientVersion = pPM->getClientVersion();
string sServerVersion = pPM->getServerVersion(); string sServerVersion = pPM->getServerVersion();
ucstring sTranslate = CI18N::get("uiClientVersion") + " (" + sClientVersion + ") "; string sTranslate = CI18N::get("uiClientVersion") + " (" + sClientVersion + ") ";
sTranslate += CI18N::get("uiServerVersion") + " (" + sServerVersion + ")"; sTranslate += CI18N::get("uiServerVersion") + " (" + sServerVersion + ")";
pPM->setState(true, sTranslate); pPM->setState(true, sTranslate);
@ -2216,7 +2216,7 @@ void CCheckThread::run ()
for (i = 0; i < rDescFiles.fileCount(); ++i) for (i = 0; i < rDescFiles.fileCount(); ++i)
{ {
CPatchManager::SFileToPatch ftp; CPatchManager::SFileToPatch ftp;
sTranslate = CI18N::get("uiCheckingFile") + " " + ucstring::makeFromUtf8(rDescFiles.getFile(i).getFileName()); sTranslate = CI18N::get("uiCheckingFile") + " " + rDescFiles.getFile(i).getFileName();
pPM->setState(true, sTranslate); pPM->setState(true, sTranslate);
// get list of patch to apply to this file. don't to a full checksum test if possible // get list of patch to apply to this file. don't to a full checksum test if possible
nlwarning(rDescFiles.getFile(i).getFileName().c_str()); nlwarning(rDescFiles.getFile(i).getFileName().c_str());
@ -2408,7 +2408,7 @@ void CCheckThread::run ()
catch (const Exception &e) catch (const Exception &e)
{ {
nlwarning("EXCEPTION CATCH: CCheckThread::run() failed"); nlwarning("EXCEPTION CATCH: CCheckThread::run() failed");
ucstring sTranslate = CI18N::get("uiCheckEndWithErr") + " " + e.what(); string sTranslate = CI18N::get("uiCheckEndWithErr") + " " + e.what();
pPM->setState(true, CI18N::get("uiCheckEndWithErr")); pPM->setState(true, CI18N::get("uiCheckEndWithErr"));
pPM->setErrorMessage(sTranslate); pPM->setErrorMessage(sTranslate);
CheckOk = false; CheckOk = false;
@ -2478,7 +2478,7 @@ void CPatchThread::run()
CurrentFilePatched = 0.f; CurrentFilePatched = 0.f;
ucstring sTranslate; string sTranslate;
try try
{ {
// First do all ref files // First do all ref files
@ -2536,7 +2536,7 @@ void CPatchThread::run()
catch(const Exception &e) catch(const Exception &e)
{ {
nlwarning("EXCEPTION CATCH: CPatchThread::run() failed"); nlwarning("EXCEPTION CATCH: CPatchThread::run() failed");
pPM->setState(true, ucstring(e.what())); pPM->setState(true, string(e.what()));
sTranslate = CI18N::get("uiPatchEndWithErr"); sTranslate = CI18N::get("uiPatchEndWithErr");
bErr = true; bErr = true;
} }
@ -2649,7 +2649,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
rFTP.LocalFileExists = false; rFTP.LocalFileExists = false;
} }
ucstring sTranslate; string sTranslate;
sTranslate = CI18N::get("uiProcessing") + " " + rFTP.FileName; sTranslate = CI18N::get("uiProcessing") + " " + rFTP.FileName;
pPM->setState(true, sTranslate); pPM->setState(true, sTranslate);
@ -2984,7 +2984,7 @@ void CScanDataThread::run ()
uint32 i; uint32 i;
// Check if the client version is the same as the server version // Check if the client version is the same as the server version
string sClientVersion = pPM->getClientVersion(); string sClientVersion = pPM->getClientVersion();
ucstring sTranslate = CI18N::get("uiClientVersion") + " (" + sClientVersion + ") "; string sTranslate = CI18N::get("uiClientVersion") + " (" + sClientVersion + ") ";
pPM->setState(true, sTranslate); pPM->setState(true, sTranslate);
// For all bnp in the description file get all patches to apply // For all bnp in the description file get all patches to apply
@ -3023,7 +3023,7 @@ void CScanDataThread::run ()
catch (const Exception &e) catch (const Exception &e)
{ {
nlwarning("EXCEPTION CATCH: CScanDataThread::run() failed"); nlwarning("EXCEPTION CATCH: CScanDataThread::run() failed");
ucstring sTranslate = CI18N::get("uiCheckEndWithErr") + " " + e.what(); string sTranslate = CI18N::get("uiCheckEndWithErr") + " " + e.what();
pPM->setState(true, sTranslate); pPM->setState(true, sTranslate);
CheckOk = false; CheckOk = false;
Ended = true; Ended = true;
@ -3157,7 +3157,7 @@ bool CPatchManager::download(const std::string& patchFullname, const std::string
catch ( const std::exception& e) catch ( const std::exception& e)
{ {
nlwarning("%s", e.what()); nlwarning("%s", e.what());
pPM->setState(true, ucstring(e.what()) ); pPM->setState(true, string(e.what()) );
return false; return false;
} }
@ -3408,7 +3408,7 @@ void CDownloadThread::run()
catch ( const std::exception& e) catch ( const std::exception& e)
{ {
nlwarning("%s", e.what()); nlwarning("%s", e.what());
pPM->setState(true, ucstring(e.what()) ); pPM->setState(true, string(e.what()) );
pPM->fatalError("uiCanNotDownload", patchName.c_str(), ""); pPM->fatalError("uiCanNotDownload", patchName.c_str(), "");
} }
catch (...) catch (...)
@ -3525,7 +3525,7 @@ void CInstallThread::run()
catch ( const std::exception& e) catch ( const std::exception& e)
{ {
nlwarning("%s", e.what()); nlwarning("%s", e.what());
pPM->setState(true, ucstring(e.what()) ); pPM->setState(true, string(e.what()) );
pPM->fatalError("uiCanNotInstall", patchName.c_str(), ""); pPM->fatalError("uiCanNotInstall", patchName.c_str(), "");
return; return;

20
ryzom/client/src/login_patch.h
Unescape Escape View File

@ -56,7 +56,7 @@ public:
class IPatchManagerStateListener class IPatchManagerStateListener
{ {
public: public:
virtual void setState (bool /* bOutputToLog */, const ucstring &/* ucsNewState */){} virtual void setState (bool /* bOutputToLog */, const std::string &/* ucsNewState */){}
}; };
// Get Info of file to install // Get Info of file to install
@ -154,12 +154,12 @@ public:
// Get the string information about what the threads are doing // Get the string information about what the threads are doing
// Return true if the state has changed // Return true if the state has changed
bool getThreadState (ucstring &state, std::vector<ucstring> &stateLog); bool getThreadState (std::string &state, std::vector<std::string> &stateLog);
/** Get the error message (filled after a patch of check) /** Get the error message (filled after a patch of check)
* May be empty if the cause of error is unknown or unhandled * May be empty if the cause of error is unknown or unhandled
*/ */
const ucstring &getLastErrorMessage() { return _ErrorMessage; } const std::string &getLastErrorMessage() { return _ErrorMessage; }
// --------------------- // ---------------------
// First Part : Checking // First Part : Checking
@ -235,7 +235,7 @@ public:
uint applyScanDataResult(); uint applyScanDataResult();
// get the current info Log for data Scan (true if some change from last get, else text is not filled) // get the current info Log for data Scan (true if some change from last get, else text is not filled)
bool getDataScanLog(ucstring &text); bool getDataScanLog(std::string &text);
CProductDescriptionForClient &getDescFile() { return DescFile; } CProductDescriptionForClient &getDescFile() { return DescFile; }
@ -284,7 +284,7 @@ private:
friend class CPatchThreadDownloadProgress; friend class CPatchThreadDownloadProgress;
// Set the thread state (called by threads to let us know what they are doing) // Set the thread state (called by threads to let us know what they are doing)
void setState (bool bOutputToLog, const ucstring &ucsState); void setState (bool bOutputToLog, const std::string &ucsState);
void touchState(); void touchState();
/// Get the version of the server given during init() /// Get the version of the server given during init()
@ -330,7 +330,7 @@ private:
// add a file to the scan data log // add a file to the scan data log
void addDataScanLogCorruptedFile(const SFileToPatch &ftp); void addDataScanLogCorruptedFile(const SFileToPatch &ftp);
void clearDataScanLog(); void clearDataScanLog();
static void getCorruptedFileInfo(const SFileToPatch &ftp, ucstring &sTranslate); static void getCorruptedFileInfo(const SFileToPatch &ftp, std::string &sTranslate);
static bool downloadAndUnpack(const std::string& patchPath, const std::string& sourceFilename, const std::string& extractPath, const std::string& tmpDirectory, uint32 timestamp); static bool downloadAndUnpack(const std::string& patchPath, const std::string& sourceFilename, const std::string& extractPath, const std::string& tmpDirectory, uint32 timestamp);
// Forward message to Installation Software // Forward message to Installation Software
@ -404,7 +404,7 @@ private:
std::vector<SFileToPatch> FilesToPatch; std::vector<SFileToPatch> FilesToPatch;
std::vector<std::string> OptionalCat; std::vector<std::string> OptionalCat;
ucstring _ErrorMessage; std::string _ErrorMessage;
// Threads // Threads
CPatchThread *PatchThread; CPatchThread *PatchThread;
@ -417,8 +417,8 @@ private:
// State // State
struct CState struct CState
{ {
ucstring State; std::string State;
std::vector<ucstring> StateLog; std::vector<std::string> StateLog;
bool StateChanged; bool StateChanged;
CState() CState()
{ {
@ -470,7 +470,7 @@ private:
bool _StartRyzomAtEnd; bool _StartRyzomAtEnd;
public: public:
// used by threads to signal error at the end of execution // used by threads to signal error at the end of execution
void setErrorMessage(const ucstring &message); void setErrorMessage(const std::string &message);
}; };
/** /**

4
ryzom/tools/client/client_patcher/main.cpp
Unescape Escape View File

@ -252,8 +252,8 @@ int main(int argc, char *argv[])
pPM->init(patchURLs, PatchUrl, ""); pPM->init(patchURLs, PatchUrl, "");
pPM->startCheckThread(true /* include background patchs */); pPM->startCheckThread(true /* include background patchs */);
ucstring state; string state;
vector<ucstring> log; vector<string> log;
bool res = false; bool res = false;
bool finished = false; bool finished = false;

Write Preview
Loading…
Cancel
Save