Merge branch '1.1' into master

src/jsonstorage.cpp

@@ -66,8 +66,12 @@ Storage::Data JsonStorage::deserializeJsonData(const QByteArray &serializedData,
         Tag::Ptr tag = Tag::Ptr(new Tag(kernel, QString()));
         tag->fromJson(t.toMap());
         if (!tag->name().isEmpty() && !Storage::itemListContains<Tag::Ptr>(result.tags, tag)) {
-            if (kernel) // Reuse tags from given storage
-                tag = kernel->storage()->tag(tag->name());
+            if (kernel) { // Reuse tags from given storage
+                if (Tag::Ptr tag2 = kernel->storage()->tag(tag->name(), /*create=*/ false)) {
+                    tag = tag2;
+                }
+            }
+
             result.tags << tag;
         }
     }

src/storage.cpp

@@ -227,10 +227,26 @@ void Storage::load()
         createTag(tr("books"), QStringLiteral("{b2697470-f457-461c-9310-7d4b56aea395}"));
         createTag(tr("movies"), QStringLiteral("{387be44a-1eb7-4895-954a-cf5bc82d8f03}"));
     }
+
     m_loadingInProgress = false;
+
+    verifyLoadedData();
+
     emit taskCountChanged();
 }
 
+void Storage::verifyLoadedData()
+{
+    foreach (const Tag::Ptr &tag, m_data.tags) {
+        if (tag->uuid(/*createIfEmpty=*/false).isEmpty()) {
+            qWarning() << Q_FUNC_INFO << "No uuid for tag" << tag;
+#ifdef UNIT_TEST_RUN
+           //  Q_ASSERT(false);
+#endif
+        }
+    }
+}
+
 void Storage::save()
 {
 #if defined(UNIT_TEST_RUN)

src/storage.h

@@ -178,6 +178,7 @@ private Q_SLOTS:
     virtual void save_impl() = 0;
 
 private:
+    void verifyLoadedData();
     void connectTask(const Task::Ptr &);
     int proxyRowToSource(int proxyIndex) const;
     QTimer m_scheduleTimer;

src/syncable.cpp

@@ -48,9 +48,9 @@ void Syncable::setRevisionOnWebDAVServer(int revision)
     m_revisionOnWebDAVServer = revision;
 }
 
-QString Syncable::uuid() const
+QString Syncable::uuid(bool createIfEmpty) const
 {
-    if (m_uuid.isEmpty()) // Delayed creation, since it can be expensive and we don't need to create it in CTOR because it's going to be set when loading
+    if (createIfEmpty && m_uuid.isEmpty()) // Delayed creation, since it can be expensive and we don't need to create it in CTOR because it's going to be set when loading
         m_uuid = QUuid::createUuid().toString();
 
     return m_uuid;
@@ -75,8 +75,10 @@ void Syncable::fromJson(const QVariantMap &map)
     parseUnknownFields(map);
 
     QString uuid = map.value(QStringLiteral("uuid")).toString();
-    if (uuid.isEmpty())
+    if (uuid.isEmpty()) {
+        qWarning() << Q_FUNC_INFO << "Tag doesn't have uuid, creating one:" << this;
         uuid = QUuid::createUuid().toString();
+    }
     setUuid(uuid);
     setRevision(map.value(QStringLiteral("revision"), 0).toInt());
     setRevisionOnWebDAVServer(map.value(QStringLiteral("revisionOnWebDAVServer"), -1).toInt());

src/syncable.h

@@ -32,7 +32,7 @@ class Syncable
     int revision() const;
     int revisionOnWebDAVServer() const;
     void setRevisionOnWebDAVServer(int);
-    QString uuid() const;
+    QString uuid(bool createIfEmpty = true) const;
     void setUuid(const QString &uuid);
 
     virtual void fromJson(const QVariantMap &);
@@ -48,7 +48,7 @@ class Syncable
     mutable QString m_uuid;
 
 private:
-    Q_DISABLE_COPY(Syncable);
+    Q_DISABLE_COPY(Syncable)
     void parseUnknownFields(const QVariantMap &);
 };
 

src/tag.h

@@ -96,7 +96,7 @@ inline QDebug operator<<(QDebug dbg, const Tag::Ptr &tag)
     if (!tag)
         return dbg;
 
-    dbg.nospace() << "Tag: uuid=" << tag->uuid()
+    dbg.nospace() << "Tag: uuid=" << tag->uuid(false)
                   << "; name=" << tag->name()
                   << "; rev=" << tag->revision();
     return dbg.space();

src/task.cpp

@@ -79,6 +79,8 @@ Task::Task(Kernel *kernel, const QString &summary)
     connect(this, &Task::dueDateChanged, &Task::onEdited);
     connect(this, &Task::priorityChanged, &Task::onEdited);
 
+    connect(this, &Task::dueDateChanged, &Task::dueDateDisplayTextChanged);
+
     connect(kernel, &Kernel::dayChanged, this, &Task::onDayChanged);
 
 #if defined(UNIT_TEST_RUN)
@@ -537,7 +539,7 @@ void Task::onEdited()
 void Task::onDayChanged()
 {
     if (m_dueDate.isValid()) {
-        emit dueDateChanged();
+        emit dueDateDisplayTextChanged();
         if (dueToday() || isOverdue())
             setStaged(true);
     }

src/task.h

@@ -58,12 +58,12 @@ class Task : public QObject, public Syncable {
     Q_PROPERTY(bool isUrl READ isUrl NOTIFY summaryChanged)
     Q_PROPERTY(QString priorityStr READ priorityStr NOTIFY priorityChanged)
     Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
-    Q_PROPERTY(bool dueToday READ dueToday NOTIFY dueDateChanged)
-    Q_PROPERTY(bool isOverdue READ isOverdue NOTIFY dueDateChanged)
-    Q_PROPERTY(QString prettyDueDateString READ prettyDueDateString NOTIFY dueDateChanged)
-    Q_PROPERTY(QString prettyDueDateRecurString READ prettyDueDateRecurString NOTIFY dueDateChanged)
-    Q_PROPERTY(QString dueDateString READ dueDateString NOTIFY dueDateChanged)
-    Q_PROPERTY(QDate dueDate READ dueDate WRITE setDueDate NOTIFY dueDateChanged)
+    Q_PROPERTY(bool dueToday READ dueToday NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(bool isOverdue READ isOverdue NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(QString prettyDueDateString READ prettyDueDateString NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(QString prettyDueDateRecurString READ prettyDueDateRecurString NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(QString dueDateString READ dueDateString NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(QDate dueDate READ dueDate WRITE setDueDate NOTIFY dueDateDisplayTextChanged)
     Q_PROPERTY(int daysSinceLastPomodoro READ daysSinceLastPomodoro NOTIFY daysSinceLastPomodoroChanged)
     Q_PROPERTY(int daysSinceCreation READ daysSinceCreation NOTIFY daysSinceCreationChanged)
     Q_PROPERTY(bool staged READ staged WRITE setStaged NOTIFY stagedChanged)
@@ -79,10 +79,10 @@ class Task : public QObject, public Syncable {
 
     Q_PROPERTY(TaskContextMenuModel* contextMenuModel READ contextMenuModel CONSTANT)
     Q_PROPERTY(SortedTaskContextMenuModel* sortedContextMenuModel READ sortedContextMenuModel CONSTANT)
-    Q_PROPERTY(int periodType READ periodType NOTIFY dueDateChanged)
-    Q_PROPERTY(bool recurs READ recurs NOTIFY dueDateChanged)
-    Q_PROPERTY(uint frequency READ frequency WRITE setFrequency NOTIFY dueDateChanged)
-    Q_PROPERTY(QString frequencyWord READ frequencyWord NOTIFY dueDateChanged)
+    Q_PROPERTY(int periodType READ periodType NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(bool recurs READ recurs NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(uint frequency READ frequency WRITE setFrequency NOTIFY dueDateDisplayTextChanged)
+    Q_PROPERTY(QString frequencyWord READ frequencyWord NOTIFY dueDateDisplayTextChanged)
 
 public:
     typedef QSharedPointer<Task> Ptr;
@@ -206,6 +206,7 @@ public Q_SLOTS:
     void changed();
     void tagToggled(const QString &tag);
     void dueDateChanged();
+    void dueDateDisplayTextChanged();
 
 protected:
     QVector<QString> supportedFields() const Q_DECL_OVERRIDE;

tests/testtagmodel.cpp

@@ -55,8 +55,8 @@ void TestTagModel::testFromFile_data()
     QStringList expectedSignals;
     QStringList expectedSignalsInUnsortedModel;
     for (int i = 0; i < expectedNumTags; ++i) {
-        expectedSignals << "rowsAboutToBeInserted" << "rowsInserted";
-        expectedSignalsInUnsortedModel << "rowsAboutToBeInserted" << "rowsInserted";
+        // expectedSignals << "rowsAboutToBeInserted" << "rowsInserted";
+        // expectedSignalsInUnsortedModel << "rowsAboutToBeInserted" << "rowsInserted";
     }
 
     expectedSignals << "modelAboutToBeReset" << "modelReset" // Because of final assignment when loading
@@ -110,7 +110,7 @@ void TestTagModel::testFromFile()
         // qDebug() << "tag " << tag->name() << tag->taskCount();
     }
 
-    //spy->dumpDebugInfo();
+    // tagsModelSpy->dumpDebugInfo();
     QCOMPARE(tagsModelSpy->count(), expectedSignals.count());
 
     for (int i = 0; i < expectedSignals.count(); ++i) {