#1198, start of Nextcloud bookmarks import implementation

pbek · Apr 30, 2019 · f1ebf47 · f1ebf47
1 parent c116f29
commit f1ebf47
Show file tree

Hide file tree

Showing 50 changed files with 149,287 additions and 148,590 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,7 +41,6 @@
   Slovak, Slovenian, Danish, Hungarian, Norwegian, Czech, Greek, Spanish translation
   (thank you MGuerra, mlimacarlos, vistausss, tiwi90, Fabijenna, richarson, pu.sash)
 
-
 ## 19.4.1
 - added support for **listing** the **note folders** and **changing** the
   **current note folder** to the websocket api

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -35,6 +35,7 @@ qt5_wrap_ui(dialogs/ui_issueassistantdialog.h issueassistantdialog.ui)
 qt5_wrap_ui(dialogs/ui_tagadddialog.h tagadddialog.ui)
 qt5_wrap_ui(widgets/ui_fontcolorwidget.h fontcolorwidget.ui)
 qt5_wrap_ui(widgets/ui_evernoteimportdialog.h ui_evernoteimportdialog.ui)
+qt5_wrap_ui(widgets/ui_serverbookmarksimportdialog.h ui_serverbookmarksimportdialog.ui)
 qt5_wrap_ui(widgets/ui_layoutwidget.ui ui_layoutwidget.ui)
 qt5_wrap_ui(dialogs/ui_orphanedimagesdialog.h orphanedimagesdialog.ui)
 qt5_wrap_ui(dialogs/ui_orphanedattachmentsdialog.h orphanedattachmentsdialog.ui)
@@ -109,6 +110,9 @@ set(SOURCE_FILES
     dialogs/evernoteimportdialog.cpp
     dialogs/evernoteimportdialog.h
     dialogs/evernoteimportdialog.ui
+    dialogs/serverbookmarksimportdialog.cpp
+    dialogs/serverbookmarksimportdialog.h
+    dialogs/serverbookmarksimportdialog.ui
     dialogs/orphanedimagesdialog.cpp
     dialogs/orphanedimagesdialog.h
     dialogs/orphanedimagesdialog.ui

diff --git a/src/QOwnNotes.pro b/src/QOwnNotes.pro
@@ -139,7 +139,8 @@ SOURCES += main.cpp\
     widgets/scriptlistwidget.cpp \
     widgets/notefolderlistwidget.cpp \
     widgets/notetreewidgetitem.cpp \
-    widgets/layoutwidget.cpp
+    widgets/layoutwidget.cpp \
+    dialogs/serverbookmarksimportdialog.cpp
 
 HEADERS  += mainwindow.h \
     build_number.h \
@@ -225,7 +226,8 @@ HEADERS  += mainwindow.h \
     widgets/scriptlistwidget.h \
     widgets/notefolderlistwidget.h \
     widgets/notetreewidgetitem.h \
-    widgets/layoutwidget.h
+    widgets/layoutwidget.h \
+    dialogs/serverbookmarksimportdialog.h
 
 FORMS    += mainwindow.ui \
     dialogs/notediffdialog.ui \
@@ -254,7 +256,8 @@ FORMS    += mainwindow.ui \
     widgets/qtexteditsearchwidget.ui \
     widgets/scriptsettingwidget.ui \
     widgets/notetreewidgetitem.ui \
-    widgets/layoutwidget.ui
+    widgets/layoutwidget.ui \
+    dialogs/serverbookmarksimportdialog.ui
 
 RESOURCES += \
     images.qrc \

diff --git a/src/build_number.h b/src/build_number.h
@@ -1 +1 @@
-#define BUILD 533
+#define BUILD 534
diff --git a/src/dialogs/serverbookmarksimportdialog.cpp b/src/dialogs/serverbookmarksimportdialog.cpp
@@ -0,0 +1,47 @@
+#include <QtQml/QJSValueIterator>
+#include "serverbookmarksimportdialog.h"
+#include "ui_serverbookmarksimportdialog.h"
+
+ServerBookmarksImportDialog::ServerBookmarksImportDialog(
+        QJSValue bookmarks, MainWindow *mainWindow, QWidget *parent) :
+        MasterDialog(parent),
+        ui(new Ui::ServerBookmarksImportDialog) {
+    ui->setupUi(this);
+
+    // init the iterator for the versions
+    QJSValueIterator bookmarksIterator(bookmarks);
+
+    QString url;
+    QString title;
+    QString description;
+    QStringList tags;
+
+    // iterate over the bookmarks
+    while (bookmarksIterator.hasNext()) {
+        bookmarksIterator.next();
+
+        QJSValue property = bookmarksIterator.value().property("url");
+
+        if (property.isUndefined()) {
+            continue;
+        }
+
+        url = property.toString();
+
+        qDebug() << __func__ << " - 'url': " << url;
+
+        if (url == "") {
+            continue;
+        }
+
+        title = bookmarksIterator.value().property("title").toString();
+        description = bookmarksIterator.value().property("description").toString();
+        tags = bookmarksIterator.value().property("tags").toVariant().toStringList();
+
+        qDebug() << __func__ << " - 'tags': " << tags;
+    }
+}
+
+ServerBookmarksImportDialog::~ServerBookmarksImportDialog() {
+    delete ui;
+}
diff --git a/src/dialogs/serverbookmarksimportdialog.h b/src/dialogs/serverbookmarksimportdialog.h
@@ -0,0 +1,26 @@
+#ifndef SERVERBOOKMARKSIMPORTDIALOG_H
+#define SERVERBOOKMARKSIMPORTDIALOG_H
+
+#include <QDialog>
+#include <QJSValue>
+#include <mainwindow.h>
+#include "masterdialog.h"
+
+namespace Ui {
+class ServerBookmarksImportDialog;
+}
+
+class ServerBookmarksImportDialog : public MasterDialog
+{
+    Q_OBJECT
+
+public:
+    explicit ServerBookmarksImportDialog(QJSValue bookmarks,
+            MainWindow *mainWindow, QWidget *parent = 0);
+    ~ServerBookmarksImportDialog();
+
+private:
+    Ui::ServerBookmarksImportDialog *ui;
+};
+
+#endif // SERVERBOOKMARKSIMPORTDIALOG_H
diff --git a/src/dialogs/serverbookmarksimportdialog.ui b/src/dialogs/serverbookmarksimportdialog.ui
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ServerBookmarksImportDialog</class>
+ <widget class="QDialog" name="ServerBookmarksImportDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Import bookmarks</string>
+  </property>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>