Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add the ability to change OpMode in command line.

Browse Source 
So you can change OpMode while running via ssh to get more bandwidth.
Usage: RetroShare06 --opmode [full|noturtle|gaming|minimal]
This commit is contained in:
Phenom 2016-05-16 12:10:04 +02:00
parent 1491a051dc
commit 8563957591
4 changed files with 66 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -1492,6 +1492,23 @@ void MainWindow::processLastArgs()
/* Now use files from the command line, because no RetroShare was running */ /* Now use files from the command line, because no RetroShare was running */
openRsCollection(Rshare::files()->takeFirst()); openRsCollection(Rshare::files()->takeFirst());
} }
/* Handle the -opmode options. */
if (opModeStatus) {
QString opmode = Rshare::opmode().toLower();
if (opmode == "noturtle") {
opModeStatus->setCurrentIndex(RS_OPMODE_NOTURTLE - 1);
} else if (opmode == "gaming") {
opModeStatus->setCurrentIndex(RS_OPMODE_GAMING - 1);
} else if (opmode == "minimal") {
opModeStatus->setCurrentIndex(RS_OPMODE_MINIMAL - 1);
} else {
opModeStatus->setCurrentIndex(RS_OPMODE_FULL - 1);
}
opModeStatus->setOpMode();
} else {
std::cerr << "ERR: MainWindow::processLastArgs opModeStatus is not initialized.";
}
} }
void MainWindow::switchVisibilityStatus(StatusElement e,bool b) void MainWindow::switchVisibilityStatus(StatusElement e,bool b)

2
retroshare-gui/src/gui/statusbar/OpModeStatus.h
View File

@ -46,7 +46,7 @@ public:
QColor getOpMode_Minimal_Color() const; QColor getOpMode_Minimal_Color() const;
void setOpMode_Minimal_Color( QColor c ); void setOpMode_Minimal_Color( QColor c );
private slots: public slots:
void setOpMode(); void setOpMode();
private: private:

63
retroshare-gui/src/rshare.cpp
View File

@ -55,13 +55,14 @@
#include "rshare.h" #include "rshare.h"
/* Available command-line arguments. */ /* Available command-line arguments. */
#define ARG_LANGUAGE "lang" /**< Argument specifying language. */
#define ARG_GUISTYLE "style" /**< Argument specfying GUI style. */
#define ARG_GUISTYLESHEET "stylesheet" /**< Argument specfying GUI style. */
#define ARG_RESET "reset" /**< Reset Rshare's saved settings. */ #define ARG_RESET "reset" /**< Reset Rshare's saved settings. */
#define ARG_DATADIR "datadir" /**< Directory to use for data files. */ #define ARG_DATADIR "datadir" /**< Directory to use for data files. */
#define ARG_LOGFILE "logfile" /**< Location of our logfile. */ #define ARG_LOGFILE "logfile" /**< Location of our logfile. */
#define ARG_LOGLEVEL "loglevel" /**< Log verbosity. */ #define ARG_LOGLEVEL "loglevel" /**< Log verbosity. */
#define ARG_GUISTYLE "style" /**< Argument specfying GUI style. */
#define ARG_GUISTYLESHEET "stylesheet" /**< Argument specfying GUI style. */
#define ARG_LANGUAGE "lang" /**< Argument specifying language. */
#define ARG_OPMODE "opmode" /**< OpMode (Full, NoTurtle, Gaming, Minimal */
#define ARG_RSLINK_S "r" /**< Open RsLink with protocol retroshare:// */ #define ARG_RSLINK_S "r" /**< Open RsLink with protocol retroshare:// */
#define ARG_RSLINK_L "link" /**< Open RsLink with protocol retroshare:// */ #define ARG_RSLINK_L "link" /**< Open RsLink with protocol retroshare:// */
#define ARG_RSFILE_S "f" /**< Open RsFile with or without arg */ #define ARG_RSFILE_S "f" /**< Open RsFile with or without arg */
@ -81,11 +82,12 @@ static const char* const forwardableArgs[] = {
/* Static member variables */ /* Static member variables */
QMap<QString, QString> Rshare::_args; /**< List of command-line arguments. */ QMap<QString, QString> Rshare::_args; /**< List of command-line arguments. */
Log Rshare::_log; /**< Logs debugging messages to file or stdout. */
QString Rshare::_style; /**< The current GUI style. */ QString Rshare::_style; /**< The current GUI style. */
QString Rshare::_stylesheet; /**< The current GUI stylesheet. */ QString Rshare::_stylesheet; /**< The current GUI stylesheet. */
QString Rshare::_language; /**< The current language. */ QString Rshare::_language; /**< The current language. */
QString Rshare::_dateformat; /**< The format of dates in feed items etc. */ QString Rshare::_dateformat; /**< The format of dates in feed items etc. */
Log Rshare::_log; /**< Logs debugging messages to file or stdout. */ QString Rshare::_opmode; /**< The operating mode passed by args. */
QStringList Rshare::_links; /**< List of links passed by arguments. */ QStringList Rshare::_links; /**< List of links passed by arguments. */
QStringList Rshare::_files; /**< List of files passed by arguments. */ QStringList Rshare::_files; /**< List of files passed by arguments. */
QDateTime Rshare::mStartupTime; QDateTime Rshare::mStartupTime;
@ -438,6 +440,9 @@ Rshare::showUsageMessageBox()
out << trow(tcol("-" ARG_LANGUAGE" &lt;language&gt;") + out << trow(tcol("-" ARG_LANGUAGE" &lt;language&gt;") +
tcol(tr("Sets RetroShare's language.") + tcol(tr("Sets RetroShare's language.") +
"<br>[" + LanguageSupport::languageCodes().join("|") + "]")); "<br>[" + LanguageSupport::languageCodes().join("|") + "]"));
out << trow(tcol("-" ARG_OPMODE" &lt;opmode&gt;") +
tcol(tr("Sets RetroShare's opertating mode.") +
"<br>[full|noturtle|gaming|minimal]"));
out << "</table>"; out << "</table>";
VMessageBox::information(0, VMessageBox::information(0,
@ -448,12 +453,14 @@ Rshare::showUsageMessageBox()
bool bool
Rshare::argNeedsValue(QString argName) Rshare::argNeedsValue(QString argName)
{ {
return (argName == ARG_GUISTYLE || return (
argName == ARG_GUISTYLESHEET ||
argName == ARG_LANGUAGE ||
argName == ARG_DATADIR || argName == ARG_DATADIR ||
argName == ARG_LOGFILE || argName == ARG_LOGFILE ||
argName == ARG_LOGLEVEL || argName == ARG_LOGLEVEL ||
argName == ARG_GUISTYLE ||
argName == ARG_GUISTYLESHEET ||
argName == ARG_LANGUAGE ||
argName == ARG_OPMODE ||
argName == ARG_RSLINK_S || argName == ARG_RSLINK_S ||
argName == ARG_RSLINK_L || argName == ARG_RSLINK_L ||
argName == ARG_RSFILE_S || argName == ARG_RSFILE_S ||
@ -494,6 +501,14 @@ Rshare::parseArguments(QStringList args, bool firstRun)
} }
} }
/* handle opmode that could be change while running.*/
QString omValue = QString(value).prepend(";").append(";").toLower();
QString omValues = QString(";full;noturtle;gaming;minimal;");
if ((arg == ARG_OPMODE ) &&
omValues.contains(omValue)) {
_opmode = value;
}
/* Don't send theses argument to _args map to allow multiple. */ /* Don't send theses argument to _args map to allow multiple. */
if (arg == ARG_RSLINK_S || arg == ARG_RSLINK_L) { if (arg == ARG_RSLINK_S || arg == ARG_RSLINK_L) {
_links.append(value); _links.append(value);
@ -510,10 +525,17 @@ Rshare::parseArguments(QStringList args, bool firstRun)
bool bool
Rshare::validateArguments(QString &errmsg) Rshare::validateArguments(QString &errmsg)
{ {
/* Check for a language that Retroshare recognizes. */ /* Check for a writable log file */
if (_args.contains(ARG_LANGUAGE) && if (_args.contains(ARG_LOGFILE) && !_log.isOpen()) {
!LanguageSupport::isValidLanguageCode(_args.value(ARG_LANGUAGE))) { errmsg = tr("Unable to open log file '%1': %2")
errmsg = tr("Invalid language code specified:")+" " + _args.value(ARG_LANGUAGE); .arg(_args.value(ARG_LOGFILE))
.arg(_log.errorString());
return false;
}
/* Check for a valid log level */
if (_args.contains(ARG_LOGLEVEL) &&
!Log::logLevels().contains(_args.value(ARG_LOGLEVEL))) {
errmsg = tr("Invalid log level specified:")+" " + _args.value(ARG_LOGLEVEL);
return false; return false;
} }
/* Check for a valid GUI style */ /* Check for a valid GUI style */
@ -523,17 +545,16 @@ Rshare::validateArguments(QString &errmsg)
errmsg = tr("Invalid GUI style specified:")+" " + _args.value(ARG_GUISTYLE); errmsg = tr("Invalid GUI style specified:")+" " + _args.value(ARG_GUISTYLE);
return false; return false;
} }
/* Check for a valid log level */ /* Check for a language that Retroshare recognizes. */
if (_args.contains(ARG_LOGLEVEL) && if (_args.contains(ARG_LANGUAGE) &&
!Log::logLevels().contains(_args.value(ARG_LOGLEVEL))) { !LanguageSupport::isValidLanguageCode(_args.value(ARG_LANGUAGE))) {
errmsg = tr("Invalid log level specified:")+" " + _args.value(ARG_LOGLEVEL); errmsg = tr("Invalid language code specified:")+" " + _args.value(ARG_LANGUAGE);
return false; return false;
} }
/* Check for a writable log file */ /* Check for an opmode that Retroshare recognizes. */
if (_args.contains(ARG_LOGFILE) && !_log.isOpen()) { if (_args.contains(ARG_OPMODE) &&
errmsg = tr("Unable to open log file '%1': %2") !QString(";full;noturtle;gaming;minimal;").contains(QString(_args.value(ARG_OPMODE)).prepend(";").append(";").toLower())) {
.arg(_args.value(ARG_LOGFILE)) errmsg = tr("Invalid language code specified:")+" " + _args.value(ARG_OPMODE);
.arg(_log.errorString());
return false; return false;
} }
return true; return true;

9
retroshare-gui/src/rshare.h
View File

@ -107,12 +107,14 @@ public:
/** Initialize plugins. */ /** Initialize plugins. */
static void initPlugins(); static void initPlugins();
/** Returns the current language. */
static QString language() { return _language; }
/** Returns the current GUI style. */ /** Returns the current GUI style. */
static QString style() { return _style; } static QString style() { return _style; }
/** Returns the current GUI stylesheet. */ /** Returns the current GUI stylesheet. */
static QString stylesheet() { return _stylesheet; } static QString stylesheet() { return _stylesheet; }
/** Returns the current language. */
static QString language() { return _language; }
/** Returns the operating mode. */
static QString opmode() { return _opmode; }
/** Returns links passed by arguments. */ /** Returns links passed by arguments. */
static QStringList* links() { return &_links; } static QStringList* links() { return &_links; }
/** Returns files passed by arguments. */ /** Returns files passed by arguments. */
@ -181,11 +183,12 @@ private:
static bool argNeedsValue(QString argName); static bool argNeedsValue(QString argName);
static QMap<QString, QString> _args; /**< List of command-line arguments. */ static QMap<QString, QString> _args; /**< List of command-line arguments. */
static Log _log; /**< Logs debugging messages to file or stdout. */
static QString _style; /**< The current GUI style. */ static QString _style; /**< The current GUI style. */
static QString _stylesheet; /**< The current GUI stylesheet. */ static QString _stylesheet; /**< The current GUI stylesheet. */
static QString _language; /**< The current language. */ static QString _language; /**< The current language. */
static QString _dateformat; /**< The format for dates in feed items etc. */ static QString _dateformat; /**< The format for dates in feed items etc. */
static Log _log; /**< Logs debugging messages to file or stdout. */ static QString _opmode; /**< The operating mode passed by args. */
static QStringList _links; /**< List of links passed by arguments. */ static QStringList _links; /**< List of links passed by arguments. */
static QStringList _files; /**< List of files passed by arguments. */ static QStringList _files; /**< List of files passed by arguments. */
static QDateTime mStartupTime; // startup time static QDateTime mStartupTime; // startup time