Add the ability to import notes via the command line.

McFarJ · Dec 15, 2015 · 202e185 · 202e185
1 parent ea90f98
commit 202e185
Show file tree

Hide file tree

Showing 9 changed files with 150 additions and 36 deletions.
diff --git a/NixNote2.pro b/NixNote2.pro
@@ -231,7 +231,8 @@ SOURCES += main.cpp\
     dialog/faderdialog.cpp \
     cmdtools/extractnotetext.cpp \
     cmdtools/extractnotes.cpp \
-    cmdtools/alternote.cpp
+    cmdtools/alternote.cpp \
+    cmdtools/importnotes.cpp
 
 
 
@@ -426,7 +427,8 @@ HEADERS  += nixnote.h \
     dialog/faderdialog.h \
     cmdtools/extractnotetext.h \
     cmdtools/extractnotes.h \
-    cmdtools/alternote.h
+    cmdtools/alternote.h \
+    cmdtools/importnotes.h
 
 
 

diff --git a/cmdtools/cmdlinetool.cpp b/cmdtools/cmdlinetool.cpp
@@ -42,7 +42,7 @@ CmdLineTool::CmdLineTool(QObject *parent) :
 {
 }
 
-
+// Run the command line request.
 int CmdLineTool::run(StartupConfig &config) {
 #if QT_VERSION < 0x050000
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
@@ -102,6 +102,9 @@ int CmdLineTool::run(StartupConfig &config) {
     if (config.exports() || config.backup()) {
         return exportNotes(config);
     }
+    if (config.import()) {
+        return importNotes(config);
+    }
     if (config.alterNote()) {
         return alterNote(config);
     }
@@ -111,7 +114,7 @@ int CmdLineTool::run(StartupConfig &config) {
 
 
 
-
+// Email a note via the command line.
 int CmdLineTool::emailNote(StartupConfig config) {
     // Look to see if another NixNote is running.  If so, then we
     // expect a response if the note was delete.  Otherwise, we
@@ -132,7 +135,7 @@ int CmdLineTool::emailNote(StartupConfig config) {
 }
 
 
-
+// Delete a note via the command line
 int CmdLineTool::deleteNote(StartupConfig config) {
     bool useCrossMemory = true;
 
@@ -164,7 +167,7 @@ int CmdLineTool::deleteNote(StartupConfig config) {
 }
 
 
-
+// Query notes via the command line
 int CmdLineTool::queryNotes(StartupConfig config) {
     bool expectResponse = true;
 
@@ -220,7 +223,9 @@ int CmdLineTool::queryNotes(StartupConfig config) {
 }
 
 
-
+// Add a note via the command line.  if Nixnote is runnning,
+// the new note is copied into the dbi directory and
+// auto-imported.  If it is not running it is created directly.
 int CmdLineTool::addNote(StartupConfig config) {
 
 #ifdef Q_OS_WIN32
@@ -427,7 +432,8 @@ int CmdLineTool::addNote(StartupConfig config) {
 
 
 
-
+// Read a note via the command line and extract the text
+// contents.
 int CmdLineTool::readNote(StartupConfig config) {
     bool useCrossMemory = true;
 
@@ -479,6 +485,7 @@ int CmdLineTool::readNote(StartupConfig config) {
 
 
 
+// Export notes or do a backup via the command line
 int CmdLineTool::exportNotes(StartupConfig config) {
     if (global.sharedMemory->attach()) {
         std::cout << tr("This cannot be done with NixNote running.").toStdString() << endl;
@@ -494,7 +501,19 @@ int CmdLineTool::exportNotes(StartupConfig config) {
 
 
 
+// Import notes from a nnex file.
+int CmdLineTool::importNotes(StartupConfig config) {
+    if (global.sharedMemory->attach()) {
+        std::cout << tr("This cannot be done with NixNote running.").toStdString() << endl;
+        return 16;
+    }
+    global.db = new DatabaseConnection("nixnote");  // Startup the database
+    config.importNotes->import();
+    return 0;
+}
+
 
+// Alter a note's notebook or add/remove tags for a note.
 int CmdLineTool::alterNote(StartupConfig config) {
     // Look to see if another NixNote is running.  If so, then we
     // expect a response, otherwise we do it ourself.

diff --git a/cmdtools/cmdlinetool.h b/cmdtools/cmdlinetool.h
@@ -40,6 +40,7 @@ class CmdLineTool : public QObject
     int emailNote(StartupConfig config);
     int exportNotes(StartupConfig config);
     int alterNote(StartupConfig config);
+    int importNotes(StartupConfig config);
 
 signals:
 

diff --git a/cmdtools/importnotes.cpp b/cmdtools/importnotes.cpp
@@ -0,0 +1,35 @@
+#include "importnotes.h"
+#include <iostream>
+#include <QFile>
+#include "xml/importdata.h"
+
+ImportNotes::ImportNotes(QObject *parent) :
+    QObject(parent)
+{
+    inputFile = "";
+}
+
+
+
+
+// Perform the import via the command line
+int ImportNotes::import() {
+
+    if (inputFile.trimmed() == "") {
+        std::cout << QString(tr("Input file not specified.")).toStdString() << std::endl;
+        return 16;
+    }
+    QFile f(inputFile);
+    if (!f.exists()) {
+        std::cout << QString(tr("Input file not found.")).toStdString() << std::endl;
+        return 16;
+    }
+
+    ImportData importData(false,true,0);
+    importData.import(inputFile);
+    if (importData.lastError != 0) {
+        std::cout << importData.errorMessage.toStdString() << std::endl;
+        return 16;
+    }
+    return 0;
+}
diff --git a/cmdtools/importnotes.h b/cmdtools/importnotes.h
@@ -0,0 +1,20 @@
+#ifndef IMPORTNOTES_H
+#define IMPORTNOTES_H
+
+#include <QObject>
+
+class ImportNotes : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ImportNotes(QObject *parent = 0);
+    QString inputFile;
+    int import();
+
+signals:
+
+public slots:
+
+};
+
+#endif // IMPORTNOTES_H
diff --git a/settings/startupconfig.cpp b/settings/startupconfig.cpp
@@ -46,6 +46,7 @@ StartupConfig::StartupConfig()
     email = NULL;
     extractText = NULL;
     exportNotes = NULL;
+    importNotes = NULL;
     alter = NULL;
 }
 
@@ -142,9 +143,14 @@ void StartupConfig::printHelp() {
                    +QString("     export options:\n")
                    +QString("          --id=\"<note_ids>\"            Space separated list of note IDs to extract.\n")
                    +QString("          --search=\"search string\"     Export notes matching search string.\n")
+                   +QString("          --output=\"filename\"        Output file name.\n")
                    +QString("          --deleteAfterExtract         Delete notes after the extract completes.\n")
                    +QString("          --noVerifyDelete             Don't verify deletions.\n")
                    +QString("          --accountId=<id>             Account number (defaults to last used account).\n\n")
+                   +QString("  import <options>                     Import notes from a NixNote extract (.nnex).\n")
+                   +QString("     import options:\n")
+                   +QString("          --input=\"filename\"         Input file name.\n")
+                   +QString("          --accountId=<id>             Account number (defaults to last used account).\n\n")
                    +QString("  Examples:\n\n")
                    +QString("     To Start NixNote, do a sync, and then exit.\n")
                    +QString("     nixnote2 start --syncAndExit\n\n")
@@ -195,6 +201,11 @@ int StartupConfig::init(int argc, char *argv[]) {
                 exportNotes = new ExtractNotes();
             exportNotes->backup=false;
         }
+        if (parm.startsWith("import")) {
+            command->setBit(STARTUP_IMPORT,true);
+            if (importNotes == NULL)
+                importNotes = new ImportNotes();
+        }
         if (parm.startsWith("backup")) {
             command->setBit(STARTUP_BACKUP,true);
             if (exportNotes == NULL)
@@ -344,6 +355,12 @@ int StartupConfig::init(int argc, char *argv[]) {
                 exportNotes->outputFile = parm;
             }
         }
+        if (command->at(STARTUP_IMPORT)) {
+            if (parm.startsWith("--input=", Qt::CaseSensitive)) {
+                parm = parm.mid(8);
+                importNotes->inputFile = parm;
+            }
+        }
         if (command->at(STARTUP_BACKUP)) {
             if (parm.startsWith("--output=", Qt::CaseSensitive)) {
                 parm = parm.mid(9);
@@ -472,6 +489,10 @@ bool StartupConfig::exports() {
     return command->at(STARTUP_EXPORT);
 }
 
+bool StartupConfig::import() {
+    return command->at(STARTUP_IMPORT);
+}
+
 bool StartupConfig::backup() {
     return command->at(STARTUP_BACKUP);
 }

diff --git a/settings/startupconfig.h b/settings/startupconfig.h
@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "cmdtools/extractnotetext.h"
 #include "cmdtools/extractnotes.h"
 #include "cmdtools/alternote.h"
+#include "cmdtools/importnotes.h"
 
 #define STARTUP_GUI 0
 #define STARTUP_SYNC 1
@@ -78,6 +79,7 @@ class StartupConfig
     CmdLineQuery *queryNotes;
     ExtractNoteText *extractText;
     ExtractNotes *exportNotes;
+    ImportNotes *importNotes;
     AlterNote *alter;
     bool gui();
     bool sync();
@@ -91,6 +93,7 @@ class StartupConfig
     bool exports();
     bool backup();
     bool alterNote();
+    bool import();
     void setSyncAndExit();
 
     int init(int argc, char *argv[]);

diff --git a/xml/importdata.cpp b/xml/importdata.cpp
@@ -44,13 +44,14 @@ extern Global global;
 //* where an import will keep the guid and will obey the
 //* <dirty> tag in the note.
 //***********************************************************
-ImportData::ImportData(bool full, QObject *parent) : QObject(parent)
+ImportData::ImportData(bool full, bool cmdline, QObject *parent) : QObject(parent)
 {
     importTags = false;
     importNotebooks = false;
     backup = full;
     createTags = false;
     stopNow = false;
+    this->cmdline = cmdline;
 
     // get the
     if (!full) {
@@ -70,8 +71,10 @@ ImportData::ImportData(bool full, QObject *parent) : QObject(parent)
             t.getGuid(notebookGuid, lid);
         }
     }
-    progress = new QProgressDialog();
-    progress->setVisible(false);
+    if (!this->cmdline) {
+        progress = new QProgressDialog();
+        progress->setVisible(false);
+    }
 }
 
 
@@ -98,37 +101,43 @@ void ImportData::import(QString file) {
 
     int recCnt = 0;
     QMessageBox mb;
-    mb.setWindowTitle(tr("Scanning File"));
-    mb.setText(QString::number(recCnt) + tr(" notes found."));
-    QPushButton *cancelButton = mb.addButton(QMessageBox::Cancel);
-    connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
-    mb.show();
-    QCoreApplication::processEvents();
+    if (!cmdline) {
+        mb.setWindowTitle(tr("Scanning File"));
+        mb.setText(QString::number(recCnt) + tr(" notes found."));
+        QPushButton *cancelButton = mb.addButton(QMessageBox::Cancel);
+        connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
+        mb.show();
+        QCoreApplication::processEvents();
+    }
 
     while (!countReader->atEnd() && !stopNow) {
         QString line = countReader->readLine();
         if (line.contains("<note>", Qt::CaseInsensitive)) {
             recCnt++;
-            mb.setText(QString::number(recCnt) + tr(" notes found."));
-            QCoreApplication::processEvents();
+            if (!cmdline) {
+                mb.setText(QString::number(recCnt) + tr(" notes found."));
+                QCoreApplication::processEvents();
+            }
         }
     }
 
     notebookData.clear();
-    progress->setMaximum(recCnt);
-    progress->setMinimum(0);
-    if (backup) {
-        progress->setWindowTitle(tr("Importing"));
-        progress->setLabelText(tr("Importing Notes"));
-    } else {
-        progress->setWindowTitle(tr("Restore"));
-        progress->setLabelText(tr("Restoring Notes"));
+    if (!cmdline) {
+        progress->setMaximum(recCnt);
+        progress->setMinimum(0);
+        if (backup) {
+            progress->setWindowTitle(tr("Importing"));
+            progress->setLabelText(tr("Importing Notes"));
+        } else {
+            progress->setWindowTitle(tr("Restore"));
+            progress->setLabelText(tr("Restoring Notes"));
+        }
+        progress->setWindowModality(Qt::ApplicationModal);
+        connect(progress, SIGNAL(canceled()), this, SLOT(cancel()));
+        progress->setVisible(true);
+        mb.close();
+        progress->show();
     }
-    progress->setWindowModality(Qt::ApplicationModal);
-    connect(progress, SIGNAL(canceled()), this, SLOT(cancel()));
-    progress->setVisible(true);
-    mb.close();
-    progress->show();
     recCnt = 0;
 
     reader = new QXmlStreamReader(&xmlFile);
@@ -167,7 +176,8 @@ void ImportData::import(QString file) {
             if (type.toLower() == "backup" && !backup) {
                 lastError = 4;
                 errorMessage = "This is backup file, not an export file";
-                progress->hide();
+                if (!cmdline)
+                    progress->hide();
                 return;
             }
             if (type.toLower() == "export" && backup) {
@@ -182,7 +192,8 @@ void ImportData::import(QString file) {
         if (reader->name().toString().toLower() == "note" && reader->isStartElement()) {
             processNoteNode();
             recCnt++;
-            progress->setValue(recCnt);
+            if (!cmdline)
+                progress->setValue(recCnt);
         }
         if (reader->name().toString().toLower() == "notebook" && reader->isStartElement() && (backup || importNotebooks)) {
             processNotebookNode();
@@ -221,7 +232,8 @@ void ImportData::import(QString file) {
         }
     }
     query.exec("commit");
-    progress->hide();
+    if (!this->cmdline)
+        progress->hide();
 }
 
 

diff --git a/xml/importdata.h b/xml/importdata.h
@@ -84,7 +84,8 @@ class ImportData : public QObject
     bool                    importTags;
     bool                    importNotebooks;
     bool                    createTags;
-    ImportData(bool full, QObject *parent=0);
+    bool                    cmdline;
+    ImportData(bool full, bool cmdline=false, QObject *parent=0);
     void import(QString file);
     void setNotebookGuid(QString g);
     QString getErrorMessage();