Use flatpak-spawn to run streamlink when running as a flatpak

CHANGELOG.md

@@ -15,6 +15,7 @@
 - Bugfix: Fixed a bug that caused all badge highlights to use the same color. (#3132, #3134)
 - Dev: Renamed CMake's build option `USE_SYSTEM_QT5KEYCHAIN` to `USE_SYSTEM_QTKEYCHAIN`. (#3103)
 - Dev: Add benchmarks that can be compiled with the `BUILD_BENCHMARKS` CMake flag. Off by default. (#3038)
+- Bugfix: Use `flatpak-spawn` to call streamlink when running as a Flatapk. Fixes streamlink functionality. (#3178)
 
 ## 2.3.4
 

src/common/Version.cpp

@@ -71,4 +71,9 @@ const bool &Version::isSupportedOS() const
     return this->isSupportedOS_;
 }
 
+bool Version::isFlatpak() const
+{
+    return QFileInfo::exists("/.flatpak-info");
+}
+
 }  // namespace chatterino

src/common/Version.hpp

@@ -29,6 +29,7 @@ class Version
     const QString &dateOfBuild() const;
     const QString &fullVersion() const;
     const bool &isSupportedOS() const;
+    bool isFlatpak() const;
 
 private:
     Version();

src/singletons/Updates.cpp

@@ -232,7 +232,9 @@ void Updates::installUpdates()
 
 void Updates::checkForUpdates()
 {
-    if (!Version::instance().isSupportedOS())
+    auto version = Version::instance();
+
+    if (!version.isSupportedOS())
     {
         qCDebug(chatterinoUpdate)
             << "Update checking disabled because OS doesn't appear to be one "
@@ -241,7 +243,7 @@ void Updates::checkForUpdates()
     }
 
     // Disable updates on Flatpak
-    if (QFileInfo::exists("/.flatpak-info"))
+    if (version.isFlatpak())
     {
         return;
     }

src/util/StreamLink.cpp

@@ -10,6 +10,7 @@
 #include <QFileInfo>
 #include <QProcess>
 #include "common/QLogging.hpp"
+#include "common/Version.hpp"
 
 #include <functional>
 
@@ -83,7 +84,17 @@ namespace {
     QProcess *createStreamlinkProcess()
     {
         auto p = new QProcess;
-        p->setProgram(getStreamlinkProgram());
+
+        if (Version::instance().isFlatpak())
+        {
+            p->setProgram("flatpak-spawn");
+
+            p->setArguments({"--host", getStreamlinkProgram()});
+        }
+        else
+        {
+            p->setProgram(getStreamlinkProgram());
+        }
 
         QObject::connect(p, &QProcess::errorOccurred, [=](auto err) {
             if (err == QProcess::FailedToStart)
@@ -98,6 +109,9 @@ namespace {
             p->deleteLater();
         });
 
+        qCWarning(chatterinoStreamlink)
+            << "command:" << p->program() << p->arguments().join(" ");
+
         QObject::connect(
             p,
             static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(
@@ -165,15 +179,31 @@ void getStreamQualities(const QString &channelURL,
             }
         });
 
-    p->setArguments({channelURL, "--default-stream=KKona"});
+    p->setArguments(p->arguments() +
+                    QStringList({channelURL, "--default-stream=KKona"}));
 
     p->start();
 }
 
 void openStreamlink(const QString &channelURL, const QString &quality,
                     QStringList extraArguments)
 {
-    QStringList arguments = extraArguments << channelURL << quality;
+    QStringList arguments;
+
+    QString program;
+
+    if (Version::instance().isFlatpak())
+    {
+        program = "flatpak-spawn";
+
+        arguments << "--host" << getStreamlinkProgram();
+    }
+    else
+    {
+        program = getStreamlinkProgram();
+    }
+
+    arguments << extraArguments << channelURL << quality;
 
     // Remove empty arguments before appending additional streamlink options
     // as the options might purposely contain empty arguments
@@ -182,7 +212,7 @@ void openStreamlink(const QString &channelURL, const QString &quality,
     QString additionalOptions = getSettings()->streamlinkOpts.getValue();
     arguments << splitCommand(additionalOptions);
 
-    bool res = QProcess::startDetached(getStreamlinkProgram(), arguments);
+    bool res = QProcess::startDetached(program, arguments);
 
     if (!res)
     {