Support app relocation & AppImage packing

Author: floppyhammer

3rd/revector

@@ -48,7 +48,7 @@ file(GLOB_RECURSE SRC_LIST
         src/*.h
 )
 
-file(COPY gs.key assets DESTINATION ${CMAKE_BINARY_DIR}/bin)
+file(COPY assets DESTINATION ${CMAKE_BINARY_DIR}/bin)
 
 add_executable(${PROJECT_NAME} ${SRC_LIST})
 

CMakeLists.txt

@@ -8,7 +8,8 @@ make -j$(nproc)
 make install DESTDIR=AppDir
 
 cp ./assets/logo.png ./AppDir/usr/share/icons/hicolor/128x128/apps/aviateur.png
-cp -r ./appimage-build/assets/ ./appimage-build/AppDir/
+cp -r ./bin/assets ./AppDir
+cp -r ./bin/aviateur ./AppDir/usr/bin
 
 wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
 

gs.key assets/gs.keygs.key renamed to assets/gs.key

@@ -112,7 +112,7 @@ void ControlPanel::custom_ready() {
             dongle_menu_button_->connect_signal("item_selected", callback);
 
             refresh_dongle_button_ = std::make_shared<revector::Button>();
-            auto icon = std::make_shared<revector::VectorImage>("assets/Refresh.svg");
+            auto icon = std::make_shared<revector::VectorImage>(revector::get_asset_dir("Refresh.svg"));
             refresh_dongle_button_->set_icon_normal(icon);
             refresh_dongle_button_->set_text("");
             hbox_container->add_child(refresh_dongle_button_);
@@ -206,8 +206,10 @@ void ControlPanel::custom_ready() {
             auto file_dialog = std::make_shared<revector::FileDialog>();
             add_child(file_dialog);
 
-            auto defaultKeyPath = std::filesystem::absolute(keyPath).string();
-            file_dialog->set_default_path(defaultKeyPath);
+            if (!keyPath.empty()) {
+                auto defaultKeyPath = std::filesystem::absolute(keyPath).string();
+                file_dialog->set_default_path(defaultKeyPath);
+            }
 
             auto select_button = std::make_shared<revector::Button>();
             select_button->set_text(FTR("open"));

assets/icon.ico

@@ -64,7 +64,7 @@ void PlayerRect::custom_ready() {
     auto vbox = std::make_shared<revector::VBoxContainer>();
     collapse_panel_->add_child(vbox);
 
-    logo_ = std::make_shared<revector::VectorImage>("assets/openipc-logo-white.svg");
+    logo_ = std::make_shared<revector::VectorImage>(revector::get_asset_dir("openipc-logo-white.svg"));
     texture = logo_;
 
     auto render_server = revector::RenderServer::get_singleton();
@@ -172,7 +172,7 @@ void PlayerRect::custom_ready() {
     auto capture_button = std::make_shared<revector::Button>();
     vbox->add_child(capture_button);
     capture_button->set_text(FTR("capture frame"));
-    auto icon = std::make_shared<revector::VectorImage>("assets/CaptureImage.svg");
+    auto icon = std::make_shared<revector::VectorImage>(revector::get_asset_dir("CaptureImage.svg"));
     capture_button->set_icon_normal(icon);
     auto capture_callback = [this] {
         auto output_file = player_->captureJpeg();
@@ -186,7 +186,7 @@ void PlayerRect::custom_ready() {
 
     record_button_ = std::make_shared<revector::Button>();
     vbox->add_child(record_button_);
-    auto icon2 = std::make_shared<revector::VectorImage>("assets/RecordVideo.svg");
+    auto icon2 = std::make_shared<revector::VectorImage>(revector::get_asset_dir("RecordVideo.svg"));
     record_button_->set_icon_normal(icon2);
     record_button_->set_text(FTR("record mp4") + " (F10)");
 

build-appimage.sh

@@ -119,7 +119,7 @@ class GuiInterface {
             ini_[CONFIG_ADAPTER][ADAPTER_DEVICE] = "";
             ini_[CONFIG_ADAPTER][ADAPTER_CHANNEL] = "161";
             ini_[CONFIG_ADAPTER][ADAPTER_CHANNEL_WIDTH_MODE] = "0";
-            ini_[CONFIG_ADAPTER][ADAPTER_CHANNEL_KEY] = "gs.key";
+            ini_[CONFIG_ADAPTER][ADAPTER_CHANNEL_KEY] = "";
             ini_[CONFIG_ADAPTER][ADAPTER_CHANNEL_CODEC] = "AUTO";
 
             ini_[CONFIG_STREAMING][CONFIG_STREAMING_URL] = "udp://239.0.0.1:1234";
@@ -185,7 +185,7 @@ class GuiInterface {
     static bool Start(const DeviceId &deviceId,
                       int channel,
                       int channelWidthMode,
-                      const std::string &keyPath,
+                      std::string keyPath,
                       const std::string &codec) {
         Instance().ini_[CONFIG_ADAPTER][ADAPTER_DEVICE] = deviceId.display_name;
         Instance().ini_[CONFIG_ADAPTER][ADAPTER_CHANNEL] = std::to_string(channel);
@@ -199,6 +199,11 @@ class GuiInterface {
 
         Instance().playerCodec = codec;
 
+        // If no custom key provided by the user, use the default key.
+        if (keyPath.empty()) {
+            keyPath = revector::get_asset_dir("gs.key");
+            Instance().PutLog(LogLevel::Info, "Using GS key: {}", keyPath);
+        }
         return WfbReceiver::Instance().Start(deviceId, channel, channelWidthMode, keyPath);
     }
 

src/gui/control_panel.cpp

@@ -18,9 +18,9 @@ int main() {
 
     GuiInterface::Instance().PutLog(LogLevel::Info, "revector app created");
 
-    revector::TranslationServer::get_singleton()->load_translations("assets/translations.csv");
+    revector::TranslationServer::get_singleton()->load_translations(revector::get_asset_dir("translations.csv"));
 
-    auto font = std::make_shared<revector::Font>("assets/NotoSansSC-Regular.ttf");
+    auto font = std::make_shared<revector::Font>(revector::get_asset_dir("NotoSansSC-Regular.ttf"));
     revector::DefaultResource::get_singleton()->set_default_font(font);
 
     // Initialize the default libusb context.

src/gui/player_rect.cpp

@@ -1,6 +1,7 @@
 #include "YuvRenderer.h"
 
 #include "libavutil/pixfmt.h"
+#include "resources/resource.h"
 
 std::string vertCode = R"(#version 310 es
 
@@ -222,7 +223,8 @@ void YuvRenderer::updateTextureData(const std::shared_ptr<AVFrame>& curFrameData
             mStabXform.v[6] = stabXform.at<double>(0, 2) / mTexY->get_size().x;
             mStabXform.v[7] = stabXform.at<double>(1, 2) / mTexY->get_size().y;
 
-            mStabXform = mStabXform.scale(Pathfinder::Vec2F(1.0f + (float)HORIZONTAL_BORDER_CROP / mTexY->get_size().x));
+            mStabXform =
+                mStabXform.scale(Pathfinder::Vec2F(1.0f + (float)HORIZONTAL_BORDER_CROP / mTexY->get_size().x));
         }
 
         mPreviousFrame = frameY.clone();
@@ -281,7 +283,7 @@ void YuvRenderer::updateTextureData(const std::shared_ptr<AVFrame>& curFrameData
                 texYData = enhancedFrameY.data;
             } else if (mLowLightEnhancementAdvanced) {
                 if (!mNet.has_value()) {
-                    mNet = PairLIE("assets/weights/pairlie_180x320.onnx");
+                    mNet = PairLIE(revector::get_asset_dir("weights/pairlie_180x320.onnx"));
                 }
 
                 cv::Mat originalFrameY =