Merge branch 'develop' of git://anongit.kde.org/akonadi-next into develop

2 files changed, 22 insertions, 1 deletions

diff --git a/akonadish/TODO b/akonadish/TODO
index 469dbf2..93c4ff1 100644
--- a/akonadish/TODO
+++ b/akonadish/TODO
@@ -3,6 +3,8 @@
     * improve modify/remove/create to autocomplete resource names
 * provide a setting to turn on/off user interaction during commands (e.g. deletion confirmations)
     * add a "ask the user a question" helper in State
+    * confirm deletions in remove
+* handle env vars and similar for scripting purposes
 * key/value syntax objects
 * json objects! (set json on; ...)
 * make the shell generic and have it load a plugin matching the name of argv[0] for syntax
diff --git a/akonadish/main.cpp b/akonadish/main.cpp
index bd85fb4..45bd5ea 100644
--- a/akonadish/main.cpp
+++ b/akonadish/main.cpp
@@ -21,6 +21,7 @@
 
 #include <QCoreApplication>
 #include <QDebug>
+#include <QFile>
 #include <QTextStream>
 
 #include "syntaxtree.h"
@@ -42,7 +43,9 @@ int main(int argc, char *argv[])
     //TODO: make a json command parse cause that would be awesomesauce
     const bool startJsonListener = !startRepl &&
                                    (argc == 2 && qstrcmp(argv[1], "-") == 0);
-    //qDebug() << "state at startup is" << interactive << startRepl << startJsonListener;
+    const bool fromScript = !startRepl && QFile::exists(argv[1]);
+
+    //qDebug() << "state at startup is" << interactive << startRepl << startJsonListener << fromScript;
 
     QCoreApplication app(argc, argv);
     app.setApplicationName(argv[0]);
@@ -62,6 +65,22 @@ int main(int argc, char *argv[])
 
         State::setHasEventLoop(true);
         return app.exec();
+    } else if (fromScript) {
+        QFile f(argv[1]);
+        if (!f.open(QIODevice::ReadOnly)) { 
+            return 1;
+        }
+
+        QString line = f.readLine().trimmed();
+        while (!line.isEmpty()) {
+            if (line.isEmpty() || line.startsWith('#')) {
+                line = f.readLine().trimmed();
+                continue;
+            }
+            SyntaxTree::self()->run(SyntaxTree::tokenize(line));
+            line = f.readLine().trimmed();
+        }
+        exit(0);
     } else if (!interactive) {
         QTextStream inputStream(stdin);
         while (true) {