From bc069b0a8458ec7feb6e368ce0b4b9df18e9eed3 Mon Sep 17 00:00:00 2001
From: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: Thu, 8 Aug 2013 14:02:27 +0200
Subject: [PATCH] Softupdate: Use user-defined file names

for apply settings and saving partitions from the flash.
---
 data/locale/deutsch.locale  |  7 +++++++
 data/locale/english.locale  |  7 +++++++
 src/gui/update.cpp          | 18 +++++++++++-------
 src/gui/update_ext.cpp      | 24 +++++++++++++++++++-----
 src/gui/update_ext.h        |  5 +++++
 src/gui/update_settings.cpp | 34 ++++++++++++++++++++++++++++++----
 src/neutrino.cpp            |  5 +++++
 src/system/locals.h         |  7 +++++++
 src/system/locals_intern.h  |  7 +++++++
 src/system/settings.h       |  2 ++
 10 files changed, 100 insertions(+), 16 deletions(-)

diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index 00b6c9ca2..7715bcfc5 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -489,6 +489,13 @@ flashupdate.menu_apply_settings Settingsübernahme erlauben
 flashupdate.msgbox Es wurde folgendes neues File gefunden:\nDatum: %s, %s\nBasisImage: %s\nTyp: %s\n\nWollen Sie diese Version jetzt herunterladen\nund installieren?
 flashupdate.msgbox_manual Es wurde ein neues Image gefunden:\nDatum: %s, %s\nBasisImage: %s\nImageTyp: %s\n\nWollen Sie diese Version jetzt installieren?
 flashupdate.mtdselector Partitions-Auswahl
+flashupdate.namemode1 Dateiname Settingsfile
+flashupdate.namemode1_default <Org.Name>+settings.img
+flashupdate.namemode1_hostname_time <Hostname>+<Zeit>+settings.img
+flashupdate.namemode1_orgname_time <Org.Name>+<Zeit>+settings.img
+flashupdate.namemode2 Dateiname Sicherung
+flashupdate.namemode2_default <Partition>+<Zeit>.img
+flashupdate.namemode2_hostname_time <Partition>+<Zeit>+<Hostname>.img
 flashupdate.new_found Updates verfügbar!
 flashupdate.new_notfound Keine Updates verfügbar!
 flashupdate.programmingflash programmiere Flash
diff --git a/data/locale/english.locale b/data/locale/english.locale
index e709825c8..d96bf036b 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -489,6 +489,13 @@ flashupdate.menu_apply_settings Allow apply settings
 flashupdate.msgbox Found the following new file:\nDate: %s, %s\nBaseImage: %s\nType: %s\n\nDo you want to download and install this version now?
 flashupdate.msgbox_manual Found the following new image:\nDate: %s, %s\nBaseImage: %s\nImageType: %s\n\nDo you want to install this version now?
 flashupdate.mtdselector Partition-Selector
+flashupdate.namemode1 Filename settingsfile
+flashupdate.namemode1_default <org.name>+settings.img
+flashupdate.namemode1_hostname_time <hostname>+<time>+settings.img
+flashupdate.namemode1_orgname_time <org.name>+<time>+settings.img
+flashupdate.namemode2 Filename backup
+flashupdate.namemode2_default <partition>+<time>.img
+flashupdate.namemode2_hostname_time <partition>+<time>+<hostname>.img
 flashupdate.new_found New image found !
 flashupdate.new_notfound No new images found
 flashupdate.programmingflash programming flash
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index ec2ad885f..e85a9efb7 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -55,6 +55,8 @@
 #include <system/httptool.h>
 #include <system/helpers.h>
 
+#include <lib/libnet/libnet.h>
+
 #define SQUASHFS
 
 #include <curl/curl.h>
@@ -550,13 +552,15 @@ CFlashExpert* CFlashExpert::getInstance()
 
 void CFlashExpert::readmtd(int preadmtd)
 {
-	char tmpStr[256];
-	struct timeval tv;
-	gettimeofday(&tv, NULL);	
-	strftime(tmpStr, sizeof(tmpStr), "_%Y%m%d_%H%M.img", localtime(&tv.tv_sec));
-	CMTDInfo* mtdInfo = CMTDInfo::getInstance();
-	std::string filename = (std::string)g_settings.update_dir + "/" + mtdInfo->getMTDName(preadmtd);
-	filename += tmpStr;
+	std::string filename;
+	CMTDInfo* mtdInfo    = CMTDInfo::getInstance();
+	std::string hostName = netGetHostname();
+	std::string timeStr  = getNowTimeStr("_%Y%m%d_%H%M");
+
+	if (g_settings.softupdate_name_mode_backup == CExtUpdate::SOFTUPDATE_NAME_HOSTNAME_TIME)
+		filename = (std::string)g_settings.update_dir + "/" + mtdInfo->getMTDName(preadmtd) + timeStr + "_" + hostName + ".img";
+	else
+		filename = (std::string)g_settings.update_dir + "/" + mtdInfo->getMTDName(preadmtd) + timeStr + ".img";
 
 	if (preadmtd == -1) {
 		filename = (std::string)g_settings.update_dir + "/flashimage.img"; // US-ASCII (subset of UTF-8 and ISO8859-1)
diff --git a/src/gui/update_ext.cpp b/src/gui/update_ext.cpp
index ac8eade26..a629c9664 100644
--- a/src/gui/update_ext.cpp
+++ b/src/gui/update_ext.cpp
@@ -41,6 +41,7 @@
 #include <gui/widget/messagebox.h>
 #include <gui/widget/hintbox.h>
 #include <system/flashtool.h>
+#include <lib/libnet/libnet.h>
 
 #include <stdio.h>
 #include <unistd.h>
@@ -138,7 +139,6 @@ bool CExtUpdate::ErrorReset(bool modus, const std::string & msg1, const std::str
 
 bool CExtUpdate::applySettings(const std::string & filename, int mode)
 {
-#define ORGFILE_EXT ".org"
 	if(!FileHelpers)
 		FileHelpers = new CFileHelpers();
 
@@ -149,8 +149,23 @@ bool CExtUpdate::applySettings(const std::string & filename, int mode)
 
 	DBG_TIMER_START()
 
-	// make backup file
-	FileHelpers->copyFile(imgFilename.c_str(), (imgFilename + ORGFILE_EXT).c_str(), 0644);
+	std::string oldFilename = imgFilename;
+	std::string hostName    = netGetHostname();
+	std::string orgPath     = getPathName(imgFilename);
+	std::string orgName     = getBaseName(imgFilename);
+	orgName                 = getFileName(orgName);
+	std::string orgExt      = "." + getFileExt(imgFilename);
+	std::string timeStr     = getNowTimeStr("_%Y%m%d_%H%M");
+	std::string settingsStr = "+settings";
+
+	if (g_settings.softupdate_name_mode_apply == CExtUpdate::SOFTUPDATE_NAME_HOSTNAME_TIME)
+		imgFilename = orgPath + "/" + hostName + timeStr + settingsStr + orgExt;
+	else if (g_settings.softupdate_name_mode_apply == CExtUpdate::SOFTUPDATE_NAME_ORGNAME_TIME)
+		imgFilename = orgPath + "/" + orgName + timeStr  + settingsStr + orgExt;
+	else
+		imgFilename = orgPath + "/" + orgName  + settingsStr + orgExt;
+
+	FileHelpers->copyFile(oldFilename.c_str(), imgFilename.c_str(), 0644);
 
 	bool ret = applySettings();
 	DBG_TIMER_STOP("Image editing")
@@ -158,9 +173,8 @@ bool CExtUpdate::applySettings(const std::string & filename, int mode)
 		if ((mtdRamError != "") && (!flashErrorFlag))
 			DisplayErrorMessage(mtdRamError.c_str());
 
-		// error, restore original file
+		// error, delete image file
 		unlink(imgFilename.c_str());
-		rename((imgFilename + ORGFILE_EXT).c_str(), imgFilename.c_str());
 	}
 	else {
 		if (mode == MODE_EXPERT) {
diff --git a/src/gui/update_ext.h b/src/gui/update_ext.h
index c53b3e247..d42f3d9a3 100644
--- a/src/gui/update_ext.h
+++ b/src/gui/update_ext.h
@@ -81,6 +81,11 @@ class CExtUpdate
 			MODE_EXPERT	= 0,
 			MODE_SOFTUPDATE	= 1
 		};
+		enum {
+			SOFTUPDATE_NAME_DEFAULT,
+			SOFTUPDATE_NAME_HOSTNAME_TIME,
+			SOFTUPDATE_NAME_ORGNAME_TIME
+		};
 		CExtUpdate();
 		~CExtUpdate();
 		static CExtUpdate* getInstance();
diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp
index 8e59b5a62..c2ae697f1 100644
--- a/src/gui/update_settings.cpp
+++ b/src/gui/update_settings.cpp
@@ -37,8 +37,9 @@
 #include <neutrino.h>
 #include <mymenu.h>
 #include <neutrino_menue.h>
-#include "update_settings.h"
-#include "filebrowser.h"
+#include <gui/filebrowser.h>
+#include <gui/update_ext.h>
+#include <gui/update_settings.h>
 #include <gui/widget/icons.h>
 #include <driver/screen_max.h>
 #include <system/debug.h>
@@ -67,6 +68,21 @@ const CMenuOptionChooser::keyval FLASHUPDATE_UPDATEMODE_OPTIONS[FLASHUPDATE_UPDA
 	{ 1, LOCALE_FLASHUPDATE_UPDATEMODE_INTERNET }
 };
 
+#define SOFTUPDATE_NAME_MODE1_OPTION_COUNT 3
+const CMenuOptionChooser::keyval SOFTUPDATE_NAME_MODE1_OPTIONS[SOFTUPDATE_NAME_MODE1_OPTION_COUNT] =
+{
+	{ CExtUpdate::SOFTUPDATE_NAME_DEFAULT,       LOCALE_FLASHUPDATE_NAMEMODE1_DEFAULT       },
+	{ CExtUpdate::SOFTUPDATE_NAME_HOSTNAME_TIME, LOCALE_FLASHUPDATE_NAMEMODE1_HOSTNAME_TIME },
+	{ CExtUpdate::SOFTUPDATE_NAME_ORGNAME_TIME,  LOCALE_FLASHUPDATE_NAMEMODE1_ORGNAME_TIME  }
+};
+
+#define SOFTUPDATE_NAME_MODE2_OPTION_COUNT 2
+const CMenuOptionChooser::keyval SOFTUPDATE_NAME_MODE2_OPTIONS[SOFTUPDATE_NAME_MODE2_OPTION_COUNT] =
+{
+	{ CExtUpdate::SOFTUPDATE_NAME_DEFAULT,       LOCALE_FLASHUPDATE_NAMEMODE2_DEFAULT       },
+	{ CExtUpdate::SOFTUPDATE_NAME_HOSTNAME_TIME, LOCALE_FLASHUPDATE_NAMEMODE2_HOSTNAME_TIME }
+};
+
 int CUpdateSettings::exec(CMenuTarget* parent, const std::string &actionKey)
 {
 	dprintf(DEBUG_DEBUG, "init software-update settings\n");
@@ -113,11 +129,18 @@ int CUpdateSettings::initMenu()
 //	fw_url->setHint("", LOCALE_MENU_HINT_XXX);
 	CMenuForwarder * fw_update_dir 	= new CMenuForwarder(LOCALE_EXTRA_UPDATE_DIR, true, g_settings.update_dir , this, "update_dir", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
 //	fw_update_dir->setHint("", LOCALE_MENU_HINT_XXX);
+	CMenuOptionChooser *name_backup = new CMenuOptionChooser(LOCALE_FLASHUPDATE_NAMEMODE2, &g_settings.softupdate_name_mode_backup, SOFTUPDATE_NAME_MODE2_OPTIONS, SOFTUPDATE_NAME_MODE2_OPTION_COUNT, true);
+//	name_backup->setHint("", LOCALE_MENU_HINT_XXX);
 
 #ifndef BOXMODEL_APOLLO
 	CMenuOptionChooser *apply_settings = new CMenuOptionChooser(LOCALE_FLASHUPDATE_MENU_APPLY_SETTINGS, &g_settings.apply_settings, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, OnOffNotifier);
-#endif
 //	apply_settings->setHint("", LOCALE_MENU_HINT_XXX);
+
+	CMenuOptionChooser *name_apply = new CMenuOptionChooser(LOCALE_FLASHUPDATE_NAMEMODE1, &g_settings.softupdate_name_mode_apply, SOFTUPDATE_NAME_MODE1_OPTIONS, SOFTUPDATE_NAME_MODE1_OPTION_COUNT, g_settings.apply_settings);
+//	name_apply->setHint("", LOCALE_MENU_HINT_XXX);
+	OnOffNotifier->addItem(name_apply);
+#endif
+
 #if 0
 	CMenuOptionChooser *apply_kernel = new CMenuOptionChooser(LOCALE_FLASHUPDATE_MENU_APPLY_KERNEL, &g_settings.apply_kernel, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.apply_settings);
 //	apply_kernel->setHint("", LOCALE_MENU_HINT_XXX);
@@ -126,10 +149,13 @@ int CUpdateSettings::initMenu()
 
 	w_upsettings.addItem(fw_update_dir);
 	w_upsettings.addItem(fw_url);
-	w_upsettings.addItem(GenericMenuSeparatorLine);
+	w_upsettings.addItem(name_backup);
 #ifndef BOXMODEL_APOLLO
+	w_upsettings.addItem(GenericMenuSeparatorLine);
 	w_upsettings.addItem(apply_settings);
+	w_upsettings.addItem(name_apply);
 #endif
+
 #if 0
 	w_upsettings.addItem(apply_kernel);
 #endif
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 3365e2358..cc0c652d6 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -82,6 +82,7 @@
 #include "gui/scan_setup.h"
 #include "gui/sleeptimer.h"
 #include "gui/start_wizard.h"
+#include "gui/update_ext.h"
 #include "gui/videosettings.h"
 
 #include "gui/widget/hintbox.h"
@@ -657,6 +658,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.softupdate_mode = configfile.getInt32( "softupdate_mode", 1 );
 	g_settings.apply_kernel = configfile.getBool("apply_kernel" , false);
 	g_settings.apply_settings = configfile.getBool("apply_settings" , false);
+	g_settings.softupdate_name_mode_apply = configfile.getInt32( "softupdate_name_mode_apply", CExtUpdate::SOFTUPDATE_NAME_DEFAULT);
+	g_settings.softupdate_name_mode_backup = configfile.getInt32( "softupdate_name_mode_backup", CExtUpdate::SOFTUPDATE_NAME_DEFAULT);
 
 	strcpy(g_settings.softupdate_url_file, configfile.getString("softupdate_url_file", "/var/etc/update.urls").c_str());
 	strcpy(g_settings.softupdate_proxyserver, configfile.getString("softupdate_proxyserver", "" ).c_str());
@@ -1095,6 +1098,8 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setBool("apply_kernel", g_settings.apply_kernel);
 	configfile.setBool("apply_settings", g_settings.apply_settings);
 	configfile.setString("softupdate_url_file"      , g_settings.softupdate_url_file      );
+	configfile.setInt32 ("softupdate_name_mode_apply", g_settings.softupdate_name_mode_apply);
+	configfile.setInt32 ("softupdate_name_mode_backup", g_settings.softupdate_name_mode_backup);
 
 	configfile.setString("softupdate_proxyserver"   , g_settings.softupdate_proxyserver   );
 	configfile.setString("softupdate_proxyusername" , g_settings.softupdate_proxyusername );
diff --git a/src/system/locals.h b/src/system/locals.h
index 05f532da9..d4550706c 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -516,6 +516,13 @@ typedef enum
 	LOCALE_FLASHUPDATE_MSGBOX,
 	LOCALE_FLASHUPDATE_MSGBOX_MANUAL,
 	LOCALE_FLASHUPDATE_MTDSELECTOR,
+	LOCALE_FLASHUPDATE_NAMEMODE1,
+	LOCALE_FLASHUPDATE_NAMEMODE1_DEFAULT,
+	LOCALE_FLASHUPDATE_NAMEMODE1_HOSTNAME_TIME,
+	LOCALE_FLASHUPDATE_NAMEMODE1_ORGNAME_TIME,
+	LOCALE_FLASHUPDATE_NAMEMODE2,
+	LOCALE_FLASHUPDATE_NAMEMODE2_DEFAULT,
+	LOCALE_FLASHUPDATE_NAMEMODE2_HOSTNAME_TIME,
 	LOCALE_FLASHUPDATE_NEW_FOUND,
 	LOCALE_FLASHUPDATE_NEW_NOTFOUND,
 	LOCALE_FLASHUPDATE_PROGRAMMINGFLASH,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 3507d612c..6782964b0 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -516,6 +516,13 @@ const char * locale_real_names[] =
 	"flashupdate.msgbox",
 	"flashupdate.msgbox_manual",
 	"flashupdate.mtdselector",
+	"flashupdate.namemode1",
+	"flashupdate.namemode1_default",
+	"flashupdate.namemode1_hostname_time",
+	"flashupdate.namemode1_orgname_time",
+	"flashupdate.namemode2",
+	"flashupdate.namemode2_default",
+	"flashupdate.namemode2_hostname_time",
 	"flashupdate.new_found",
 	"flashupdate.new_notfound",
 	"flashupdate.programmingflash",
diff --git a/src/system/settings.h b/src/system/settings.h
index 0da0bda86..cdd216df2 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -477,6 +477,8 @@ struct SNeutrinoSettings
 	char softupdate_proxyserver[31];
 	char softupdate_proxyusername[31];
 	char softupdate_proxypassword[31];
+	int softupdate_name_mode_apply;
+	int softupdate_name_mode_backup;
 	int apply_settings;
 	int apply_kernel;