Skip to content

Commit

Permalink
Avoid unnecesary string allocations
Browse files Browse the repository at this point in the history
  • Loading branch information
@hluk
hluk committed Apr 21, 2024
1 parent d827475 commit b3a4f75
Show file tree
Hide file tree
Showing 4 changed files with 146 additions and 144 deletions.
133 changes: 68 additions & 65 deletions src/common/commandstore.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

namespace {

const QLatin1String falseString("false");
const QLatin1String trueString("true");

void normalizeLineBreaks(QString &cmd)
{
if (cmd.startsWith("\n ")) {
Expand All @@ -29,104 +32,104 @@ void normalizeLineBreaks(QString &cmd)
void loadCommand(const QSettings &settings, Commands *commands)
{
Command c;
c.enable = settings.value("Enable", true).toBool();

c.name = settings.value("Name").toString();
c.re = QRegularExpression( settings.value("Match").toString() );
c.wndre = QRegularExpression( settings.value("Window").toString() );
c.matchCmd = settings.value("MatchCommand").toString();
c.cmd = settings.value("Command").toString();
c.sep = settings.value("Separator").toString();

c.input = settings.value("Input").toString();
if ( c.input == "false" || c.input == "true" )
c.input = c.input == "true" ? QString(mimeText) : QString();

c.output = settings.value("Output").toString();
if ( c.output == "false" || c.output == "true" )
c.output = c.output == "true" ? QString(mimeText) : QString();

c.wait = settings.value("Wait").toBool();
c.automatic = settings.value("Automatic").toBool();
c.display = settings.value("Display").toBool();
c.transform = settings.value("Transform").toBool();
c.hideWindow = settings.value("HideWindow").toBool();
c.icon = settings.value("Icon").toString();
c.shortcuts = settings.value("Shortcut").toStringList();
c.globalShortcuts = settings.value("GlobalShortcut").toStringList();
c.tab = settings.value("Tab").toString();
c.outputTab = settings.value("OutputTab").toString();
c.internalId = settings.value("InternalId").toString();
c.inMenu = settings.value("InMenu").toBool();
c.isScript = settings.value("IsScript").toBool();

const auto globalShortcutsOption = settings.value("IsGlobalShortcut");
c.enable = settings.value(QStringLiteral("Enable"), true).toBool();

c.name = settings.value(QStringLiteral("Name")).toString();
c.re = QRegularExpression( settings.value(QStringLiteral("Match")).toString() );
c.wndre = QRegularExpression( settings.value(QStringLiteral("Window")).toString() );
c.matchCmd = settings.value(QStringLiteral("MatchCommand")).toString();
c.cmd = settings.value(QStringLiteral("Command")).toString();
c.sep = settings.value(QStringLiteral("Separator")).toString();

c.input = settings.value(QStringLiteral("Input")).toString();
if (c.input == falseString || c.input == trueString)
c.input = c.input == trueString ? mimeText : QLatin1String();

c.output = settings.value(QStringLiteral("Output")).toString();
if (c.output == falseString || c.output == trueString)
c.output = c.output == trueString ? mimeText : QLatin1String();

c.wait = settings.value(QStringLiteral("Wait")).toBool();
c.automatic = settings.value(QStringLiteral("Automatic")).toBool();
c.display = settings.value(QStringLiteral("Display")).toBool();
c.transform = settings.value(QStringLiteral("Transform")).toBool();
c.hideWindow = settings.value(QStringLiteral("HideWindow")).toBool();
c.icon = settings.value(QStringLiteral("Icon")).toString();
c.shortcuts = settings.value(QStringLiteral("Shortcut")).toStringList();
c.globalShortcuts = settings.value(QStringLiteral("GlobalShortcut")).toStringList();
c.tab = settings.value(QStringLiteral("Tab")).toString();
c.outputTab = settings.value(QStringLiteral("OutputTab")).toString();
c.internalId = settings.value(QStringLiteral("InternalId")).toString();
c.inMenu = settings.value(QStringLiteral("InMenu")).toBool();
c.isScript = settings.value(QStringLiteral("IsScript")).toBool();

const auto globalShortcutsOption = settings.value(QStringLiteral("IsGlobalShortcut"));
if ( globalShortcutsOption.isValid() ) {
c.isGlobalShortcut = settings.value("IsGlobalShortcut").toBool();
c.isGlobalShortcut = globalShortcutsOption.toBool();
} else {
// Backwards compatibility with v3.1.2 and below.
if ( c.globalShortcuts.contains("DISABLED") )
if ( c.globalShortcuts.contains(QLatin1String("DISABLED")) )
c.globalShortcuts.clear();
c.isGlobalShortcut = !c.globalShortcuts.isEmpty();
}

if (settings.value("Ignore").toBool())
if (settings.value(QStringLiteral("Ignore")).toBool())
c.remove = c.automatic = true;
else
c.remove = settings.value("Remove").toBool();
c.remove = settings.value(QStringLiteral("Remove")).toBool();

commands->append(c);
}

void saveValue(const char *key, const QRegularExpression &re, QSettings *settings)
void saveValue(const QString &key, const QRegularExpression &re, QSettings *settings)
{
settings->setValue(key, re.pattern());
}

void saveValue(const char *key, const QVariant &value, QSettings *settings)
void saveValue(const QString &key, const QVariant &value, QSettings *settings)
{
settings->setValue(key, value);
}

/// Save only modified command properties.
template <typename Member>
void saveNewValue(const char *key, const Command &command, const Member &member, QSettings *settings)
void saveNewValue(const QString &key, const Command &command, const Member &member, QSettings *settings)
{
if (command.*member != Command().*member)
saveValue(key, command.*member, settings);
}

void saveCommand(const Command &c, QSettings *settings)
{
saveNewValue("Name", c, &Command::name, settings);
saveNewValue("Match", c, &Command::re, settings);
saveNewValue("Window", c, &Command::wndre, settings);
saveNewValue("MatchCommand", c, &Command::matchCmd, settings);
saveNewValue("Command", c, &Command::cmd, settings);
saveNewValue("Input", c, &Command::input, settings);
saveNewValue("Output", c, &Command::output, settings);
saveNewValue(QStringLiteral("Name"), c, &Command::name, settings);
saveNewValue(QStringLiteral("Match"), c, &Command::re, settings);
saveNewValue(QStringLiteral("Window"), c, &Command::wndre, settings);
saveNewValue(QStringLiteral("MatchCommand"), c, &Command::matchCmd, settings);
saveNewValue(QStringLiteral("Command"), c, &Command::cmd, settings);
saveNewValue(QStringLiteral("Input"), c, &Command::input, settings);
saveNewValue(QStringLiteral("Output"), c, &Command::output, settings);

// Separator for new command is set to '\n' for convenience.
// But this value shouldn't be saved if output format is not set.
if ( c.sep != "\\n" || !c.output.isEmpty() )
saveNewValue("Separator", c, &Command::sep, settings);

saveNewValue("Wait", c, &Command::wait, settings);
saveNewValue("Automatic", c, &Command::automatic, settings);
saveNewValue("Display", c, &Command::display, settings);
saveNewValue("InMenu", c, &Command::inMenu, settings);
saveNewValue("IsGlobalShortcut", c, &Command::isGlobalShortcut, settings);
saveNewValue("IsScript", c, &Command::isScript, settings);
saveNewValue("Transform", c, &Command::transform, settings);
saveNewValue("Remove", c, &Command::remove, settings);
saveNewValue("HideWindow", c, &Command::hideWindow, settings);
saveNewValue("Enable", c, &Command::enable, settings);
saveNewValue("Icon", c, &Command::icon, settings);
saveNewValue("Shortcut", c, &Command::shortcuts, settings);
saveNewValue("GlobalShortcut", c, &Command::globalShortcuts, settings);
saveNewValue("Tab", c, &Command::tab, settings);
saveNewValue("OutputTab", c, &Command::outputTab, settings);
saveNewValue("InternalId", c, &Command::internalId, settings);
if ( c.sep != QLatin1String("\\n") || !c.output.isEmpty() )
saveNewValue(QStringLiteral("Separator"), c, &Command::sep, settings);

saveNewValue(QStringLiteral("Wait"), c, &Command::wait, settings);
saveNewValue(QStringLiteral("Automatic"), c, &Command::automatic, settings);
saveNewValue(QStringLiteral("Display"), c, &Command::display, settings);
saveNewValue(QStringLiteral("InMenu"), c, &Command::inMenu, settings);
saveNewValue(QStringLiteral("IsGlobalShortcut"), c, &Command::isGlobalShortcut, settings);
saveNewValue(QStringLiteral("IsScript"), c, &Command::isScript, settings);
saveNewValue(QStringLiteral("Transform"), c, &Command::transform, settings);
saveNewValue(QStringLiteral("Remove"), c, &Command::remove, settings);
saveNewValue(QStringLiteral("HideWindow"), c, &Command::hideWindow, settings);
saveNewValue(QStringLiteral("Enable"), c, &Command::enable, settings);
saveNewValue(QStringLiteral("Icon"), c, &Command::icon, settings);
saveNewValue(QStringLiteral("Shortcut"), c, &Command::shortcuts, settings);
saveNewValue(QStringLiteral("GlobalShortcut"), c, &Command::globalShortcuts, settings);
saveNewValue(QStringLiteral("Tab"), c, &Command::tab, settings);
saveNewValue(QStringLiteral("OutputTab"), c, &Command::outputTab, settings);
saveNewValue(QStringLiteral("InternalId"), c, &Command::internalId, settings);
}

Commands importCommands(QSettings *settings)
Expand Down
27 changes: 13 additions & 14 deletions src/common/predefinedcommands.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ QVector<Command> predefinedCommands()
c = &commands.first();
c->name = AddCommandDialog::tr("New command");
c->icon = QString(QChar(IconFile));
c->input = c->output = "";
c->input = c->output = QString();
c->wait = c->automatic = c->remove = false;
c->sep = QLatin1String("\\n");

Expand Down Expand Up @@ -84,23 +84,23 @@ synchronizeToSelection = function() {
c->name = AddCommandDialog::tr("Open in &Browser");
c->re = reURL;
c->icon = QString(QChar(IconGlobe));
c->cmd = "copyq open %1";
c->cmd = QStringLiteral("copyq open %1");
c->hideWindow = true;
c->inMenu = true;

c = newCommand(&commands);
c->name = AddCommandDialog::tr("Paste as Plain Text");
c->input = mimeText;
c->icon = QString(QChar(IconPaste));
c->cmd = "copyq:" + pasteAsPlainTextScript("input()");
c->cmd = QStringLiteral("copyq:") + pasteAsPlainTextScript("input()");
c->hideWindow = true;
c->inMenu = true;

c = newCommand(&commands);
c->name = AddCommandDialog::tr("Autoplay videos");
c->re = QRegularExpression("^http://.*\\.(mp4|avi|mkv|wmv|flv|ogv)$");
c->icon = QString(QChar(IconCirclePlay));
c->cmd = "copyq open %1";
c->cmd = QStringLiteral("copyq open %1");
c->automatic = true;
c->hideWindow = true;
c->inMenu = true;
Expand All @@ -109,24 +109,24 @@ synchronizeToSelection = function() {
c->name = AddCommandDialog::tr("Copy URL (web address) to other tab");
c->re = reURL;
c->icon = QString(QChar(IconCopy));
c->tab = "&web";
c->tab = QStringLiteral("&web");
c->automatic = true;

c = newCommand(&commands);
c->name = AddCommandDialog::tr("Create thumbnail (needs ImageMagick)");
c->icon = QString(QChar(IconImage));
c->cmd = "convert - -resize 92x92 png:-";
c->input = "image/png";
c->output = "image/png";
c->cmd = QStringLiteral("convert - -resize 92x92 png:-");
c->input = QStringLiteral("image/png");
c->output = QStringLiteral("image/png");
c->inMenu = true;

c = newCommand(&commands);
c->name = AddCommandDialog::tr("Create QR Code from URL (needs qrencode)");
c->re = reURL;
c->icon = QString(QChar(IconQrcode));
c->cmd = "qrencode -o - -t PNG -s 6";
c->cmd = QStringLiteral("qrencode -o - -t PNG -s 6");
c->input = mimeText;
c->output = "image/png";
c->output = QStringLiteral("image/png");
c->inMenu = true;

const auto todoTab = AddCommandDialog::tr("Tasks", "Tab name for some predefined commands");
Expand All @@ -144,7 +144,6 @@ synchronizeToSelection = function() {
.arg(todoTabQuoted);
c->icon = QString(QChar(IconShare));
c->tab = todoTab;
c->input = mimeText;
c->remove = true;
c->inMenu = true;

Expand All @@ -163,7 +162,7 @@ synchronizeToSelection = function() {
c->icon = QString(QChar(IconAsterisk));
c->remove = true;
c->automatic = true;
c->cmd = "copyq ignore";
c->cmd = QStringLiteral("copyq ignore");
}

c = newCommand(&commands);
Expand All @@ -177,8 +176,8 @@ synchronizeToSelection = function() {
c->name = AddCommandDialog::tr("Clear Current Tab");
c->icon = QString(QChar(IconBroom));
c->inMenu = true;
c->cmd = "copyq: ItemSelection(selectedTab()).selectRemovable().removeAll()";
c->matchCmd = "copyq: tab(selectedTab()); if (size() == 0) fail()";
c->cmd = QStringLiteral("copyq: ItemSelection(selectedTab()).selectRemovable().removeAll()");
c->matchCmd = QStringLiteral("copyq: tab(selectedTab()); if (size() == 0) fail()");

return commands;
}
Expand Down
Loading

0 comments on commit b3a4f75

Please sign in to comment.