mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 02:41:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uncool/dvbsi++'

Browse Source 
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp
This commit is contained in:
Stefan Seyfried
2012-11-23 18:45:22 +01:00
parent e0282a0537 3d72e26214
commit e5e7d52fa1
40 changed files with 435 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/system/helpers.cpp
View File

@@ -37,6 +37,7 @@
#include <zapit/debug.h>
#include <system/helpers.h>
#include <gui/ext_update.h>
bool file_exists(const char *filename)
{
@@ -339,7 +340,7 @@ bool CFileHelpers::copyFile(const char *Src, const char *Dst, mode_t mode)
return true;
}
bool CFileHelpers::copyDir(const char *Src, const char *Dst)
bool CFileHelpers::copyDir(const char *Src, const char *Dst, bool backupMode)
{
DIR *Directory;
struct dirent *CurrentFile;
@@ -402,7 +403,10 @@ bool CFileHelpers::copyDir(const char *Src, const char *Dst)
}
// is file
else if (S_ISREG(FileInfo.st_mode)) {
copyFile(srcPath, dstPath, FileInfo.st_mode & 0x0FFF);
std::string save = "";
if (backupMode && (CExtUpdate::getInstance()->isBlacklistEntry(srcPath)))
save = ".save";
copyFile(srcPath, (dstPath + save).c_str(), FileInfo.st_mode & 0x0FFF);
}
}
}

2
src/system/helpers.h
View File

@@ -50,7 +50,7 @@ class CFileHelpers
bool doCopyFlag;
bool copyFile(const char *Src, const char *Dst, mode_t mode);
bool copyDir(const char *Src, const char *Dst);
bool copyDir(const char *Src, const char *Dst, bool backupMode=false);
bool createDir(const char *Dir, mode_t mode);
bool removeDir(const char *Dir);

2
src/system/locals.h
View File

@@ -513,6 +513,7 @@ typedef enum
LOCALE_FLASHUPDATE_SQUASHFS_NOVERSION,
LOCALE_FLASHUPDATE_TITLEREADFLASH,
LOCALE_FLASHUPDATE_TITLEWRITEFLASH,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_DEL_SKIPPED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_PROCESSED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SKIPPED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SUCCESSFULLY,
@@ -1062,6 +1063,7 @@ typedef enum
LOCALE_MENU_HINT_SLEEPTIMER,
LOCALE_MENU_HINT_SOFT_RESTART,
LOCALE_MENU_HINT_SOFTUPDATE_CHECK,
LOCALE_MENU_HINT_SOFTUPDATE_CHECK_LOCAL,
LOCALE_MENU_HINT_SOFTUPDATE_EXPERT,
LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_READ,
LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_WRITE,

2
src/system/locals_intern.h
View File

@@ -513,6 +513,7 @@ const char * locale_real_names[] =
"flashupdate.squashfs.noversion",
"flashupdate.titlereadflash",
"flashupdate.titlewriteflash",
"flashupdate.update_with_settings_del_skipped",
"flashupdate.update_with_settings_processed",
"flashupdate.update_with_settings_skipped",
"flashupdate.update_with_settings_successfully",
@@ -1062,6 +1063,7 @@ const char * locale_real_names[] =
"menu.hint_sleeptimer",
"menu.hint_soft_restart",
"menu.hint_softupdate_check",
"menu.hint_softupdate_check_local",
"menu.hint_softupdate_expert",
"menu.hint_softupdate_expert_read",
"menu.hint_softupdate_expert_write",

6
src/system/setting_helpers.cpp
View File

@@ -58,7 +58,7 @@
#include <gui/widget/stringinput.h>
#include <gui/infoclock.h>
#include <driver/volume.h>
#include <system/helpers.h>
// obsolete #include <gui/streaminfo.h>
#include <gui/widget/messagebox.h>
@@ -472,7 +472,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
return true;
if(delete_all) {
system("rm -f /var/tuxbox/config/zapit/*.conf");
my_system("/bin/sh", "-c", "rm -f /var/tuxbox/config/zapit/*.conf");
CServiceManager::getInstance()->SatelliteList().clear();
CZapit::getInstance()->LoadSettings();
CZapit::getInstance()->GetConfig(zapitCfg);
@@ -492,7 +492,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
CFrameBuffer::getInstance()->Clear();
}
if(delete_chan) {
system("rm -f /var/tuxbox/config/zapit/*.xml");
my_system("/bin/sh", "-c", "rm -f /var/tuxbox/config/zapit/*.xml");
g_Zapit->reinitChannels();
}
return ret;