Merge lp:~mzanetti/reminders-app/fix-filename-extension into lp:reminders-app

[Michael Zanetti]

fix the filename extension for images

use the filename extension from the file, not the mimetype

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:361
http://91.189.93.70:8080/job/reminders-app-ci/681/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2177
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2177/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/283
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/102

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/681/rebuild

review: Approve (continuous-integration)

[lp:~mzanetti/reminders-app/fix-filename-extension]

362. By Michael Zanetti on 2015-02-28

don't crash if the image is not loaded yet

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:362
http://91.189.93.70:8080/job/reminders-app-ci/682/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2178
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/284
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/103

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/682/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm

review: Approve

=== modified file 'src/libqtevernote/note.cpp'
--- src/libqtevernote/note.cpp	2015-02-28 00:45:30 +0000
+++ src/libqtevernote/note.cpp	2015-02-28 00:45:30 +0000
@@ -683,12 +683,13 @@
 
 void Note::loadFromCacheFile() const
 {
-    qDebug() << "Loading from cacheFile:" << m_guid;
     if (m_cacheFile.exists() && m_cacheFile.open(QFile::ReadOnly)) {
         m_content.setEnml(QString::fromUtf8(m_cacheFile.readAll()).trimmed());
         m_tagline = m_content.toPlaintext().left(100);
         m_cacheFile.close();
-        qDebug() << "cache file opened" << m_tagline;
+        qDebug() << "[Storage] Loaded note from storage:" << m_guid;
+    } else {
+        qDebug() << "[Storage] Failed attempt to load note from storage:" << m_guid;
     }
     m_loaded = true;
 }

=== modified file 'src/libqtevernote/utils/enmldocument.cpp'
--- src/libqtevernote/utils/enmldocument.cpp	2015-02-24 22:21:04 +0000
+++ src/libqtevernote/utils/enmldocument.cpp	2015-02-28 00:45:30 +0000
@@ -159,8 +159,11 @@
                     if (type == TypeRichText) {
                         writer.writeAttribute("src", composeMediaTypeUrl(mediaType, noteGuid, hash));
                     } else if (type  == TypeHtml) {
-                        QString imagePath = NotesStore::instance()->storageLocation() + hash + "." + mediaType.split('/').last();
-                        writer.writeAttribute("src", imagePath);
+                        if (NotesStore::instance()->note(noteGuid)->resource(hash)) {
+                            QString fileName = NotesStore::instance()->note(noteGuid)->resource(hash)->fileName();
+                            QString imagePath = NotesStore::instance()->storageLocation() + hash + "." + fileName.split('.').last();
+                            writer.writeAttribute("src", imagePath);
+                        }
                         writer.writeAttribute("id", "en-attachment/" + hash + "/" + mediaType);
                     }