From 146fdc953fdd49035f204ca3dfc2a2ffe7f661ec Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Thu, 28 May 2015 10:06:41 +0200
Subject: [PATCH] GreaseMonkey: Allow userscripts with empty body (just
 metadata header)

---
 src/plugins/GreaseMonkey/gm_script.cpp         | 18 +++++++++---------
 .../GreaseMonkey/settings/gm_settings.cpp      |  4 +---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/plugins/GreaseMonkey/gm_script.cpp b/src/plugins/GreaseMonkey/gm_script.cpp
index 2880adb8e..708948dd7 100644
--- a/src/plugins/GreaseMonkey/gm_script.cpp
+++ b/src/plugins/GreaseMonkey/gm_script.cpp
@@ -185,14 +185,8 @@ void GM_Script::watchedFileChanged(const QString &file)
 
 void GM_Script::parseScript()
 {
-    QFile file(m_fileName);
-    if (!file.open(QFile::ReadOnly)) {
-        qWarning() << "GreaseMonkey: Cannot open file for reading" << m_fileName;
-        return;
-    }
-
     m_name.clear();
-    m_namespace = "GreaseMonkeyNS";
+    m_namespace = QSL("GreaseMonkeyNS");
     m_description.clear();
     m_version.clear();
     m_include.clear();
@@ -206,13 +200,19 @@ void GM_Script::parseScript()
     m_enabled = true;
     m_valid = false;
 
+    QFile file(m_fileName);
+    if (!file.open(QFile::ReadOnly)) {
+        qWarning() << "GreaseMonkey: Cannot open file for reading" << m_fileName;
+        return;
+    }
+
     if (!m_fileWatcher->files().contains(m_fileName)) {
         m_fileWatcher->addPath(m_fileName);
     }
 
     QString fileData = QString::fromUtf8(file.readAll());
 
-    QzRegExp rx("// ==UserScript==(.*)// ==/UserScript==");
+    QzRegExp rx(QSL("// ==UserScript==(.*)// ==/UserScript=="));
     rx.indexIn(fileData);
     QString metadataBlock = rx.cap(1).trimmed();
 
@@ -291,10 +291,10 @@ void GM_Script::parseScript()
     m_metadata = fileData.mid(0, index);
 
     const QString script = fileData.mid(index).trimmed();
-    m_valid = !script.isEmpty();
 
     const QString nspace = QCryptographicHash::hash(fullName().toUtf8(), QCryptographicHash::Md4).toHex();
     const QString gmValues = m_manager->valuesScript().arg(nspace);
 
     m_script = QSL("(function(){%1\n%2\n%3\n})();").arg(gmValues, m_manager->requireScripts(requireList), script);
+    m_valid = true;
 }
diff --git a/src/plugins/GreaseMonkey/settings/gm_settings.cpp b/src/plugins/GreaseMonkey/settings/gm_settings.cpp
index 9f6eb0002..5f55b6d22 100644
--- a/src/plugins/GreaseMonkey/settings/gm_settings.cpp
+++ b/src/plugins/GreaseMonkey/settings/gm_settings.cpp
@@ -117,9 +117,7 @@ void GM_Settings::newScript()
                                 "// @description Script description \n"
                                 "// @include     * \n"
                                 "// @version     1 \n"
-                                "// ==/UserScript==\n"
-                                "\n"
-                                "// Your script implementation\n");
+                                "// ==/UserScript==\n\n");
 
     const QString fileName = QSL("%1/%2.user.js").arg(m_manager->scriptsDirectory(), QzTools::filterCharsFromFilename(name));