Refactor code

ScreenPlay/src/create.cpp

@@ -48,13 +48,12 @@ Create::Create()
 void Create::createWallpaperStart(QString videoPath, Create::VideoCodec codec)
 {
     clearFfmpegOutput();
-    videoPath.remove("file:///");
+    videoPath = Util::toLocal(videoPath);
 
-    QDir dir;
-    dir.cd(m_globalVariables->localStoragePath().toLocalFile());
+    const QDir dir(m_globalVariables->localStoragePath().toLocalFile());
 
     // Create a temp dir so we can later alter it to the workshop id
-    auto folderName = QString("_tmp_" + QTime::currentTime().toString()).replace(":", "");
+    const auto folderName = QString("_tmp_" + QTime::currentTime().toString()).replace(":", "");
 
     if (!dir.mkdir(folderName)) {
         emit createWallpaperStateChanged(CreateImportVideo::ImportVideoState::CreateTmpFolderError);
@@ -89,8 +88,8 @@ void Create::createWallpaperStart(QString videoPath, Create::VideoCodec codec)
 */
 void Create::saveWallpaper(QString title, QString description, QString filePath, QString previewImagePath, QString youtube, Create::VideoCodec codec, QVector<QString> tags)
 {
-    filePath.remove("file:///");
-    previewImagePath.remove("file:///");
+    filePath = Util::toLocal(filePath);
+    previewImagePath = Util::toLocal(previewImagePath);
 
     emit createWallpaperStateChanged(CreateImportVideo::ImportVideoState::CopyFiles);
 

ScreenPlay/src/createimportvideo.cpp

@@ -36,14 +36,8 @@ CreateImportVideo::CreateImportVideo(const QString& videoPath, const QString& ex
     m_codecs = codecs;
     m_process = std::make_unique<QProcess>(this);
 
-#ifdef Q_OS_WIN
-    const QString fileEnding = ".exe";
-#else
-    const QString fileEnding = "";
-#endif
-
-    m_ffprobeExecutable = QApplication::applicationDirPath() + "/ffprobe" + fileEnding;
-    m_ffmpegExecutable = QApplication::applicationDirPath() + "/ffmpeg" + fileEnding;
+    m_ffprobeExecutable = QApplication::applicationDirPath() + "/ffprobe" + Util::executableEnding();
+    m_ffmpegExecutable = QApplication::applicationDirPath() + "/ffmpeg" + Util::executableEnding();
 }
 
 /*!

ScreenPlay/src/installedlistmodel.cpp

@@ -171,7 +171,7 @@ void InstalledListModel::loadInstalledContent()
                 if (obj->isEmpty())
                     continue;
 
-                if (!obj->contains("file") || !obj->contains("type"))
+                if (!obj->contains("type"))
                     continue;
 
                 if (GlobalVariables::getAvailableTypes().contains(obj->value("type").toString())) {

ScreenPlay/src/util.cpp

@@ -106,6 +106,18 @@ QString Util::generateRandomString(quint32 length)
     return randomString;
 }
 
+/*!
+  \brief Return .exe in windows otherwise empty string.
+*/
+QString Util::executableEnding()
+{
+#ifdef Q_OS_WIN
+    return ".exe";
+#else
+    return "";
+#endif
+}
+
 /*!
   \brief Parses a version from a given QString. The QString must be looke like this:
   1.0.0 - Major.Minor.Patch. A fixed position is used for parsing (at 0,2,4).

ScreenPlay/src/util.h

@@ -122,6 +122,7 @@ public slots:
     static QString toString(const QStringList& list);
     static QString toLocal(const QString& url);
     static QString generateRandomString(quint32 length = 32);
+    static QString executableEnding();
 
     void setNavigation(QString nav)
     {

ScreenPlayWidget/src/widgetwindow.cpp

@@ -19,8 +19,8 @@ WidgetWindow::WidgetWindow(
     QObject::connect(m_sdk.get(), &ScreenPlaySDK::incommingMessage, this, &WidgetWindow::messageReceived);
 
     QStringList availableTypes {
-        "QMLWidget",
-        "HTMLWidget"
+        "qmlWidget",
+        "htmlWidget"
     };
 
     if (!availableTypes.contains(m_type, Qt::CaseSensitivity::CaseInsensitive)) {
@@ -46,7 +46,7 @@ WidgetWindow::WidgetWindow(
     } else {
         QFile configTmp;
         QJsonDocument configJsonDocument;
-        QJsonParseError parseError{};
+        QJsonParseError parseError {};
 
         configTmp.setFileName(projectPath + "/project.json");
         configTmp.open(QIODevice::ReadOnly | QIODevice::Text);