mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Softupdate: Generate file name from mtd name

Browse Source 
- Time stamp added to file name

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2197 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
micha-bbg
2012-04-08 14:05:18 +00:00
parent 227b7959cb
commit d65b6ebb80
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/update.cpp
View File

@@ -529,11 +529,13 @@ CFlashExpert::CFlashExpert()
void CFlashExpert::readmtd(int preadmtd) void CFlashExpert::readmtd(int preadmtd)
{ {
char tmp[10]; char tmpStr[256];
sprintf(tmp, "%d", preadmtd); struct timeval tv;
std::string filename = "/tmp/mtd"; gettimeofday(&tv, NULL);
filename += tmp; strftime(tmpStr, sizeof(tmpStr), "_%Y%m%d_%H%M.img", localtime(&tv.tv_sec));
filename += ".img"; // US-ASCII (subset of UTF-8 and ISO8859-1) CMTDInfo* mtdInfo = CMTDInfo::getInstance();
std::string filename = "/tmp/" + mtdInfo->getMTDName(preadmtd);
filename += tmpStr;
if (preadmtd == -1) { if (preadmtd == -1) {
filename = "/tmp/flashimage.img"; // US-ASCII (subset of UTF-8 and ISO8859-1) filename = "/tmp/flashimage.img"; // US-ASCII (subset of UTF-8 and ISO8859-1)
@@ -542,10 +544,10 @@ void CFlashExpert::readmtd(int preadmtd)
setTitle(LOCALE_FLASHUPDATE_TITLEREADFLASH); setTitle(LOCALE_FLASHUPDATE_TITLEREADFLASH);
paint(); paint();
showGlobalStatus(0); showGlobalStatus(0);
showStatusMessageUTF((std::string(g_Locale->getText(LOCALE_FLASHUPDATE_ACTIONREADFLASH)) + " (" + CMTDInfo::getInstance()->getMTDName(preadmtd) + ')')); // UTF-8 showStatusMessageUTF((std::string(g_Locale->getText(LOCALE_FLASHUPDATE_ACTIONREADFLASH)) + " (" + mtdInfo->getMTDName(preadmtd) + ')')); // UTF-8
CFlashTool ft; CFlashTool ft;
ft.setStatusViewer( this ); ft.setStatusViewer( this );
ft.setMTDDevice(CMTDInfo::getInstance()->getMTDFileName(preadmtd)); ft.setMTDDevice(mtdInfo->getMTDFileName(preadmtd));
if(!ft.readFromMTD(filename, 100)) { if(!ft.readFromMTD(filename, 100)) {
showStatusMessageUTF(ft.getErrorMessage()); // UTF-8 showStatusMessageUTF(ft.getErrorMessage()); // UTF-8