Merge branch 'development' into 'master'

Development

See merge request !2

.gitlab-ci.yml

 ## AppImage
-build:deb:
+build:neon-user-lts-deb:
   image: kdeneon/plasma:user-lts
   stage: build
   before_script:
@@ -9,7 +9,7 @@ build:deb:
   script:
     - cmake -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix` -DCMAKE_BUILD_TYPE=Release .
     - make -j`nproc`
-    - cpack -G DEB
+    - cpack -G DEB -R 0.1.0-neon-user-lts
   artifacts:
     paths:
       - plasma-appimage-integration*.deb

dist/deb/CMakeLists.txt

 # Debian packaging global options
 set(CPACK_DEBIAN_COMPRESSION_TYPE xz PARENT_SCOPE)
 
+set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT PARENT_SCOPE)
+
 set(CPACK_DEBIAN_PACKAGE_PROVIDES appimage-services PARENT_SCOPE)
 
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON PARENT_SCOPE)

src/metadata-extractor/AppImageExtractor.cpp

@@ -4,6 +4,7 @@
 #include <QJsonObject>
 #include <QJsonDocument>
 #include <QDebug>
+#include <KFileMetaData/Properties>
 
 // local
 #include "AppImageExtractor.h"
@@ -42,14 +43,19 @@ void KFileMetaData::AppImageExtractor::extract(ExtractionResult* result) {
         QJsonDocument document = QJsonDocument::fromJson(response.toLocal8Bit());
         QJsonObject root = document.object();
 
-        QJsonValue nameValue = root.value("name");
-        result->add(Property::Title, nameValue.toVariant());
+        QString nameValue = root.value("name").toString();
+        if (!nameValue.isEmpty())
+            result->add(Property::Title, nameValue);
 
-        QJsonValue summary = root.value("summary");
-        result->add(Property::Description, summary.toString());
+//         Property::Description is not supported until KF5 5.53.0
+        QString summary = root.value("summary").toString();
+        if (!summary.isEmpty())
+            result->add(Property::Description, summary);
 
-        QJsonValue license = root.value("license");
-        result->add(Property::License, license.toString());
+
+        QString license = root.value("license").toString();
+        if (!license.isEmpty())
+            result->add(Property::License, license);
 
         QJsonValue links = root.value("links");
         QJsonObject linksOjbect = links.toObject();;