hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 00:14:06 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

feat: reimplement command line with QCommandLineParser

Browse source
This commit is contained in:
shenleban tongying 2023-04-05 23:29:50 -04:00 committed by xiaoyifang
parent c8003b5408
commit b4ea2ef3db
1 changed files with 87 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

217
main.cc
View file

@ -6,9 +6,7 @@
#include "gdappstyle.hh" #include "gdappstyle.hh"
#include "mainwindow.hh" #include "mainwindow.hh"
#include "config.hh" #include "config.hh"
#include "article_netmgr.hh"
#include <QWebEngineProfile> #include <QWebEngineProfile>
#include "processwrapper.hh"
#include "hotkeywrapper.hh" #include "hotkeywrapper.hh"
#ifdef HAVE_X11 #ifdef HAVE_X11
#include <fixx11h.h> #include <fixx11h.h>
@ -18,19 +16,18 @@
#include <clocale> #include <clocale>
#endif #endif
#define LOG_TO_FILE_KEY "--log-to-file"
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
#include <QtCore/qt_windows.h> #include <QtCore/qt_windows.h>
#endif #endif
#include "termination.hh" #include "termination.hh"
#include "atomic_rename.hh" #include "atomic_rename.hh"
#include <QtWebEngineCore/QWebEngineUrlScheme>
#include <QMessageBox>
#include <QFile>
#include <QByteArray> #include <QByteArray>
#include <QCommandLineParser>
#include <QFile>
#include <QMessageBox>
#include <QString> #include <QString>
#include <QtWebEngineCore/QWebEngineUrlScheme>
#include "gddebug.hh" #include "gddebug.hh"
@ -92,17 +89,12 @@ void gdMessageHandler( QtMsgType type, const QMessageLogContext &context, const
class GDCommandLine class GDCommandLine
{ {
bool crashReport, logFile; private:
QString word, groupName, popupGroupName, errFileName; bool logFile= false;
QVector< QString > arguments; QString word, groupName, popupGroupName;
public: public:
GDCommandLine( int argc, char **argv ); explicit GDCommandLine(QCoreApplication * app);
inline bool needCrashReport()
{ return crashReport; }
inline QString errorFileName()
{ return errFileName; }
inline bool needSetGroup() inline bool needSetGroup()
{ return !groupName.isEmpty(); } { return !groupName.isEmpty(); }
@ -126,71 +118,62 @@ public:
{ return word; } { return word; }
}; };
GDCommandLine::GDCommandLine( int argc, char **argv ): GDCommandLine::GDCommandLine( QCoreApplication * app )
crashReport( false ),
logFile( false )
{ {
if( argc > 1 ) QCommandLineParser qcmd;
{
#ifdef Q_OS_WIN32 qcmd.setApplicationDescription( QObject::tr( "A dictionary lookup program." ) );
(void) argv; qcmd.addHelpOption(); // -h --help
int num;
LPWSTR *pstr = CommandLineToArgvW( GetCommandLineW(), &num ); qcmd.addPositionalArgument( "word", QObject::tr( "Word or sentence to query." ), "[word]" );
if( pstr && num > 1 )
{ QCommandLineOption logFileOption( QStringList() << "l"
for( int i = 1; i < num; i++ ) << "log-to-file",
arguments.push_back( QString::fromWCharArray( pstr[ i ] ) ); QObject::tr( "Save debug messages to gd_log.txt in the config folder." ) );
QCommandLineOption groupNameOption( QStringList() << "g"
<< "group-name",
QObject::tr( "Change the group of main window." ),
"groupName" );
QCommandLineOption popupGroupNameOption( QStringList() << "p"
<< "popup-group-name",
QObject::tr( "Change the group of popup." ),
"popupGroupName" );
qcmd.addOption( logFileOption );
qcmd.addOption( groupNameOption );
qcmd.addOption( popupGroupNameOption );
QCommandLineOption doNothingOption( "disable-web-security" ); // ignore the --disable-web-security
doNothingOption.setFlags( QCommandLineOption::HiddenFromHelp );
qcmd.addOption( doNothingOption );
qcmd.process( *app );
if ( qcmd.isSet( logFileOption ) ) {
logFile = true;
}
if ( qcmd.isSet( groupNameOption ) ) {
groupName = qcmd.value( groupNameOption );
}
if ( qcmd.isSet( popupGroupNameOption ) ) {
popupGroupName = qcmd.value( popupGroupNameOption );
}
const QStringList posArgs = qcmd.positionalArguments();
if ( !posArgs.empty() ) {
word = posArgs.at( 0 );
#if defined( Q_OS_LINUX ) || defined( Q_OS_WIN )
// handle url scheme like "goldendict://" on windows
word.remove( "goldendict://" );
// In microsoft Words, the / will be automatically appended
if ( word.endsWith( "/" ) ) {
word.chop( 1 );
} }
#else
for( int i = 1; i < argc; i++ )
arguments.push_back( QString::fromLocal8Bit( argv[ i ] ) );
#endif #endif
// Parse command line
for( int i = 0; i < arguments.size(); i++ )
{
if( arguments[ i ].compare( "--show-error-file" ) == 0 )
{
if( i < arguments.size() - 1 )
{
errFileName = arguments[ ++i ];
crashReport = true;
}
continue;
}
else
if( arguments[ i ].compare( "--log-to-file" ) == 0 )
{
logFile = true;
continue;
}
else
if( arguments[ i ].startsWith( "--group-name=" ) )
{
groupName = arguments[ i ].mid( arguments[ i ].indexOf( '=' ) + 1 );
continue;
}
else
if( arguments[ i ].startsWith( "--popup-group-name=" ) )
{
popupGroupName = arguments[ i ].mid( arguments[ i ].indexOf( '=' ) + 1 );
continue;
}
if( arguments[ i ].startsWith( "-style" ) )
{
// skip next argument, -style fusion
i++;
}
else
word = arguments[ i ];
#if defined(Q_OS_LINUX) || defined (Q_OS_WIN)
// handle url scheme like "goldendict://" on windows
word.remove("goldendict://");
// In microsoft Words, the / will be automatically appended
if(word.endsWith("/")){
word.chop(1);
}
#endif
}
} }
} }
@ -225,30 +208,34 @@ int main( int argc, char ** argv )
setlocale( LC_ALL, "" ); // use correct char set mapping setlocale( LC_ALL, "" ); // use correct char set mapping
#endif #endif
GDCommandLine gdcl( argc, argv ); //high dpi screen support
#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
QApplication::setAttribute( Qt::AA_EnableHighDpiScaling );
QApplication::setAttribute( Qt::AA_UseHighDpiPixmaps );
#endif
qputenv( "QT_AUTO_SCREEN_SCALE_FACTOR", "1" );
QApplication::setHighDpiScaleFactorRoundingPolicy( Qt::HighDpiScaleFactorRoundingPolicy::PassThrough );
if ( gdcl.needCrashReport() )
char ARG_DISABLE_WEB_SECURITY[] = "--disable-web-security";
int newArgc = argc + 1 + 1;
char ** newArgv = new char *[ newArgc ];
for( int i = 0; i < argc; i++ )
{ {
// The program has crashed -- show a message about it newArgv[ i ] = argv[ i ];
QApplication app( argc, argv );
QFile errFile( gdcl.errorFileName() );
QString errorText;
if ( errFile.open( QFile::ReadOnly ) )
errorText = QString::fromUtf8( errFile.readAll() );
errorText += "\n" + QString( "This information is located in file %1, "
"which will be removed once you close this dialog.").arg( errFile.fileName() );
QMessageBox::critical( 0, "GoldenDict has crashed", errorText );
errFile.remove();
return 0;
} }
newArgv[ argc ] = ARG_DISABLE_WEB_SECURITY;
newArgv[ argc + 1 ] = nullptr;
QHotkeyApplication app( "GoldenDict", newArgc, newArgv );
app.setApplicationName( "GoldenDict" );
app.setOrganizationDomain( "https://github.com/xiaoyifang/goldendict" );
#ifndef Q_OS_MAC
app.setWindowIcon( QIcon( ":/icons/programicon.png" ) );
#endif
GDCommandLine gdcl(&app);
installTerminationHandler(); installTerminationHandler();
@ -273,26 +260,6 @@ int main( int argc, char ** argv )
QWebEngineUrlScheme::registerScheme(webUiScheme); QWebEngineUrlScheme::registerScheme(webUiScheme);
} }
//high dpi screen support
#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
#endif
qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
char ARG_DISABLE_WEB_SECURITY[] = "--disable-web-security";
int newArgc = argc + 1 + 1;
char ** newArgv = new char *[ newArgc ];
for( int i = 0; i < argc; i++ )
{
newArgv[ i ] = argv[ i ];
}
newArgv[ argc ] = ARG_DISABLE_WEB_SECURITY;
newArgv[ argc + 1 ] = nullptr;
QHotkeyApplication app( "GoldenDict", newArgc, newArgv );
LogFilePtrGuard logFilePtrGuard; LogFilePtrGuard logFilePtrGuard;
if ( app.isRunning() ) if ( app.isRunning() )
@ -323,16 +290,6 @@ int main( int argc, char ** argv )
return 0; // Another instance is running return 0; // Another instance is running
} }
app.setApplicationName( "GoldenDict" );
app.setOrganizationDomain( "https://github.com/xiaoyifang/goldendict" );
//this line will forbid stylesheet applying on GroupComboBox
// app.setStyle(new GdAppStyle);
#ifndef Q_OS_MAC
app.setWindowIcon( QIcon( ":/icons/programicon.png" ) );
#endif
#ifdef MAKE_CHINESE_CONVERSION_SUPPORT #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
// OpenCC needs to load it's data files by relative path on Windows and OS X // OpenCC needs to load it's data files by relative path on Windows and OS X
QDir::setCurrent( Config::getProgramDataDir() ); QDir::setCurrent( Config::getProgramDataDir() );