mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/hdd_menu.cpp: ask to set recording path after mount (hotplug or format)

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 05558331f7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-30 (Fri, 30 May 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-05-30 14:57:17 +04:00
parent c32e21e10f
commit 3da726560d
2 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/gui/hdd_menu.cpp
View File

@@ -356,6 +356,30 @@ void CHDDMenuHandler::showHint(std::string &message)
delete hintBox; delete hintBox;
} }
void CHDDMenuHandler::setRecordPath(std::string &dev)
{
std::string newpath = std::string(MOUNT_BASE) + dev + "/movies";
if (g_settings.network_nfs_recordingdir == newpath) {
printf("CHDDMenuHandler::setRecordPath: recordingdir already set to %s\n", newpath.c_str());
return;
}
bool old_menu = in_menu;
in_menu = false;
int res = ShowMsg(LOCALE_RECORDINGMENU_DEFDIR, LOCALE_HDD_SET_RECDIR, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo);
if(res == CMessageBox::mbrYes) {
g_settings.network_nfs_recordingdir = newpath;
CRecordManager::getInstance()->SetDirectory(g_settings.network_nfs_recordingdir);
if(g_settings.timeshiftdir.empty())
{
std::string timeshiftDir = g_settings.network_nfs_recordingdir + "/.timeshift";
safe_mkdir(timeshiftDir.c_str());
printf("New timeshift dir: %s\n", timeshiftDir.c_str());
CRecordManager::getInstance()->SetTimeshiftDirectory(timeshiftDir);
}
}
in_menu = old_menu;
}
int CHDDMenuHandler::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data) int CHDDMenuHandler::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
{ {
if (msg == NeutrinoMessages::EVT_HOTPLUG) { if (msg == NeutrinoMessages::EVT_HOTPLUG) {
@@ -399,6 +423,8 @@ int CHDDMenuHandler::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t dat
g_Locale->getText(mounted ? LOCALE_HDD_MOUNT_OK : LOCALE_HDD_MOUNT_FAILED) g_Locale->getText(mounted ? LOCALE_HDD_MOUNT_OK : LOCALE_HDD_MOUNT_FAILED)
: g_Locale->getText(LOCALE_HDD_UMOUNTED)); : g_Locale->getText(LOCALE_HDD_UMOUNTED));
showHint(message); showHint(message);
if (added && tmp != "sr")
setRecordPath(dev);
} }
if (in_menu && !lock_refresh) { if (in_menu && !lock_refresh) {
show_menu = true; show_menu = true;
@@ -461,24 +487,13 @@ int CHDDMenuHandler::exec(CMenuTarget* parent, const std::string &actionkey)
} }
else if (actionkey[0] == 'f') { else if (actionkey[0] == 'f') {
int ret = formatDevice(dev); int ret = formatDevice(dev);
#if 0
std::string devname = "/dev/" + dev + getDefaultPart(dev); std::string devname = "/dev/" + dev + getDefaultPart(dev);
if (show_menu && is_mounted(devname.c_str())) { if (show_menu && is_mounted(devname.c_str())) {
bool old_menu = in_menu; devname = dev + getDefaultPart(dev);
in_menu = false; setRecordPath(devname);
int res = ShowMsg(LOCALE_RECORDINGMENU_DEFDIR, LOCALE_HDD_SET_RECDIR, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo);
if(res == CMessageBox::mbrYes) {
g_settings.network_nfs_recordingdir = std::string(MOUNT_BASE) + "/" + dev + getDefaultPart(dev) + "/movies";
CRecordManager::getInstance()->SetDirectory(g_settings.network_nfs_recordingdir);
if(g_settings.timeshiftdir.empty())
{
std::string timeshiftDir = g_settings.network_nfs_recordingdir + "/.timeshift";
safe_mkdir(timeshiftDir.c_str());
printf("New timeshift dir: %s\n", timeshiftDir.c_str());
CRecordManager::getInstance()->SetTimeshiftDirectory(timeshiftDir);
}
}
in_menu = old_menu;
} }
#endif
return ret; return ret;
} }
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;

1
src/gui/hdd_menu.h
View File

@@ -92,6 +92,7 @@ class CHDDMenuHandler : public CMenuTarget
void showError(neutrino_locale_t err); void showError(neutrino_locale_t err);
bool scanDevices(); bool scanDevices();
void showHint(std::string &messsage); void showHint(std::string &messsage);
void setRecordPath(std::string &dev);
CHDDMenuHandler(); CHDDMenuHandler();
public: public: