From dd4acf1369784f1729dfcc3dc9a3c9ca3c95fa34 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:21:52 -0400
Subject: [PATCH 001/140] Create rust.yml

---
 .github/workflows/rust.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/rust.yml

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
new file mode 100644
index 00000000..000bb2c4
--- /dev/null
+++ b/.github/workflows/rust.yml
@@ -0,0 +1,22 @@
+name: Rust
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose

From c91d4b75592ba8e13d3f536122f0dbfbf6adbfca Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:22:38 -0400
Subject: [PATCH 002/140] Update rust.yml

---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 000bb2c4..b7258bdd 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -17,6 +17,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Build
-      run: cargo build --verbose
+      run: cd napture && cargo build --verbose
     - name: Run tests
-      run: cargo test --verbose
+      run: cd napture && cargo test --verbose

From 034bfc6ed12a6d38d0d274f0142f1668b41f9234 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:25:31 -0400
Subject: [PATCH 003/140] Update rust.yml

---
 .github/workflows/rust.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b7258bdd..dec5628a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -16,7 +16,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    
+    - name: Install system dependencies
+      run: sudo apt-get update && sudo apt-get install -y libpango1.0-dev
+
+    - name: Set PKG_CONFIG_PATH
+      run: echo "/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV
+
     - name: Build
       run: cd napture && cargo build --verbose
+
     - name: Run tests
       run: cd napture && cargo test --verbose

From 7db235f7c250b9a96915ac2493562e9ebf63e766 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:31:59 -0400
Subject: [PATCH 004/140] Update rust.yml

---
 .github/workflows/rust.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index dec5628a..25735402 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -14,17 +14,14 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    env:
+      PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig
+
     steps:
     - uses: actions/checkout@v4
-    
     - name: Install system dependencies
       run: sudo apt-get update && sudo apt-get install -y libpango1.0-dev
-
-    - name: Set PKG_CONFIG_PATH
-      run: echo "/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV
-
     - name: Build
       run: cd napture && cargo build --verbose
-
     - name: Run tests
       run: cd napture && cargo test --verbose

From 1560f9aff291cc7c38b6547b6d958203c5881bef Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:33:33 -0400
Subject: [PATCH 005/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 25735402..78025154 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Install system dependencies
-      run: sudo apt-get update && sudo apt-get install -y libpango1.0-dev
+      run: sudo apt-get update && sudo apt-get install -y libpango1.0-dev libgtk-4-dev
     - name: Build
       run: cd napture && cargo build --verbose
     - name: Run tests

From 5838178c2a4b732e2915cc81d374ac88e06793bb Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:35:59 -0400
Subject: [PATCH 006/140] Update rust.yml

---
 .github/workflows/rust.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 78025154..45a858da 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -14,14 +14,19 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    env:
-      PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig
-
     steps:
     - uses: actions/checkout@v4
     - name: Install system dependencies
       run: sudo apt-get update && sudo apt-get install -y libpango1.0-dev libgtk-4-dev
+    - name: Check pkg-config path
+      run: |
+        export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig:/usr/lib/pkgconfig
+        pkg-config --cflags --libs gtk4
     - name: Build
-      run: cd napture && cargo build --verbose
+      run: |
+        export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig:/usr/lib/pkgconfig
+        cd napture && cargo build --verbose
     - name: Run tests
-      run: cd napture && cargo test --verbose
+      run: |
+        export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig:/usr/lib/pkgconfig
+        cd napture && cargo test --verbose

From 78355c1e693a6c36db4870ae233f402f5d62d341 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:37:42 -0400
Subject: [PATCH 007/140] Update rust.yml

---
 .github/workflows/rust.yml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 45a858da..b06696f2 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -11,22 +11,13 @@ env:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
-    - name: Install system dependencies
-      run: sudo apt-get update && sudo apt-get install -y libpango1.0-dev libgtk-4-dev
-    - name: Check pkg-config path
-      run: |
-        export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig:/usr/lib/pkgconfig
-        pkg-config --cflags --libs gtk4
+    - name: Install dependencies
+      run: sudo apt-get update && sudo apt-get install -y libgtk-4-dev
     - name: Build
-      run: |
-        export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig:/usr/lib/pkgconfig
-        cd napture && cargo build --verbose
+      run: cd napture && cargo build --verbose
     - name: Run tests
-      run: |
-        export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig:/usr/lib/pkgconfig
-        cd napture && cargo test --verbose
+      run: cd napture && cargo test --verbose

From 7d7e70cc29b4125e2626ef144f0973b09e2ba34c Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:39:21 -0400
Subject: [PATCH 008/140] Update rust.yml

---
 .github/workflows/rust.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b06696f2..75e3afde 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -15,8 +15,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - name: Add PPA for GTK4
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y software-properties-common
+        sudo add-apt-repository ppa:gnome3-team/gnome3-staging
+        sudo apt-get update
     - name: Install dependencies
-      run: sudo apt-get update && sudo apt-get install -y libgtk-4-dev
+      run: sudo apt-get install -y libgtk-4-dev
     - name: Build
       run: cd napture && cargo build --verbose
     - name: Run tests

From ddcb34ba10047cc6597ae479e9a67285e99658cd Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:41:24 -0400
Subject: [PATCH 009/140] Update rust.yml

---
 .github/workflows/rust.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 75e3afde..2a6f1162 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -15,14 +15,16 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Add PPA for GTK4
+    - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y software-properties-common
-        sudo add-apt-repository ppa:gnome3-team/gnome3-staging
-        sudo apt-get update
-    - name: Install dependencies
-      run: sudo apt-get install -y libgtk-4-dev
+        sudo apt-get install -y --no-install-recommends \
+          libpango1.0-dev \
+          software-properties-common \
+          sudo dpkg --add-architecture i386 \
+          sudo add-apt-repository 'deb http://deb.debian.org/debian sid main' \
+          sudo apt-get update \
+          sudo apt-get install -y libgtk-4-dev
     - name: Build
       run: cd napture && cargo build --verbose
     - name: Run tests

From 5e0aa7215f8d5fd64c84cd8a3761fd8a1474c609 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:45:41 -0400
Subject: [PATCH 010/140] Update rust.yml

---
 .github/workflows/rust.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 2a6f1162..ef9d7e1e 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -19,12 +19,12 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y --no-install-recommends \
-          libpango1.0-dev \
-          software-properties-common \
-          sudo dpkg --add-architecture i386 \
-          sudo add-apt-repository 'deb http://deb.debian.org/debian sid main' \
-          sudo apt-get update \
-          sudo apt-get install -y libgtk-4-dev
+        libpango1.0-dev \
+        software-properties-common
+        sudo dpkg --add-architecture i386
+        sudo add-apt-repository 'deb http://deb.debian.org/debian sid main'
+        sudo apt-get update
+        sudo apt-get install -y libgtk-4-dev
     - name: Build
       run: cd napture && cargo build --verbose
     - name: Run tests

From ff709a5e71242d8d529598ad7823e538d67c9e74 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:47:32 -0400
Subject: [PATCH 011/140] Update rust.yml

---
 .github/workflows/rust.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index ef9d7e1e..32fcb20a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -17,14 +17,15 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install dependencies
       run: |
-        sudo apt-get update
-        sudo apt-get install -y --no-install-recommends \
-        libpango1.0-dev \
-        software-properties-common
-        sudo dpkg --add-architecture i386
-        sudo add-apt-repository 'deb http://deb.debian.org/debian sid main'
-        sudo apt-get update
-        sudo apt-get install -y libgtk-4-dev
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends \
+          libpango1.0-dev \
+          software-properties-common
+          sudo dpkg --add-architecture i386
+          sudo add-apt-repository 'deb http://deb.debian.org/debian sid main'
+          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 6ED0E7B82643E131
+          sudo apt-get update
+          sudo apt-get install -y libgtk-4-dev
     - name: Build
       run: cd napture && cargo build --verbose
     - name: Run tests

From 7da8c00b665ebe935d1ab784bec93cda52f78487 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:50:18 -0400
Subject: [PATCH 012/140] Update rust.yml

---
 .github/workflows/rust.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 32fcb20a..e3844e81 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -27,6 +27,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libgtk-4-dev
     - name: Build
-      run: cd napture && cargo build --verbose
+      run: |
+        cd napture
+        export PKG_CONFIG_PATH=/usr/lib/pkgconfig
+        cargo build --verbose
     - name: Run tests
-      run: cd napture && cargo test --verbose
+      run: |
+        cd napture 
+        cargo test --verbose

From 72a3ad0a1d28a89b0183d8f570c975824ea8d7f5 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:53:15 -0400
Subject: [PATCH 013/140] Update rust.yml

---
 .github/workflows/rust.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index e3844e81..e661a153 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -17,15 +17,16 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install dependencies
       run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends \
-          libpango1.0-dev \
-          software-properties-common
-          sudo dpkg --add-architecture i386
-          sudo add-apt-repository 'deb http://deb.debian.org/debian sid main'
-          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 6ED0E7B82643E131
-          sudo apt-get update
-          sudo apt-get install -y libgtk-4-dev
+        sudo apt-get update
+        sudo apt-get install -y --no-install-recommends \
+        libpango1.0-dev \
+        software-properties-common \
+        gtk4-dev
+        sudo dpkg --add-architecture i386
+        sudo add-apt-repository 'deb http://deb.debian.org/debian sid main'
+        sudo apt-get update
+        sudo apt-get install -y libgtk-4-dev
+
     - name: Build
       run: |
         cd napture

From 622f374fb695ee209ef5efedf0cdbf75a2c26a9e Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:58:04 -0400
Subject: [PATCH 014/140] Update rust.yml

---
 .github/workflows/rust.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index e661a153..284f59be 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -20,12 +20,14 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y --no-install-recommends \
         libpango1.0-dev \
-        software-properties-common \
-        gtk4-dev
+        software-properties-common
         sudo dpkg --add-architecture i386
         sudo add-apt-repository 'deb http://deb.debian.org/debian sid main'
         sudo apt-get update
-        sudo apt-get install -y libgtk-4-dev
+        sudo apt-get install -y \
+        libgtk-4-dev \
+        libgtk-4-1
+
 
     - name: Build
       run: |

From 9c7062f2bcd2991e95eac408c387b6ae9bec9793 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:00:05 -0400
Subject: [PATCH 015/140] Update rust.yml

---
 .github/workflows/rust.yml | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 284f59be..259bef58 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -19,22 +19,9 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y --no-install-recommends \
-        libpango1.0-dev \
-        software-properties-common
-        sudo dpkg --add-architecture i386
-        sudo add-apt-repository 'deb http://deb.debian.org/debian sid main'
-        sudo apt-get update
-        sudo apt-get install -y \
-        libgtk-4-dev \
-        libgtk-4-1
-
-
+          libgtk-3-dev \
+          libpango1.0-dev
     - name: Build
-      run: |
-        cd napture
-        export PKG_CONFIG_PATH=/usr/lib/pkgconfig
-        cargo build --verbose
+      run: cd napture && cargo build --verbose
     - name: Run tests
-      run: |
-        cd napture 
-        cargo test --verbose
+      run: cd napture && cargo test --verbose

From 18e38f0e9fe95c27a8591a1a5b06c9aa70e89b7d Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:06:32 -0400
Subject: [PATCH 016/140] Update rust.yml

---
 .github/workflows/rust.yml | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 259bef58..ad5f9193 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -15,13 +15,31 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Install dependencies
+    - name: Install Dependencies
       run: |
-        sudo apt-get update
-        sudo apt-get install -y --no-install-recommends \
-          libgtk-3-dev \
-          libpango1.0-dev
-    - name: Build
-      run: cd napture && cargo build --verbose
-    - name: Run tests
-      run: cd napture && cargo test --verbose
+          echo "Installing dependencies..."
+          if [ -f /etc/os-release ]; then
+              PRETTY_NAME=$(grep '^PRETTY_NAME=' /etc/os-release | cut -d '=' -f2- | tr -d '"')
+              if [ "$PRETTY_NAME" == "Ubuntu 24.04 LTS" ]; then
+                  echo "Detected $PRETTY_NAME and installing dependencies..."
+                  sudo apt-get update
+                  sudo apt-get install -y curl git build-essential libssl-dev libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
+                  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+                  echo "Dependencies installed."
+              else
+                  echo "Could not detect the Linux distribution and version. Now continuing with build, without attempting to install dependencies."
+              fi
+          else
+              echo "Could not detect the Linux distribution and version. Now continuing with build, without attempting to install dependencies."
+          fi
+
+    - name: Update Repository
+      run: |
+          echo "Updating repository..."
+          git pull origin $(git rev-parse --abbrev-ref HEAD)
+
+    - name: Build Napture
+      run: |
+          echo "Building Napture..."
+          cd napture || exit 1
+          cargo build --verbose

From c49f5a6e22851d4bccac1dd0cfd56fa46d46f708 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:06:40 -0400
Subject: [PATCH 017/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index ad5f9193..df208f9d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -41,5 +41,5 @@ jobs:
     - name: Build Napture
       run: |
           echo "Building Napture..."
-          cd napture || exit 1
+          cd napture
           cargo build --verbose

From b34f83110bba3ef12737edd648c1248b017f1e86 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:07:47 -0400
Subject: [PATCH 018/140] Update rust.yml

---
 .github/workflows/rust.yml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index df208f9d..1f899d0f 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -18,20 +18,10 @@ jobs:
     - name: Install Dependencies
       run: |
           echo "Installing dependencies..."
-          if [ -f /etc/os-release ]; then
-              PRETTY_NAME=$(grep '^PRETTY_NAME=' /etc/os-release | cut -d '=' -f2- | tr -d '"')
-              if [ "$PRETTY_NAME" == "Ubuntu 24.04 LTS" ]; then
-                  echo "Detected $PRETTY_NAME and installing dependencies..."
-                  sudo apt-get update
-                  sudo apt-get install -y curl git build-essential libssl-dev libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
-                  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-                  echo "Dependencies installed."
-              else
-                  echo "Could not detect the Linux distribution and version. Now continuing with build, without attempting to install dependencies."
-              fi
-          else
-              echo "Could not detect the Linux distribution and version. Now continuing with build, without attempting to install dependencies."
-          fi
+          sudo apt-get update
+          sudo apt-get install -y curl git build-essential libssl-dev libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+          echo "Dependencies installed."
 
     - name: Update Repository
       run: |

From bad9e1e73bb2a5ebfe597820e1859c46049ac174 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:08:43 -0400
Subject: [PATCH 019/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 1f899d0f..ba35f99d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -20,7 +20,7 @@ jobs:
           echo "Installing dependencies..."
           sudo apt-get update
           sudo apt-get install -y curl git build-essential libssl-dev libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -y
           echo "Dependencies installed."
 
     - name: Update Repository

From 0434e95a6e29733e7030b9f73c05c9ee4b5fd505 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:10:53 -0400
Subject: [PATCH 020/140] Update rust.yml

---
 .github/workflows/rust.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index ba35f99d..8e4bacaf 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -17,16 +17,11 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install Dependencies
       run: |
-          echo "Installing dependencies..."
-          sudo apt-get update
-          sudo apt-get install -y curl git build-essential libssl-dev libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -y
-          echo "Dependencies installed."
-
-    - name: Update Repository
-      run: |
-          echo "Updating repository..."
-          git pull origin $(git rev-parse --abbrev-ref HEAD)
+        echo "Installing dependencies and Rustup..."
+        sudo apt-get update
+        sudo apt-get install -y curl git build-essential libssl-dev libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
+        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+        echo "Dependencies and Rustup installed."
 
     - name: Build Napture
       run: |

From be3eb2d608dabaeda98abbcd491ecd8d39eab006 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:14:48 -0400
Subject: [PATCH 021/140] Update rust.yml

---
 .github/workflows/rust.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 8e4bacaf..68466309 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Install Dependencies
+    - name: Install Dependencies and Rustup
       run: |
         echo "Installing dependencies and Rustup..."
         sudo apt-get update
@@ -23,8 +23,15 @@ jobs:
         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
         echo "Dependencies and Rustup installed."
 
-    - name: Build Napture
+    - name: Set PKG_CONFIG_PATH
       run: |
-          echo "Building Napture..."
-          cd napture
-          cargo build --verbose
+        export PKG_CONFIG_PATH=/usr/lib/pkgconfig
+        echo "PKG_CONFIG_PATH set to /usr/lib/pkgconfig"
+
+    - name: Build and Install Napture
+      run: |
+        echo "Building Napture..."
+        cd napture
+        cargo build --verbose
+        echo "Napture built successfully."
+

From d4fc06c555cc831532daaeaaaea2e3f34ac22c71 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:16:17 -0400
Subject: [PATCH 022/140] Update rust.yml

---
 .github/workflows/rust.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 68466309..2e0fc97d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -23,15 +23,11 @@ jobs:
         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
         echo "Dependencies and Rustup installed."
 
-    - name: Set PKG_CONFIG_PATH
-      run: |
-        export PKG_CONFIG_PATH=/usr/lib/pkgconfig
-        echo "PKG_CONFIG_PATH set to /usr/lib/pkgconfig"
-
     - name: Build and Install Napture
       run: |
         echo "Building Napture..."
         cd napture
+        export PKG_CONFIG_PATH=/usr/lib/pkgconfig
         cargo build --verbose
         echo "Napture built successfully."
 

From f85e9e8498d4c496c196dc389443d536d7479c64 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:21:26 -0400
Subject: [PATCH 023/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 2e0fc97d..7cde730d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v4

From cf17867c8c987ec1e07706ecb61a415899ffd452 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:23:18 -0400
Subject: [PATCH 024/140] Update rust.yml

---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 7cde730d..c5d7d476 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-
+#curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y FUCK
 jobs:
   build:
     runs-on: ubuntu-24.04
@@ -20,7 +20,7 @@ jobs:
         echo "Installing dependencies and Rustup..."
         sudo apt-get update
         sudo apt-get install -y curl git build-essential libssl-dev libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
-        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+        
         echo "Dependencies and Rustup installed."
 
     - name: Build and Install Napture

From 670c2a9b79724abd46c6e34bc14a1cbb56242abc Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:24:35 -0400
Subject: [PATCH 025/140] Update rust.yml

---
 .github/workflows/rust.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index c5d7d476..f622a4e7 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -19,8 +19,7 @@ jobs:
       run: |
         echo "Installing dependencies and Rustup..."
         sudo apt-get update
-        sudo apt-get install -y curl git build-essential libssl-dev libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
-        
+        sudo apt-get install -y libssl-dev libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
         echo "Dependencies and Rustup installed."
 
     - name: Build and Install Napture

From 956332217cbefe79ed5b72a483b0f084f4e8102f Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:29:51 -0400
Subject: [PATCH 026/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index f622a4e7..516b23e4 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -19,7 +19,7 @@ jobs:
       run: |
         echo "Installing dependencies and Rustup..."
         sudo apt-get update
-        sudo apt-get install -y libssl-dev libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
+        sudo apt-get install -y libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
         echo "Dependencies and Rustup installed."
 
     - name: Build and Install Napture

From e862790e1d2302feb35b901f129936577f5488d1 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 14:35:44 -0400
Subject: [PATCH 027/140] Remove unneeded comment

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 516b23e4..a57cfb98 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-#curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y FUCK
+
 jobs:
   build:
     runs-on: ubuntu-24.04

From 2c38622d5830bed84cf8c5cb917c6e7ef01f765f Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 19:15:25 -0400
Subject: [PATCH 028/140] Fix minor typos

---
 .github/workflows/rust.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index a57cfb98..3e6ad7f7 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -15,14 +15,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Install Dependencies and Rustup
+    - name: Install Dependencies
       run: |
-        echo "Installing dependencies and Rustup..."
+        echo "Installing dependencies..."
         sudo apt-get update
         sudo apt-get install -y libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
-        echo "Dependencies and Rustup installed."
+        echo "Dependencies installed."
 
-    - name: Build and Install Napture
+    - name: Build Napture
       run: |
         echo "Building Napture..."
         cd napture

From dfdd7d128ea52316ac66a16995b1b068a2e1dd25 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 19:21:51 -0400
Subject: [PATCH 029/140] Test removal of lua lib

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 3e6ad7f7..fbd87280 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -19,7 +19,7 @@ jobs:
       run: |
         echo "Installing dependencies..."
         sudo apt-get update
-        sudo apt-get install -y libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
+        sudo apt-get install -y libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev 
         echo "Dependencies installed."
 
     - name: Build Napture

From 88687fedeaab7564ef3b446a470a4ade32fccf3a Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:26:36 -0400
Subject: [PATCH 030/140] feat: Upload AppImage build to releases
 automatically.

This is a TEST. I used online resources to find these snippets along with official github docs.
---
 .github/workflows/rust.yml | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index fbd87280..ecff846d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -29,4 +29,29 @@ jobs:
         export PKG_CONFIG_PATH=/usr/lib/pkgconfig
         cargo build --verbose
         echo "Napture built successfully."
-
+    - name: Install AppImageTool
+      run: |
+        echo "Installing AppImageTool..."
+        wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+        chmod +x appimagetool-x86_64.AppImage
+        echo "AppImageTool installed."
+    - name: Create Napture AppImage
+      run: |
+        echo "Creating Napture AppImage..."
+        cd napture
+        mkdir -p AppDir/usr/bin
+        cp target/debug/napture AppDir/usr/bin/
+        cp -r resources AppDir/usr/
+        cp ../webx-github-actions/napture/io.github.face_hh.Napture.desktop AppDir/
+        cp ../webx-github-actions/napture/io.github.face_hh.Napture.svg AppDir/
+        ./appimagetool-x86_64.AppImage AppDir
+        echo "AppImage created successfully."
+    - name: Publish AppImage to Releases
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: napture-x86_64.AppImage
+        asset_name: napture-x86_64.AppImage
+        asset_content_type: application/octet-stream

From fd3afeac34f089017b8584bde4ce63ee43dc6731 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:29:15 -0400
Subject: [PATCH 031/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index ecff846d..1fbe1b0b 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -27,7 +27,7 @@ jobs:
         echo "Building Napture..."
         cd napture
         export PKG_CONFIG_PATH=/usr/lib/pkgconfig
-        cargo build --verbose
+        cargo build --release
         echo "Napture built successfully."
     - name: Install AppImageTool
       run: |

From abf9fa295a96704a2f6eb4d7a11adaf30ee1e615 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:30:14 -0400
Subject: [PATCH 032/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 1fbe1b0b..a4184849 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -40,7 +40,7 @@ jobs:
         echo "Creating Napture AppImage..."
         cd napture
         mkdir -p AppDir/usr/bin
-        cp target/debug/napture AppDir/usr/bin/
+        cp target/release/napture AppDir/usr/bin/
         cp -r resources AppDir/usr/
         cp ../webx-github-actions/napture/io.github.face_hh.Napture.desktop AppDir/
         cp ../webx-github-actions/napture/io.github.face_hh.Napture.svg AppDir/

From f5aeaff226a6118a393cb3027d2a050f5bdb30cc Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:33:47 -0400
Subject: [PATCH 033/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index a4184849..27c6af14 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -40,7 +40,7 @@ jobs:
         echo "Creating Napture AppImage..."
         cd napture
         mkdir -p AppDir/usr/bin
-        cp target/release/napture AppDir/usr/bin/
+        cp target/release/ AppDir/usr/bin/
         cp -r resources AppDir/usr/
         cp ../webx-github-actions/napture/io.github.face_hh.Napture.desktop AppDir/
         cp ../webx-github-actions/napture/io.github.face_hh.Napture.svg AppDir/

From 5f23d89402ccafc6d151372236c9c67e2c0e15bd Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:37:53 -0400
Subject: [PATCH 034/140] Update rust.yml

---
 .github/workflows/rust.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 27c6af14..6cc3e21a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -40,8 +40,7 @@ jobs:
         echo "Creating Napture AppImage..."
         cd napture
         mkdir -p AppDir/usr/bin
-        cp target/release/ AppDir/usr/bin/
-        cp -r resources AppDir/usr/
+        cp -r target/release/ AppDir/usr/bin/
         cp ../webx-github-actions/napture/io.github.face_hh.Napture.desktop AppDir/
         cp ../webx-github-actions/napture/io.github.face_hh.Napture.svg AppDir/
         ./appimagetool-x86_64.AppImage AppDir

From 19ef35f692d9e0296f556d0b6cdb4512a01a5f40 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:40:58 -0400
Subject: [PATCH 035/140] Update rust.yml

---
 .github/workflows/rust.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 6cc3e21a..b90a0cec 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -41,16 +41,14 @@ jobs:
         cd napture
         mkdir -p AppDir/usr/bin
         cp -r target/release/ AppDir/usr/bin/
-        cp ../webx-github-actions/napture/io.github.face_hh.Napture.desktop AppDir/
-        cp ../webx-github-actions/napture/io.github.face_hh.Napture.svg AppDir/
+        cp io.github.face_hh.Napture.desktop AppDir/
+        cp io.github.face_hh.Napture.svg AppDir/
         ./appimagetool-x86_64.AppImage AppDir
         echo "AppImage created successfully."
     - name: Publish AppImage to Releases
-      uses: actions/upload-release-asset@v1
+      uses: actions/upload-artifact@v4.3.3
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: ${{ github.event.release.upload_url }}
-        asset_path: napture-x86_64.AppImage
-        asset_name: napture-x86_64.AppImage
-        asset_content_type: application/octet-stream
+        path: napture-x86_64.AppImage
+        name: napture-x86_64.AppImage

From 8cf4e13f5c465b1741f0dcd99c0c6446b4edf54a Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:44:44 -0400
Subject: [PATCH 036/140] Update rust.yml

---
 .github/workflows/rust.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b90a0cec..b5455c80 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -32,6 +32,7 @@ jobs:
     - name: Install AppImageTool
       run: |
         echo "Installing AppImageTool..."
+        cd napture
         wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
         chmod +x appimagetool-x86_64.AppImage
         echo "AppImageTool installed."

From e29d98c2475895256bc0232f9f7bb8bb6f4b0e8e Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:48:00 -0400
Subject: [PATCH 037/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b5455c80..493c7812 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -44,7 +44,7 @@ jobs:
         cp -r target/release/ AppDir/usr/bin/
         cp io.github.face_hh.Napture.desktop AppDir/
         cp io.github.face_hh.Napture.svg AppDir/
-        ./appimagetool-x86_64.AppImage AppDir
+        ./appimagetool-x86_64.AppImage AppDir --appimage-extract
         echo "AppImage created successfully."
     - name: Publish AppImage to Releases
       uses: actions/upload-artifact@v4.3.3

From 85a79a69a83215346d09d2a2c38b11aff8906e85 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:51:44 -0400
Subject: [PATCH 038/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 493c7812..77f6c463 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -51,5 +51,5 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        path: napture-x86_64.AppImage
+        path: napture/napture-x86_64.AppImage
         name: napture-x86_64.AppImage

From 450459d6611b463cfb1690a976675e6cbe614251 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:55:06 -0400
Subject: [PATCH 039/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 77f6c463..b21b2698 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -51,5 +51,5 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        path: napture/napture-x86_64.AppImage
+        path: /napture/napture-x86_64.AppImage
         name: napture-x86_64.AppImage

From 88a244fa656c0b2760c2e504ac54c18db663594a Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 21:01:08 -0400
Subject: [PATCH 040/140] Fix issues

---
 .github/workflows/rust.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b21b2698..809f9527 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -32,7 +32,6 @@ jobs:
     - name: Install AppImageTool
       run: |
         echo "Installing AppImageTool..."
-        cd napture
         wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
         chmod +x appimagetool-x86_64.AppImage
         echo "AppImageTool installed."
@@ -41,15 +40,16 @@ jobs:
         echo "Creating Napture AppImage..."
         cd napture
         mkdir -p AppDir/usr/bin
-        cp -r target/release/ AppDir/usr/bin/
+        cp target/release/webx AppDir/usr/bin/
         cp io.github.face_hh.Napture.desktop AppDir/
         cp io.github.face_hh.Napture.svg AppDir/
-        ./appimagetool-x86_64.AppImage AppDir --appimage-extract
+         ../appimagetool-x86_64.AppImage AppDir --appimage-extract
+        mv Napture-x86_64.AppImage ../napture-x86_64.AppImage
         echo "AppImage created successfully."
     - name: Publish AppImage to Releases
       uses: actions/upload-artifact@v4.3.3
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        path: /napture/napture-x86_64.AppImage
+        path: napture-x86_64.AppImage
         name: napture-x86_64.AppImage

From 16afe616760d558cd4624696529da224949e8fa9 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 21:07:24 -0400
Subject: [PATCH 041/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 809f9527..f36ebccb 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -43,6 +43,8 @@ jobs:
         cp target/release/webx AppDir/usr/bin/
         cp io.github.face_hh.Napture.desktop AppDir/
         cp io.github.face_hh.Napture.svg AppDir/
+        ARCH=x86_64
+        APPIMAGETOOL_APP_NAME="Bussin.Napture-x86_64"
          ../appimagetool-x86_64.AppImage AppDir --appimage-extract
         mv Napture-x86_64.AppImage ../napture-x86_64.AppImage
         echo "AppImage created successfully."

From 8e9929aeb5fad92cbf10cccf0d132cde93304145 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 21:08:33 -0400
Subject: [PATCH 042/140] Update rust.yml

---
 .github/workflows/rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index f36ebccb..ae1a288f 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -46,12 +46,12 @@ jobs:
         ARCH=x86_64
         APPIMAGETOOL_APP_NAME="Bussin.Napture-x86_64"
          ../appimagetool-x86_64.AppImage AppDir --appimage-extract
-        mv Napture-x86_64.AppImage ../napture-x86_64.AppImage
+        mv Bussin.Napture-x86_64.AppImage ../Bussin.Napture-x86_64.AppImage
         echo "AppImage created successfully."
     - name: Publish AppImage to Releases
       uses: actions/upload-artifact@v4.3.3
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        path: napture-x86_64.AppImage
-        name: napture-x86_64.AppImage
+        path: Bussin.Napture-x86_64.AppImage
+        name: Bussin.Napture-x86_64.AppImage

From d3bf97bfef91c6cb30d1c8aa58083182cbff207d Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 21:12:10 -0400
Subject: [PATCH 043/140] Update rust.yml

---
 .github/workflows/rust.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index ae1a288f..627642ac 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -44,9 +44,8 @@ jobs:
         cp io.github.face_hh.Napture.desktop AppDir/
         cp io.github.face_hh.Napture.svg AppDir/
         ARCH=x86_64
-        APPIMAGETOOL_APP_NAME="Bussin.Napture-x86_64"
          ../appimagetool-x86_64.AppImage AppDir --appimage-extract
-        mv Bussin.Napture-x86_64.AppImage ../Bussin.Napture-x86_64.AppImage
+        mv webx-x86_64.AppImage ../Bussin.Napture-x86_64.AppImage
         echo "AppImage created successfully."
     - name: Publish AppImage to Releases
       uses: actions/upload-artifact@v4.3.3

From 587712711665b11aa1fdb7012684c3c72597fa3d Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 21:28:15 -0400
Subject: [PATCH 044/140] Update rust.yml

---
 .github/workflows/rust.yml | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 627642ac..05db8fa3 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -11,6 +11,7 @@ env:
 
 jobs:
   build:
+    name: "Build Napture"
     runs-on: ubuntu-24.04
 
     steps:
@@ -31,10 +32,12 @@ jobs:
         echo "Napture built successfully."
     - name: Install AppImageTool
       run: |
+        echo "Starting artifact upload phase..."
         echo "Installing AppImageTool..."
         wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
         chmod +x appimagetool-x86_64.AppImage
         echo "AppImageTool installed."
+    #DEBUGGING: LIST FILES TO FIND THE APPIMAGE.
     - name: Create Napture AppImage
       run: |
         echo "Creating Napture AppImage..."
@@ -45,12 +48,34 @@ jobs:
         cp io.github.face_hh.Napture.svg AppDir/
         ARCH=x86_64
          ../appimagetool-x86_64.AppImage AppDir --appimage-extract
+        ls
         mv webx-x86_64.AppImage ../Bussin.Napture-x86_64.AppImage
         echo "AppImage created successfully."
-    - name: Publish AppImage to Releases
-      uses: actions/upload-artifact@v4.3.3
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Rename AppImage
+      run: |
+        echo "Renaming AppImage..."
+        mv naputure-x86_64.AppImage naputure-v${{ github.sha }}.AppImage
+        echo "AppImage renamed successfully."
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
       with:
-        path: Bussin.Napture-x86_64.AppImage
-        name: Bussin.Napture-x86_64.AppImage
+        name: napture-v${{ github.sha }}.AppImage
+        path: napture-v${{ github.sha }}.AppImage
+  upload:
+   name: "Upload Release"
+   runs-on: ubuntu-24.04
+   steps:
+      - name: Download Artifact
+        uses: actions/download-artifact@v4.1.7
+        with:
+          name: Bussin.Napture-x86_64.AppImage
+      - name: Publish AppImage to Releases
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: napture-v${{ github.sha }}.AppImage
+          asset_name: napture-v${{ github.sha }}.AppImage
+          asset_content_type: application/octet-stream

From b3b05521d203a6f9b5853932cfc33bfabe122a11 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 21:33:59 -0400
Subject: [PATCH 045/140] Update rust.yml

---
 .github/workflows/rust.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 05db8fa3..8a980b8c 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -48,13 +48,13 @@ jobs:
         cp io.github.face_hh.Napture.svg AppDir/
         ARCH=x86_64
          ../appimagetool-x86_64.AppImage AppDir --appimage-extract
-        ls
+        cd AppDir && ls
         mv webx-x86_64.AppImage ../Bussin.Napture-x86_64.AppImage
         echo "AppImage created successfully."
     - name: Rename AppImage
       run: |
         echo "Renaming AppImage..."
-        mv naputure-x86_64.AppImage naputure-v${{ github.sha }}.AppImage
+        mv naputure-x86_64.AppImage napture-v${{ github.sha }}.AppImage
         echo "AppImage renamed successfully."
 
     - name: Upload Artifact
@@ -65,11 +65,13 @@ jobs:
   upload:
    name: "Upload Release"
    runs-on: ubuntu-24.04
+   needs:
+      - build
    steps:
       - name: Download Artifact
         uses: actions/download-artifact@v4.1.7
         with:
-          name: Bussin.Napture-x86_64.AppImage
+          name: napture-v${{ github.sha }}.AppImage
       - name: Publish AppImage to Releases
         uses: actions/upload-release-asset@v1
         env:
@@ -77,5 +79,5 @@ jobs:
         with:
           upload_url: ${{ github.event.release.upload_url }}
           asset_path: napture-v${{ github.sha }}.AppImage
-          asset_name: napture-v${{ github.sha }}.AppImage
+          asset_name: Bussin.Napture-x86_64.AppImage
           asset_content_type: application/octet-stream

From 0b7d6da08cd7ed177f97cb73e49c2dea0ef2da06 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 21:40:34 -0400
Subject: [PATCH 046/140] Update rust.yml

---
 .github/workflows/rust.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 8a980b8c..51f69204 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -47,14 +47,13 @@ jobs:
         cp io.github.face_hh.Napture.desktop AppDir/
         cp io.github.face_hh.Napture.svg AppDir/
         ARCH=x86_64
-         ../appimagetool-x86_64.AppImage AppDir --appimage-extract
-        cd AppDir && ls
+         ../appimagetool-x86_64.AppImage AppDir
         mv webx-x86_64.AppImage ../Bussin.Napture-x86_64.AppImage
         echo "AppImage created successfully."
     - name: Rename AppImage
       run: |
         echo "Renaming AppImage..."
-        mv naputure-x86_64.AppImage napture-v${{ github.sha }}.AppImage
+        mv Bussin.Napture-x86_64.AppImage napture-v${{ github.sha }}.AppImage
         echo "AppImage renamed successfully."
 
     - name: Upload Artifact

From b6294e81920c5154f273a0ab482bada91617957b Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 21:45:35 -0400
Subject: [PATCH 047/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 51f69204..8b0f68dc 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -21,6 +21,8 @@ jobs:
         echo "Installing dependencies..."
         sudo apt-get update
         sudo apt-get install -y libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev 
+        sudo add-apt-repository universe
+        sudo apt install libfuse2
         echo "Dependencies installed."
 
     - name: Build Napture

From 317ff0f3ac558b04691ca2f811c22a57145088d4 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 21:50:04 -0400
Subject: [PATCH 048/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 8b0f68dc..0b62b39b 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -50,7 +50,7 @@ jobs:
         cp io.github.face_hh.Napture.svg AppDir/
         ARCH=x86_64
          ../appimagetool-x86_64.AppImage AppDir
-        mv webx-x86_64.AppImage ../Bussin.Napture-x86_64.AppImage
+        mv Napture-x86_64.AppImage ../Bussin.Napture-x86_64.AppImage
         echo "AppImage created successfully."
     - name: Rename AppImage
       run: |

From 4a364fbde6b5de01c42f05f865461accab9353d7 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 21:55:42 -0400
Subject: [PATCH 049/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 0b62b39b..6e153894 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -78,7 +78,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ github.event.release.upload_url }}
           asset_path: napture-v${{ github.sha }}.AppImage
           asset_name: Bussin.Napture-x86_64.AppImage
           asset_content_type: application/octet-stream
+          upload_url: ${{ github.event.release.upload_url }}

From 8f3bb8c3425a65b98a6054808373077ebbdb3225 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:00:38 -0400
Subject: [PATCH 050/140] Update rust.yml

---
 .github/workflows/rust.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 6e153894..e2593c3d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -63,6 +63,8 @@ jobs:
       with:
         name: napture-v${{ github.sha }}.AppImage
         path: napture-v${{ github.sha }}.AppImage
+      env:
+        UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}
   upload:
    name: "Upload Release"
    runs-on: ubuntu-24.04
@@ -81,4 +83,4 @@ jobs:
           asset_path: napture-v${{ github.sha }}.AppImage
           asset_name: Bussin.Napture-x86_64.AppImage
           asset_content_type: application/octet-stream
-          upload_url: ${{ github.event.release.upload_url }}
+          upload_url: ${{ env.UPLOAD_URL }}

From 36384a698fe43cba0b6025dc9822c0bd5d372d1b Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:05:58 -0400
Subject: [PATCH 051/140] Update rust.yml

---
 .github/workflows/rust.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index e2593c3d..4806bfc9 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -76,11 +76,9 @@ jobs:
         with:
           name: napture-v${{ github.sha }}.AppImage
       - name: Publish AppImage to Releases
-        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          asset_path: napture-v${{ github.sha }}.AppImage
-          asset_name: Bussin.Napture-x86_64.AppImage
-          asset_content_type: application/octet-stream
-          upload_url: ${{ env.UPLOAD_URL }}
+        run: |
+            wget -q https://github.com/TheAssassin/pyuploadtool/releases/download/continuous/pyuploadtool-x86_64.AppImage
+            chmod +x pyuploadtool-x86_64.AppImage
+            ./pyuploadtool-x86_64.AppImage napture-v${{ github.sha }}.AppImage*

From baf831d54d0019b1ee51a955d05e535213a13c4a Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:10:12 -0400
Subject: [PATCH 052/140] Update rust.yml

---
 .github/workflows/rust.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 4806bfc9..79dcf5d9 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -75,6 +75,10 @@ jobs:
         uses: actions/download-artifact@v4.1.7
         with:
           name: napture-v${{ github.sha }}.AppImage
+      - name: Download Dependencies
+        run: |
+            sudo add-apt-repository universe
+            sudo apt install libfuse2
       - name: Publish AppImage to Releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From a48ae251a143da3745cdf800b2c4570ea254c009 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:16:35 -0400
Subject: [PATCH 053/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 79dcf5d9..e131233a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -82,6 +82,8 @@ jobs:
       - name: Publish AppImage to Releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_CONTINUOUS_RELEASE_NAME: "Automatic Build (${{ github.sha }})"
+          GITHUB_CONTINUOUS_RELEASE_TAG: "workflow-build-${{ github.sha }}"
         run: |
             wget -q https://github.com/TheAssassin/pyuploadtool/releases/download/continuous/pyuploadtool-x86_64.AppImage
             chmod +x pyuploadtool-x86_64.AppImage

From cef33afacbc270240103a28a60029ae2a21659a5 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:21:13 -0400
Subject: [PATCH 054/140] Update rust.yml

---
 .github/workflows/rust.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index e131233a..59e3b3a5 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -2,9 +2,10 @@ name: Rust
 
 on:
   push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+    branches:
+      - master
+    paths:
+      - 'napture/**'
 
 env:
   CARGO_TERM_COLOR: always

From 5a1f740853e269581c660f6fd57fabebe561ef35 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:28:08 -0400
Subject: [PATCH 055/140] Testing windows builds

---
 .github/workflows/rust.yml | 46 +++++++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 59e3b3a5..328b1b16 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -4,15 +4,13 @@ on:
   push:
     branches:
       - master
-    paths:
-      - 'napture/**'
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   build:
-    name: "Build Napture"
+    name: "Build Napture (Ubuntu)"
     runs-on: ubuntu-24.04
 
     steps:
@@ -40,7 +38,6 @@ jobs:
         wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
         chmod +x appimagetool-x86_64.AppImage
         echo "AppImageTool installed."
-    #DEBUGGING: LIST FILES TO FIND THE APPIMAGE.
     - name: Create Napture AppImage
       run: |
         echo "Creating Napture AppImage..."
@@ -66,16 +63,53 @@ jobs:
         path: napture-v${{ github.sha }}.AppImage
       env:
         UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}
+  build_win:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: Install Inno Setup
+      run: |
+        echo "Downloading Inno Setup..."
+        Invoke-WebRequest -Uri 'https://jrsoftware.org/download.php/is.exe' -OutFile 'C:\is.exe'
+        echo "Installing Inno Setup..."
+        Start-Process -Wait -FilePath 'C:\is.exe' -ArgumentList '/VERYSILENT /NORESTART'
+        echo "Inno Setup installed."
+        
+    - name: Build Napture
+      run: |
+        echo "Building WebX..."
+        cd napture
+        cargo build --release
+        echo "WebX built successfully."
+      
+    - name: Create Installer
+      run: |
+        echo "Creating Installer..."
+        cd installer
+        & 'C:\Program Files\Inno Setup 6\ISCC.exe' setup.iss
+        echo "Installer created successfully."
+      
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: NaptureWindowsSetup.exe
+        path: installer\setup.exe
   upload:
    name: "Upload Release"
    runs-on: ubuntu-24.04
    needs:
       - build
    steps:
-      - name: Download Artifact
+      - name: Download Ubuntu Artifact
         uses: actions/download-artifact@v4.1.7
         with:
           name: napture-v${{ github.sha }}.AppImage
+      - name: Download Windows Artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: NaptureWindowsSetup.exe
       - name: Download Dependencies
         run: |
             sudo add-apt-repository universe
@@ -88,4 +122,4 @@ jobs:
         run: |
             wget -q https://github.com/TheAssassin/pyuploadtool/releases/download/continuous/pyuploadtool-x86_64.AppImage
             chmod +x pyuploadtool-x86_64.AppImage
-            ./pyuploadtool-x86_64.AppImage napture-v${{ github.sha }}.AppImage*
+            ./pyuploadtool-x86_64.AppImage napture-v${{ github.sha }}.AppImage* NaptureWindowsSetup.exe

From 945553b7d97fee18c621be4bd8fb1335d485849f Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:29:21 -0400
Subject: [PATCH 056/140] Update rust.yml

---
 .github/workflows/rust.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 328b1b16..6d5b4593 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   build:
-    name: "Build Napture (Ubuntu)"
+    name: Build Napture (Ubuntu)
     runs-on: ubuntu-24.04
 
     steps:
@@ -65,6 +65,7 @@ jobs:
         UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}
   build_win:
     runs-on: windows-latest
+    name: Build Napture (Windows)
 
     steps:
     - uses: actions/checkout@v2
@@ -101,6 +102,7 @@ jobs:
    runs-on: ubuntu-24.04
    needs:
       - build
+      - build_win
    steps:
       - name: Download Ubuntu Artifact
         uses: actions/download-artifact@v4.1.7

From cc31b31f26f73a3cdf91729436c8c4443f9f0d1b Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:36:49 -0400
Subject: [PATCH 057/140] Update rust.yml

---
 .github/workflows/rust.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 6d5b4593..d59a4bc3 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -77,13 +77,27 @@ jobs:
         echo "Installing Inno Setup..."
         Start-Process -Wait -FilePath 'C:\is.exe' -ArgumentList '/VERYSILENT /NORESTART'
         echo "Inno Setup installed."
+    - name: Install Rust with GNU target
+      run: |
+        rustup toolchain install stable-gnu 
+        rustup default stable-gnu
+    - name: Download and install MSYS2
+      run: |
+        Invoke-WebRequest -Uri 'https://repo.msys2.org/distrib/x86_64/msys2-x86_64-<version>.exe' -OutFile 'C:\msys2-x86_64.exe'
+        Start-Process -Wait -FilePath 'C:\msys2-x86_64.exe' -ArgumentList '/VERYSILENT /NORESTART'
         
+    - name: Run MSYS2 Commands
+      run: |
+        C:\msys64\mingw32.exe pacman -Syu
+        C:\msys64\mingw32.exe pacman -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua
+        $env:PATH += ";C:\msys64\mingw64\include;C:\msys64\mingw64\bin;C:\msys64\mingw64\lib"
+   
     - name: Build Napture
       run: |
-        echo "Building WebX..."
+        echo "Building Napture..."
         cd napture
         cargo build --release
-        echo "WebX built successfully."
+        echo "Napture built successfully."
       
     - name: Create Installer
       run: |

From 0dad32c2028a6844695f56ff49e474bb0cea915c Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:39:48 -0400
Subject: [PATCH 058/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index d59a4bc3..c7f8a6a2 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -83,7 +83,7 @@ jobs:
         rustup default stable-gnu
     - name: Download and install MSYS2
       run: |
-        Invoke-WebRequest -Uri 'https://repo.msys2.org/distrib/x86_64/msys2-x86_64-<version>.exe' -OutFile 'C:\msys2-x86_64.exe'
+        Invoke-WebRequest -Uri 'https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20240507.exe' -OutFile 'C:\msys2-x86_64.exe'
         Start-Process -Wait -FilePath 'C:\msys2-x86_64.exe' -ArgumentList '/VERYSILENT /NORESTART'
         
     - name: Run MSYS2 Commands

From 2712c091d423e800cfe802c060f507beca05e278 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:52:32 -0400
Subject: [PATCH 059/140] Update rust.yml

---
 .github/workflows/rust.yml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index c7f8a6a2..f4495a66 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -82,9 +82,25 @@ jobs:
         rustup toolchain install stable-gnu 
         rustup default stable-gnu
     - name: Download and install MSYS2
-      run: |
-        Invoke-WebRequest -Uri 'https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20240507.exe' -OutFile 'C:\msys2-x86_64.exe'
-        Start-Process -Wait -FilePath 'C:\msys2-x86_64.exe' -ArgumentList '/VERYSILENT /NORESTART'
+        run: |
+          $retryCount = 3
+          $downloadSucceeded = $false
+          for ($i = 1; $i -le $retryCount; $i++) {
+            Write-Host "Downloading MSYS2 (Attempt $i)..."
+            try {
+                Invoke-WebRequest -Uri 'https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20240507.exe' -OutFile 'C:\msys2-x86_64.exe' -ErrorAction Stop
+                $downloadSucceeded = $true
+                break
+            } catch {
+                Write-Host "Failed to download MSYS2 (Attempt $i). Retrying..."
+            }
+          }
+          if (-not $downloadSucceeded) {
+            Write-Error "Failed to download MSYS2 after $retryCount attempts."
+              exit 1
+          }
+          Start-Process -Wait -FilePath 'C:\msys2-x86_64.exe' -ArgumentList '/VERYSILENT /NORESTART'
+  shell: powershell
         
     - name: Run MSYS2 Commands
       run: |

From 49988ef2bbe98bf6c2bbcb9ad4721f78d983c814 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:00:30 -0400
Subject: [PATCH 060/140] Update rust.yml

---
 .github/workflows/rust.yml | 62 ++++++++++++--------------------------
 1 file changed, 20 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index f4495a66..35d3bba5 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -64,69 +64,47 @@ jobs:
       env:
         UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}
   build_win:
-    runs-on: windows-latest
-    name: Build Napture (Windows)
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    
-    - name: Install Inno Setup
-      run: |
-        echo "Downloading Inno Setup..."
-        Invoke-WebRequest -Uri 'https://jrsoftware.org/download.php/is.exe' -OutFile 'C:\is.exe'
-        echo "Installing Inno Setup..."
-        Start-Process -Wait -FilePath 'C:\is.exe' -ArgumentList '/VERYSILENT /NORESTART'
-        echo "Inno Setup installed."
-    - name: Install Rust with GNU target
+
+    - name: Install Dependencies
       run: |
-        rustup toolchain install stable-gnu 
-        rustup default stable-gnu
-    - name: Download and install MSYS2
-        run: |
-          $retryCount = 3
-          $downloadSucceeded = $false
-          for ($i = 1; $i -le $retryCount; $i++) {
-            Write-Host "Downloading MSYS2 (Attempt $i)..."
-            try {
-                Invoke-WebRequest -Uri 'https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20240507.exe' -OutFile 'C:\msys2-x86_64.exe' -ErrorAction Stop
-                $downloadSucceeded = $true
-                break
-            } catch {
-                Write-Host "Failed to download MSYS2 (Attempt $i). Retrying..."
-            }
-          }
-          if (-not $downloadSucceeded) {
-            Write-Error "Failed to download MSYS2 after $retryCount attempts."
-              exit 1
-          }
-          Start-Process -Wait -FilePath 'C:\msys2-x86_64.exe' -ArgumentList '/VERYSILENT /NORESTART'
-  shell: powershell
+        echo "Installing dependencies..."
+        sudo dpkg --add-architecture i386
+        sudo apt-get update
+        sudo apt-get install -y wine-stable innoextract
+        echo "Dependencies installed."
         
-    - name: Run MSYS2 Commands
-      run: |
-        C:\msys64\mingw32.exe pacman -Syu
-        C:\msys64\mingw32.exe pacman -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua
-        $env:PATH += ";C:\msys64\mingw64\include;C:\msys64\mingw64\bin;C:\msys64\mingw64\lib"
-   
     - name: Build Napture
       run: |
         echo "Building Napture..."
         cd napture
+        export PKG_CONFIG_PATH=/usr/lib/pkgconfig
         cargo build --release
         echo "Napture built successfully."
-      
+    
+    - name: Install Inno Setup
+      run: |
+        echo "Installing Inno Setup..."
+        wget "https://jrsoftware.org/download.php/is.exe" -O is.exe
+        wine is.exe /VERYSILENT /NORESTART
+        echo "Inno Setup installed."
+    
     - name: Create Installer
       run: |
         echo "Creating Installer..."
         cd installer
-        & 'C:\Program Files\Inno Setup 6\ISCC.exe' setup.iss
+        wine "C:\\Program Files\\Inno Setup 6\\ISCC.exe" setup.iss
         echo "Installer created successfully."
       
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with:
         name: NaptureWindowsSetup.exe
-        path: installer\setup.exe
+        path: installer/setup.exe
+  
   upload:
    name: "Upload Release"
    runs-on: ubuntu-24.04

From f56b589d32754a85811bf6276a0bd838f8217f9f Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:04:03 -0400
Subject: [PATCH 061/140] Update rust.yml

---
 .github/workflows/rust.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 35d3bba5..02dca27b 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -75,6 +75,9 @@ jobs:
         sudo dpkg --add-architecture i386
         sudo apt-get update
         sudo apt-get install -y wine-stable innoextract
+        sudo apt-get install -y libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev 
+        sudo add-apt-repository universe
+        sudo apt install libfuse2
         echo "Dependencies installed."
         
     - name: Build Napture

From c5badac62adba4fefd8c1b10ed9b600c58696bae Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:07:01 -0400
Subject: [PATCH 062/140] Update rust.yml

---
 .github/workflows/rust.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 02dca27b..5aa13082 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -72,12 +72,13 @@ jobs:
     - name: Install Dependencies
       run: |
         echo "Installing dependencies..."
-        sudo dpkg --add-architecture i386
         sudo apt-get update
-        sudo apt-get install -y wine-stable innoextract
         sudo apt-get install -y libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev 
         sudo add-apt-repository universe
         sudo apt install libfuse2
+        sudo dpkg --add-architecture i386
+        sudo apt-get update
+        sudo apt-get install -y wine-stable innoextract
         echo "Dependencies installed."
         
     - name: Build Napture

From 6e07277f2d8f9c196ea7c528579b56f291a4746e Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:13:45 -0400
Subject: [PATCH 063/140] Update rust.yml

---
 .github/workflows/rust.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 5aa13082..3465cc70 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -64,7 +64,8 @@ jobs:
       env:
         UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}
   build_win:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    name: Build Napture (Windows)
 
     steps:
     - uses: actions/checkout@v2

From a3530d0f2c0b5dbc41a88ec92afc71e132001173 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:22:33 -0400
Subject: [PATCH 064/140] Aborting on Windows

---
 .github/workflows/rust.yml | 52 ++------------------------------------
 1 file changed, 2 insertions(+), 50 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 3465cc70..0d71683a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -62,60 +62,12 @@ jobs:
         name: napture-v${{ github.sha }}.AppImage
         path: napture-v${{ github.sha }}.AppImage
       env:
-        UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}
-  build_win:
-    runs-on: ubuntu-24.04
-    name: Build Napture (Windows)
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Install Dependencies
-      run: |
-        echo "Installing dependencies..."
-        sudo apt-get update
-        sudo apt-get install -y libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev 
-        sudo add-apt-repository universe
-        sudo apt install libfuse2
-        sudo dpkg --add-architecture i386
-        sudo apt-get update
-        sudo apt-get install -y wine-stable innoextract
-        echo "Dependencies installed."
-        
-    - name: Build Napture
-      run: |
-        echo "Building Napture..."
-        cd napture
-        export PKG_CONFIG_PATH=/usr/lib/pkgconfig
-        cargo build --release
-        echo "Napture built successfully."
-    
-    - name: Install Inno Setup
-      run: |
-        echo "Installing Inno Setup..."
-        wget "https://jrsoftware.org/download.php/is.exe" -O is.exe
-        wine is.exe /VERYSILENT /NORESTART
-        echo "Inno Setup installed."
-    
-    - name: Create Installer
-      run: |
-        echo "Creating Installer..."
-        cd installer
-        wine "C:\\Program Files\\Inno Setup 6\\ISCC.exe" setup.iss
-        echo "Installer created successfully."
-      
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: NaptureWindowsSetup.exe
-        path: installer/setup.exe
-  
+        UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}  
   upload:
    name: "Upload Release"
    runs-on: ubuntu-24.04
    needs:
       - build
-      - build_win
    steps:
       - name: Download Ubuntu Artifact
         uses: actions/download-artifact@v4.1.7
@@ -137,4 +89,4 @@ jobs:
         run: |
             wget -q https://github.com/TheAssassin/pyuploadtool/releases/download/continuous/pyuploadtool-x86_64.AppImage
             chmod +x pyuploadtool-x86_64.AppImage
-            ./pyuploadtool-x86_64.AppImage napture-v${{ github.sha }}.AppImage* NaptureWindowsSetup.exe
+            ./pyuploadtool-x86_64.AppImage napture-v${{ github.sha }}.AppImage*

From 80f705441f4fb765fd63e2204422eb9a11facdfb Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:47:31 -0400
Subject: [PATCH 065/140] Update rust.yml

---
 .github/workflows/rust.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 0d71683a..b13193a6 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -82,11 +82,18 @@ jobs:
             sudo add-apt-repository universe
             sudo apt install libfuse2
       - name: Publish AppImage to Releases
+        uses: softprops/action-gh-release@v2.0.5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_CONTINUOUS_RELEASE_NAME: "Automatic Build (${{ github.sha }})"
-          GITHUB_CONTINUOUS_RELEASE_TAG: "workflow-build-${{ github.sha }}"
-        run: |
-            wget -q https://github.com/TheAssassin/pyuploadtool/releases/download/continuous/pyuploadtool-x86_64.AppImage
-            chmod +x pyuploadtool-x86_64.AppImage
-            ./pyuploadtool-x86_64.AppImage napture-v${{ github.sha }}.AppImage*
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          files: |
+            napture-v${{ github.sha }}.AppImage*
+          prerelease: true
+          
+      #    GITHUB_CONTINUOUS_RELEASE_NAME: "Automatic Build (${{ github.sha }})"
+      #    GITHUB_CONTINUOUS_RELEASE_TAG: "workflow-build-${{ github.sha }}"
+       # run: | OLD VERISON
+       #     wget -q https://github.com/TheAssassin/pyuploadtool/releases/download/continuous/pyuploadtool-x86_64.AppImage
+      #      chmod +x pyuploadtool-x86_64.AppImage
+      #     ./pyuploadtool-x86_64.AppImage napture-v${{ github.sha }}.AppImage*

From 78dcb6ff93f5392f9ac5c72642e96dc9b384ef1f Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:47:56 -0400
Subject: [PATCH 066/140] Update rust.yml

---
 .github/workflows/rust.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b13193a6..bc3a3121 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -73,10 +73,11 @@ jobs:
         uses: actions/download-artifact@v4.1.7
         with:
           name: napture-v${{ github.sha }}.AppImage
-      - name: Download Windows Artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: NaptureWindowsSetup.exe
+          # Windows is still a WIP.
+  #    - name: Download Windows Artifact
+    #    uses: actions/download-artifact@v2
+   #     with:
+    #      name: NaptureWindowsSetup.exe
       - name: Download Dependencies
         run: |
             sudo add-apt-repository universe

From ac1f3bef943ad20449ceb4f7c9d2c3a529a3c232 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:52:18 -0400
Subject: [PATCH 067/140] thingamob

---
 .github/workflows/rust.yml | 57 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index bc3a3121..dfd52698 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -56,6 +56,63 @@ jobs:
         mv Bussin.Napture-x86_64.AppImage napture-v${{ github.sha }}.AppImage
         echo "AppImage renamed successfully."
 
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: napture-v${{ github.sha }}.AppImage
+        path: napture-v${{ github.sha }}.AppImage
+      env:
+        UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}  
+build_win:
+    name: Build Napture (Windows)
+    runs-on: ubuntu-24.04
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: |
+        echo "Installing dependencies..."
+        sudo apt-get update
+        sudo apt-get install -y libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev 
+        sudo add-apt-repository universe
+        sudo apt install libfuse2
+        sudo dpkg --add-architecture i386
+        sudo apt-get update
+        sudo apt-get install -y wine-stable
+        echo "Dependencies installed."
+
+    - name: Build Napture
+      run: |
+        echo "Building Napture..."
+        cd napture
+        export PKG_CONFIG_PATH=/usr/lib/pkgconfig
+        cargo build --release
+        echo "Napture built successfully."
+    - name: Install AppImageTool
+      run: |
+        echo "Starting artifact upload phase..."
+        echo "Installing AppImageTool..."
+        wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+        chmod +x appimagetool-x86_64.AppImage
+        echo "AppImageTool installed."
+    - name: Create Napture AppImage
+      run: |
+        echo "Creating Napture AppImage..."
+        cd napture
+        mkdir -p AppDir/usr/bin
+        cp target/release/webx AppDir/usr/bin/
+        cp io.github.face_hh.Napture.desktop AppDir/
+        cp io.github.face_hh.Napture.svg AppDir/
+        ARCH=x86_64
+         ../appimagetool-x86_64.AppImage AppDir
+        mv Napture-x86_64.AppImage ../Bussin.Napture-x86_64.AppImage
+        echo "AppImage created successfully."
+    - name: Rename AppImage
+      run: |
+        echo "Renaming AppImage..."
+        mv Bussin.Napture-x86_64.AppImage napture-v${{ github.sha }}.AppImage
+        echo "AppImage renamed successfully."
+
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:

From 998048aaa627a23e8395a3600a29992dcfd23d30 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:58:04 -0400
Subject: [PATCH 068/140] Update rust.yml

---
 .github/workflows/rust.yml | 58 ++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index dfd52698..048c33c5 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -63,7 +63,8 @@ jobs:
         path: napture-v${{ github.sha }}.AppImage
       env:
         UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}  
-build_win:
+        
+  build_win:
     name: Build Napture (Windows)
     runs-on: ubuntu-24.04
 
@@ -78,7 +79,7 @@ build_win:
         sudo apt install libfuse2
         sudo dpkg --add-architecture i386
         sudo apt-get update
-        sudo apt-get install -y wine-stable
+        sudo apt-get install -y wine-stable innoextract
         echo "Dependencies installed."
 
     - name: Build Napture
@@ -88,38 +89,28 @@ build_win:
         export PKG_CONFIG_PATH=/usr/lib/pkgconfig
         cargo build --release
         echo "Napture built successfully."
-    - name: Install AppImageTool
+        
+    - name: Install Inno Setup
       run: |
-        echo "Starting artifact upload phase..."
-        echo "Installing AppImageTool..."
-        wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
-        chmod +x appimagetool-x86_64.AppImage
-        echo "AppImageTool installed."
-    - name: Create Napture AppImage
+        echo "Installing Inno Setup..."
+        wget "https://jrsoftware.org/download.php/is.exe" -O is.exe
+        wine is.exe /VERYSILENT /NORESTART
+        echo "Inno Setup installed."
+        
+    - name: Create Installer
       run: |
-        echo "Creating Napture AppImage..."
-        cd napture
-        mkdir -p AppDir/usr/bin
-        cp target/release/webx AppDir/usr/bin/
-        cp io.github.face_hh.Napture.desktop AppDir/
-        cp io.github.face_hh.Napture.svg AppDir/
-        ARCH=x86_64
-         ../appimagetool-x86_64.AppImage AppDir
-        mv Napture-x86_64.AppImage ../Bussin.Napture-x86_64.AppImage
-        echo "AppImage created successfully."
-    - name: Rename AppImage
-      run: |
-        echo "Renaming AppImage..."
-        mv Bussin.Napture-x86_64.AppImage napture-v${{ github.sha }}.AppImage
-        echo "AppImage renamed successfully."
-
+        echo "Creating Installer..."
+        cd installer
+        wine "C:\\Program Files\\Inno Setup 6\\ISCC.exe" setup.iss
+        echo "Installer created successfully."
+  
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: napture-v${{ github.sha }}.AppImage
-        path: napture-v${{ github.sha }}.AppImage
+        name: NaptureInstaller.exe
+        path: installer/setup.exe
       env:
-        UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}  
+          UPLOAD_URL: ${{ steps.upload.outputs.upload_url }} 
   upload:
    name: "Upload Release"
    runs-on: ubuntu-24.04
@@ -131,10 +122,10 @@ build_win:
         with:
           name: napture-v${{ github.sha }}.AppImage
           # Windows is still a WIP.
-  #    - name: Download Windows Artifact
-    #    uses: actions/download-artifact@v2
-   #     with:
-    #      name: NaptureWindowsSetup.exe
+      - name: Download Windows Artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: NaptureInstaller.exe
       - name: Download Dependencies
         run: |
             sudo add-apt-repository universe
@@ -146,7 +137,8 @@ build_win:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           files: |
-            napture-v${{ github.sha }}.AppImage*
+            napture-v${{ github.sha }}.AppImage
+            NaptureInstaller.exe
           prerelease: true
           
       #    GITHUB_CONTINUOUS_RELEASE_NAME: "Automatic Build (${{ github.sha }})"

From 3ae18f53de911abdb4e24552408f91819b54a3d5 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Tue, 4 Jun 2024 23:58:29 -0400
Subject: [PATCH 069/140] Update rust.yml

---
 .github/workflows/rust.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 048c33c5..07a7845b 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -116,6 +116,7 @@ jobs:
    runs-on: ubuntu-24.04
    needs:
       - build
+      - build_win
    steps:
       - name: Download Ubuntu Artifact
         uses: actions/download-artifact@v4.1.7

From 484e8f9316ff2addeb627e79a9cd5c9dff384d47 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:09:42 -0400
Subject: [PATCH 070/140] Update rust.yml

---
 .github/workflows/rust.yml | 40 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 07a7845b..b87cb7b0 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -66,51 +66,29 @@ jobs:
         
   build_win:
     name: Build Napture (Windows)
-    runs-on: ubuntu-24.04
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v4
+  
     - name: Install Dependencies
       run: |
         echo "Installing dependencies..."
-        sudo apt-get update
-        sudo apt-get install -y libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev 
-        sudo add-apt-repository universe
-        sudo apt install libfuse2
-        sudo dpkg --add-architecture i386
-        sudo apt-get update
-        sudo apt-get install -y wine-stable innoextract
+        choco install -y gtk-runtime
         echo "Dependencies installed."
 
     - name: Build Napture
       run: |
         echo "Building Napture..."
         cd napture
-        export PKG_CONFIG_PATH=/usr/lib/pkgconfig
         cargo build --release
         echo "Napture built successfully."
-        
-    - name: Install Inno Setup
-      run: |
-        echo "Installing Inno Setup..."
-        wget "https://jrsoftware.org/download.php/is.exe" -O is.exe
-        wine is.exe /VERYSILENT /NORESTART
-        echo "Inno Setup installed."
-        
-    - name: Create Installer
-      run: |
-        echo "Creating Installer..."
-        cd installer
-        wine "C:\\Program Files\\Inno Setup 6\\ISCC.exe" setup.iss
-        echo "Installer created successfully."
-  
+
     - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v2
       with:
-        name: NaptureInstaller.exe
-        path: installer/setup.exe
-      env:
-          UPLOAD_URL: ${{ steps.upload.outputs.upload_url }} 
+        name: napture-v${{ github.sha }}.exe
+        path: napture/target/release/webx.exe
   upload:
    name: "Upload Release"
    runs-on: ubuntu-24.04
@@ -136,10 +114,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ env.GITHUB_TOKEN }}
           files: |
             napture-v${{ github.sha }}.AppImage
-            NaptureInstaller.exe
+            napture-v${{ github.sha }}.exe
           prerelease: true
           
       #    GITHUB_CONTINUOUS_RELEASE_NAME: "Automatic Build (${{ github.sha }})"

From 79eddc9ed620f306c18ea716c856c2660fad0215 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:17:17 -0400
Subject: [PATCH 071/140] Update rust.yml

---
 .github/workflows/rust.yml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b87cb7b0..778374ec 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -75,8 +75,25 @@ jobs:
       run: |
         echo "Installing dependencies..."
         choco install -y gtk-runtime
+        rustup toolchain install stable-gnu && rustup default stable-gnu
         echo "Dependencies installed."
 
+    - name: Install MSYS2
+      uses: msys2/setup-msys2@v2
+      with:
+        msys2-root: 'C:\msys64'
+        install-dir: 'C:\msys64'
+    
+    - name: Install MSYS2 dependencies
+      shell: bash
+      run: |
+        echo "Installing MSYS2 packages..."
+        pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua
+        echo "::add-path::C:\\msys64\\mingw64\\include"
+        echo "::add-path::C:\\msys64\\mingw64\\bin"
+        echo "::add-path::C:\\msys64\\mingw64\\lib"
+        echo "MSYS2 packages installed."
+
     - name: Build Napture
       run: |
         echo "Building Napture..."
@@ -104,7 +121,7 @@ jobs:
       - name: Download Windows Artifact
         uses: actions/download-artifact@v2
         with:
-          name: NaptureInstaller.exe
+          name: napture-v${{ github.sha }}.exe
       - name: Download Dependencies
         run: |
             sudo add-apt-repository universe

From 5596e5e33e5cd471f128e4ba26451a47f5f7cacf Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:20:24 -0400
Subject: [PATCH 072/140] Change shell for Install MSYS2 to MSYS2 fr

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 778374ec..3302383f 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -85,7 +85,7 @@ jobs:
         install-dir: 'C:\msys64'
     
     - name: Install MSYS2 dependencies
-      shell: bash
+      shell: msys2 {0}
       run: |
         echo "Installing MSYS2 packages..."
         pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua

From 043d59c3302ee227c35277af896b0e02f6459565 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:27:26 -0400
Subject: [PATCH 073/140] Update rust.yml

---
 .github/workflows/rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 3302383f..c7f2c3fa 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -89,9 +89,9 @@ jobs:
       run: |
         echo "Installing MSYS2 packages..."
         pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua
-        echo "::add-path::C:\\msys64\\mingw64\\include"
-        echo "::add-path::C:\\msys64\\mingw64\\bin"
-        echo "::add-path::C:\\msys64\\mingw64\\lib"
+        SET "PATH=C:\msys64\mingw64\include;%PATH%"
+        SET "PATH=C:\msys64\mingw64\bin;%PATH%"
+        SET "PATH=C:\msys64\mingw64\lib;%PATH%"
         echo "MSYS2 packages installed."
 
     - name: Build Napture

From 50e3118c63f95c0059ed2ee408cd3d996f245b11 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:31:13 -0400
Subject: [PATCH 074/140] Update rust.yml

---
 .github/workflows/rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index c7f2c3fa..cca3db1f 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -89,9 +89,9 @@ jobs:
       run: |
         echo "Installing MSYS2 packages..."
         pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua
-        SET "PATH=C:\msys64\mingw64\include;%PATH%"
-        SET "PATH=C:\msys64\mingw64\bin;%PATH%"
-        SET "PATH=C:\msys64\mingw64\lib;%PATH%"
+        PATH=C:\msys64\mingw64\include;%PATH%
+        PATH=C:\msys64\mingw64\bin;%PATH%
+        PATH=C:\msys64\mingw64\lib;%PATH%
         echo "MSYS2 packages installed."
 
     - name: Build Napture

From 36abb3d5a635b4e05aa1da2a6f9ce626fabf2bb1 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:38:59 -0400
Subject: [PATCH 075/140] Update rust.yml

---
 .github/workflows/rust.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index cca3db1f..182a8444 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -89,10 +89,13 @@ jobs:
       run: |
         echo "Installing MSYS2 packages..."
         pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua
+        echo "MSYS2 packages installed."
+
+    - name: Set PATH
+    - run: |
         PATH=C:\msys64\mingw64\include;%PATH%
         PATH=C:\msys64\mingw64\bin;%PATH%
         PATH=C:\msys64\mingw64\lib;%PATH%
-        echo "MSYS2 packages installed."
 
     - name: Build Napture
       run: |

From bd79984c239e18e33360a5aa62ae0d033510b808 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:40:26 -0400
Subject: [PATCH 076/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 182a8444..809395ba 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -92,7 +92,7 @@ jobs:
         echo "MSYS2 packages installed."
 
     - name: Set PATH
-    - run: |
+      run: |
         PATH=C:\msys64\mingw64\include;%PATH%
         PATH=C:\msys64\mingw64\bin;%PATH%
         PATH=C:\msys64\mingw64\lib;%PATH%

From f249eb4e8ae8f729d0b85f07cd9333246b6e44aa Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:46:16 -0400
Subject: [PATCH 077/140] Update rust.yml

---
 .github/workflows/rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 809395ba..20930149 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -93,9 +93,9 @@ jobs:
 
     - name: Set PATH
       run: |
-        PATH=C:\msys64\mingw64\include;%PATH%
-        PATH=C:\msys64\mingw64\bin;%PATH%
-        PATH=C:\msys64\mingw64\lib;%PATH%
+        set PATH=C:\msys64\mingw64\include;%PATH%
+        set PATH=C:\msys64\mingw64\bin;%PATH%
+        set PATH=C:\msys64\mingw64\lib;%PATH%
 
     - name: Build Napture
       run: |

From d8d846bb163ad2140357a94ba7d0431ac87c65b9 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:50:39 -0400
Subject: [PATCH 078/140] Update .github/workflows/rust.yml

thank you

Co-authored-by: QuinceTart10 <me@quincetart10.is-a.dev>
---
 .github/workflows/rust.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 20930149..fa9feb3f 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -31,23 +31,20 @@ jobs:
         export PKG_CONFIG_PATH=/usr/lib/pkgconfig
         cargo build --release
         echo "Napture built successfully."
-    - name: Install AppImageTool
+    - name: Install linuxdeploy
       run: |
         echo "Starting artifact upload phase..."
-        echo "Installing AppImageTool..."
-        wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
-        chmod +x appimagetool-x86_64.AppImage
-        echo "AppImageTool installed."
+        echo "Installing linuxdeploy..."
+        wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+        chmod +x linuxdeploy-x86_64.AppImage
+        echo "linuxdeploy installed."
     - name: Create Napture AppImage
       run: |
         echo "Creating Napture AppImage..."
         cd napture
-        mkdir -p AppDir/usr/bin
-        cp target/release/webx AppDir/usr/bin/
-        cp io.github.face_hh.Napture.desktop AppDir/
-        cp io.github.face_hh.Napture.svg AppDir/
+        mv target/release/webx target/release/napture
         ARCH=x86_64
-         ../appimagetool-x86_64.AppImage AppDir
+         ../linuxdeploy-x86_64.AppImage --appdir AppDir -e target/release/napture -d io.github.face_hh.Napture.desktop -i io.github.face_hh.Napture.svg
         mv Napture-x86_64.AppImage ../Bussin.Napture-x86_64.AppImage
         echo "AppImage created successfully."
     - name: Rename AppImage

From 1f4b9caf7545ab7bea3a297e3d2ad9acc841166c Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 00:51:51 -0400
Subject: [PATCH 079/140] Update rust.yml

---
 .github/workflows/rust.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index fa9feb3f..6e35cb75 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -89,6 +89,7 @@ jobs:
         echo "MSYS2 packages installed."
 
     - name: Set PATH
+      shell: cmd
       run: |
         set PATH=C:\msys64\mingw64\include;%PATH%
         set PATH=C:\msys64\mingw64\bin;%PATH%

From 2f296c757c093c8af2de38a9ae9e451faa5bfeb5 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:04:44 -0400
Subject: [PATCH 080/140] Update .github/workflows/rust.yml

Co-authored-by: QuinceTart10 <me@quincetart10.is-a.dev>
---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 6e35cb75..db4cfe5f 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -44,7 +44,7 @@ jobs:
         cd napture
         mv target/release/webx target/release/napture
         ARCH=x86_64
-         ../linuxdeploy-x86_64.AppImage --appdir AppDir -e target/release/napture -d io.github.face_hh.Napture.desktop -i io.github.face_hh.Napture.svg
+         ../linuxdeploy-x86_64.AppImage --appdir AppDir -e target/release/napture -d io.github.face_hh.Napture.desktop -i io.github.face_hh.Napture.svg -o appimage
         mv Napture-x86_64.AppImage ../Bussin.Napture-x86_64.AppImage
         echo "AppImage created successfully."
     - name: Rename AppImage

From f1559d17d844e3e1301679526d7d9fa2dccf08da Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:05:27 -0400
Subject: [PATCH 081/140] Update rust.yml

---
 .github/workflows/rust.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index db4cfe5f..c2850253 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -94,6 +94,7 @@ jobs:
         set PATH=C:\msys64\mingw64\include;%PATH%
         set PATH=C:\msys64\mingw64\bin;%PATH%
         set PATH=C:\msys64\mingw64\lib;%PATH%
+        set PATH=C:\msys64\usr\bin;%PATH%
 
     - name: Build Napture
       run: |

From 305793c499d397c66dfc830be287197cac1b7946 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:10:48 -0400
Subject: [PATCH 082/140] Update rust.yml

---
 .github/workflows/rust.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index c2850253..5229e745 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -85,7 +85,8 @@ jobs:
       shell: msys2 {0}
       run: |
         echo "Installing MSYS2 packages..."
-        pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua
+        pacman --noconfirm -Syu
+        pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua mingw-w64-x86_64-pkg-config
         echo "MSYS2 packages installed."
 
     - name: Set PATH

From 8ec95e536ed59903b8e21d734422f75f878c3027 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:13:34 -0400
Subject: [PATCH 083/140] Update rust.yml

---
 .github/workflows/rust.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 5229e745..91171bc5 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -85,7 +85,6 @@ jobs:
       shell: msys2 {0}
       run: |
         echo "Installing MSYS2 packages..."
-        pacman --noconfirm -Syu
         pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua mingw-w64-x86_64-pkg-config
         echo "MSYS2 packages installed."
 

From 7cecfc8e3e9d0b5d37570c2216f87936873c4074 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:19:51 -0400
Subject: [PATCH 084/140] Update rust.yml

---
 .github/workflows/rust.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 91171bc5..961d7e7b 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -85,8 +85,7 @@ jobs:
       shell: msys2 {0}
       run: |
         echo "Installing MSYS2 packages..."
-        pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua mingw-w64-x86_64-pkg-config
-        echo "MSYS2 packages installed."
+        pacman --noconfirm -S pacman -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua
 
     - name: Set PATH
       shell: cmd
@@ -94,9 +93,9 @@ jobs:
         set PATH=C:\msys64\mingw64\include;%PATH%
         set PATH=C:\msys64\mingw64\bin;%PATH%
         set PATH=C:\msys64\mingw64\lib;%PATH%
-        set PATH=C:\msys64\usr\bin;%PATH%
 
     - name: Build Napture
+      shell: cmd
       run: |
         echo "Building Napture..."
         cd napture

From bb8c8b40acd82a328f3c13ce1d80206a535acaed Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:22:08 -0400
Subject: [PATCH 085/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 961d7e7b..527d0e3b 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -85,7 +85,7 @@ jobs:
       shell: msys2 {0}
       run: |
         echo "Installing MSYS2 packages..."
-        pacman --noconfirm -S pacman -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua
+        pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua
 
     - name: Set PATH
       shell: cmd

From b92d9b5b3c4dfedb5168d421a06876cfc7271c68 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:27:39 -0400
Subject: [PATCH 086/140] Update rust.yml

---
 .github/workflows/rust.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 527d0e3b..250f2001 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -85,14 +85,12 @@ jobs:
       shell: msys2 {0}
       run: |
         echo "Installing MSYS2 packages..."
-        pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua
+        pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua mingw-w64-x86_64-pkg-config
 
     - name: Set PATH
       shell: cmd
       run: |
-        set PATH=C:\msys64\mingw64\include;%PATH%
         set PATH=C:\msys64\mingw64\bin;%PATH%
-        set PATH=C:\msys64\mingw64\lib;%PATH%
 
     - name: Build Napture
       shell: cmd
@@ -107,6 +105,7 @@ jobs:
       with:
         name: napture-v${{ github.sha }}.exe
         path: napture/target/release/webx.exe
+
   upload:
    name: "Upload Release"
    runs-on: ubuntu-24.04
@@ -137,10 +136,3 @@ jobs:
             napture-v${{ github.sha }}.AppImage
             napture-v${{ github.sha }}.exe
           prerelease: true
-          
-      #    GITHUB_CONTINUOUS_RELEASE_NAME: "Automatic Build (${{ github.sha }})"
-      #    GITHUB_CONTINUOUS_RELEASE_TAG: "workflow-build-${{ github.sha }}"
-       # run: | OLD VERISON
-       #     wget -q https://github.com/TheAssassin/pyuploadtool/releases/download/continuous/pyuploadtool-x86_64.AppImage
-      #      chmod +x pyuploadtool-x86_64.AppImage
-      #     ./pyuploadtool-x86_64.AppImage napture-v${{ github.sha }}.AppImage*

From f19360a1e015a52efbfaf185b0676d0ea3a3326f Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:35:52 -0400
Subject: [PATCH 087/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 250f2001..9c1d80c2 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -90,7 +90,9 @@ jobs:
     - name: Set PATH
       shell: cmd
       run: |
+        set PATH=C:\msys64\mingw64\include;%PATH%
         set PATH=C:\msys64\mingw64\bin;%PATH%
+        set PATH=C:\msys64\mingw64\lib;%PATH%
 
     - name: Build Napture
       shell: cmd

From b9f6d5a7578388ea817082c7578d6866052c00d3 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:41:56 -0400
Subject: [PATCH 088/140] Update rust.yml

---
 .github/workflows/rust.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 9c1d80c2..0a175cb3 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -90,6 +90,9 @@ jobs:
     - name: Set PATH
       shell: cmd
       run: |
+        echo "C:\msys64\mingw64\bin" >> $env:GITHUB_PATH
+        echo "C:\msys64\mingw64\inlcude" >> $env:GITHUB_PATH
+        echo "C:\msys64\mingw64\lib" >> $env:GITHUB_PATH
         set PATH=C:\msys64\mingw64\include;%PATH%
         set PATH=C:\msys64\mingw64\bin;%PATH%
         set PATH=C:\msys64\mingw64\lib;%PATH%
@@ -98,6 +101,9 @@ jobs:
       shell: cmd
       run: |
         echo "Building Napture..."
+        set PATH=C:\msys64\mingw64\include;%PATH%
+        set PATH=C:\msys64\mingw64\bin;%PATH%
+        set PATH=C:\msys64\mingw64\lib;%PATH%
         cd napture
         cargo build --release
         echo "Napture built successfully."

From 3774bda742a49583df7d4ae2459a4759ccf080e0 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:47:29 -0400
Subject: [PATCH 089/140] Update rust.yml

---
 .github/workflows/rust.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 0a175cb3..e2de898c 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -90,20 +90,14 @@ jobs:
     - name: Set PATH
       shell: cmd
       run: |
-        echo "C:\msys64\mingw64\bin" >> $env:GITHUB_PATH
-        echo "C:\msys64\mingw64\inlcude" >> $env:GITHUB_PATH
-        echo "C:\msys64\mingw64\lib" >> $env:GITHUB_PATH
-        set PATH=C:\msys64\mingw64\include;%PATH%
-        set PATH=C:\msys64\mingw64\bin;%PATH%
-        set PATH=C:\msys64\mingw64\lib;%PATH%
+        echo "::add-path::C:\msys64\mingw64\bin"
+        echo "::add-path::C:\msys64\usr\bin"
+        echo "::add-path::C:\msys64\mingw64\include"
+        echo "::add-path::C:\msys64\mingw64\lib"
 
     - name: Build Napture
-      shell: cmd
       run: |
         echo "Building Napture..."
-        set PATH=C:\msys64\mingw64\include;%PATH%
-        set PATH=C:\msys64\mingw64\bin;%PATH%
-        set PATH=C:\msys64\mingw64\lib;%PATH%
         cd napture
         cargo build --release
         echo "Napture built successfully."

From 2c71968a92414c56604fd6ffeb7e001ca57c2296 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:54:20 -0400
Subject: [PATCH 090/140] Update rust.yml

---
 .github/workflows/rust.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index e2de898c..2ecb514f 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -86,6 +86,7 @@ jobs:
       run: |
         echo "Installing MSYS2 packages..."
         pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua mingw-w64-x86_64-pkg-config
+        pkg-config --help
 
     - name: Set PATH
       shell: cmd

From 62a41792e595e6cdc75aeeffd594b9a00c317242 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 01:59:27 -0400
Subject: [PATCH 091/140] Update rust.yml

---
 .github/workflows/rust.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 2ecb514f..8b781433 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -86,10 +86,8 @@ jobs:
       run: |
         echo "Installing MSYS2 packages..."
         pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua mingw-w64-x86_64-pkg-config
-        pkg-config --help
 
     - name: Set PATH
-      shell: cmd
       run: |
         echo "::add-path::C:\msys64\mingw64\bin"
         echo "::add-path::C:\msys64\usr\bin"
@@ -99,6 +97,7 @@ jobs:
     - name: Build Napture
       run: |
         echo "Building Napture..."
+        pkg-config --help
         cd napture
         cargo build --release
         echo "Napture built successfully."

From 8be5de72a2a25c01b2cd5ff937ef4000e0bf5795 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 02:05:56 -0400
Subject: [PATCH 092/140] Update rust.yml

---
 .github/workflows/rust.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 8b781433..bd10884a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -88,11 +88,13 @@ jobs:
         pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua mingw-w64-x86_64-pkg-config
 
     - name: Set PATH
+      shell: powershell
       run: |
-        echo "::add-path::C:\msys64\mingw64\bin"
-        echo "::add-path::C:\msys64\usr\bin"
-        echo "::add-path::C:\msys64\mingw64\include"
-        echo "::add-path::C:\msys64\mingw64\lib"
+        echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
+        echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
+        echo "C:\msys64\mingw64\include" | Out-File -FilePath $env:GITHUB_PATH -Append
+        echo "C:\msys64\mingw64\lib" | Out-File -FilePath $env:GITHUB_PATH -Append
+        echo "PATH is now: $env:Path"
 
     - name: Build Napture
       run: |

From 26018011e4c8b150ed2c7fb8a9c932a468022518 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 02:12:28 -0400
Subject: [PATCH 093/140] Update rust.yml

---
 .github/workflows/rust.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index bd10884a..19189809 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -88,13 +88,19 @@ jobs:
         pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua mingw-w64-x86_64-pkg-config
 
     - name: Set PATH
+      run: |
+        echo "Setting PATH..."
+        echo "C:\\msys64\\mingw64\\bin" >> $GITHUB_PATH
+        echo "C:\\msys64\\usr\\bin" >> $GITHUB_PATH
+        echo "C:\\msys64\\mingw64\\include" >> $GITHUB_PATH
+        echo "C:\\msys64\\mingw64\\lib" >> $GITHUB_PATH
+
+    - name: Verify pkg-config
       shell: powershell
       run: |
-        echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
-        echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
-        echo "C:\msys64\mingw64\include" | Out-File -FilePath $env:GITHUB_PATH -Append
-        echo "C:\msys64\mingw64\lib" | Out-File -FilePath $env:GITHUB_PATH -Append
-        echo "PATH is now: $env:Path"
+        echo "Verifying pkg-config installation..."
+        which pkg-config
+        pkg-config --version
 
     - name: Build Napture
       run: |

From ed8a0dc3b9d63a33cd849a98a6a0a233e568618a Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 02:18:27 -0400
Subject: [PATCH 094/140] Update rust.yml

---
 .github/workflows/rust.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 19189809..45d8412e 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -90,10 +90,7 @@ jobs:
     - name: Set PATH
       run: |
         echo "Setting PATH..."
-        echo "C:\\msys64\\mingw64\\bin" >> $GITHUB_PATH
-        echo "C:\\msys64\\usr\\bin" >> $GITHUB_PATH
-        echo "C:\\msys64\\mingw64\\include" >> $GITHUB_PATH
-        echo "C:\\msys64\\mingw64\\lib" >> $GITHUB_PATH
+        $Env:Path += ';C:\msys64\mingw64\include;C:\msys64\mingw64\bin;C:\msys64\mingw64\lib'
 
     - name: Verify pkg-config
       shell: powershell

From eda325e37d4ff2d755ad7caa6522c3030454aad2 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 02:27:11 -0400
Subject: [PATCH 095/140] Update rust.yml

---
 .github/workflows/rust.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 45d8412e..55ac3cef 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -29,7 +29,7 @@ jobs:
         echo "Building Napture..."
         cd napture
         export PKG_CONFIG_PATH=/usr/lib/pkgconfig
-        cargo build --release
+        cargo build --release --verbose
         echo "Napture built successfully."
     - name: Install linuxdeploy
       run: |
@@ -102,16 +102,19 @@ jobs:
     - name: Build Napture
       run: |
         echo "Building Napture..."
+        $Env:Path += ';C:\msys64\mingw64\include;C:\msys64\mingw64\bin;C:\msys64\mingw64\lib'
         pkg-config --help
         cd napture
-        cargo build --release
+        cargo build --release --verbose
         echo "Napture built successfully."
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v2
       with:
         name: napture-v${{ github.sha }}.exe
-        path: napture/target/release/webx.exe
+        path: |
+          napture/target/release/webx.exe
+          C:\msys64\mingw64\lib\*
 
   upload:
    name: "Upload Release"

From 9abc92d35e3fb320f009baa73ff7eea4ceb23992 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 02:36:11 -0400
Subject: [PATCH 096/140] Update rust.yml

---
 .github/workflows/rust.yml | 70 +++++++++++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 55ac3cef..090e7b06 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -60,6 +60,52 @@ jobs:
         path: napture-v${{ github.sha }}.AppImage
       env:
         UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}  
+  build_macos:
+    name: Build Napture (MacOS)
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install deps
+        run: |
+          brew install gtk4 graphene glib libadwaita lua create-dmg pkg-config
+          arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+          arch -x86_64 /usr/local/bin/brew install gtk4 graphene glib libadwaita lua pkg-config || exit 0 # Brew tries to link python which will fail
+      - name: Build Napture
+        run: |
+          rustup target add x86_64-apple-darwin
+          cd napture
+          RUSTFLAGS='-L /opt/homebrew/Cellar/' cargo build --release --target aarch64-apple-darwin
+          PKG_CONFIG='/usr/local/bin/pkg-config' RUSTFLAGS='-L /usr/local/Cellar/' cargo build --release --target x86_64-apple-darwin
+          lipo -create target/aarch64-apple-darwin/release/webx target/x86_64-apple-darwin/release/webx -output target/release/webx
+      - name: Make an app bundle
+        run: |
+          cd napture
+          mkdir -p target/release/Napture.app/Contents/MacOS
+          cp target/release/webx target/release/Napture.app/Contents/MacOS
+          cp ./Info.plist target/release/Napture.app/Contents
+          mkdir -p target/release/Napture.app/Contents/Resources/AppIcon.iconset
+
+          for SIZE in 16 32 64 128 256 512; do
+              sips -z $SIZE $SIZE ./file.png --out target/release/Napture.app/Contents/Resources/AppIcon.iconset/icon_${SIZE}x${SIZE}.png
+          done
+          for SIZE in 32 64 256 512; do
+              sips -z $SIZE $SIZE ./file.png --out target/release/Napture.app/Contents/Resources/AppIcon.iconset/icon_$(expr $SIZE / 2)x$(expr $SIZE / 2)x2.png
+          done
+
+          iconutil -c icns -o target/release/Napture.app/Contents/Resources/AppIcon.icns target/release/Napture.app/Contents/Resources/AppIcon.iconset
+          rm -rf target/release/Napture.app/Contents/Resources/AppIcon.iconset
+      - name: Sign the app
+        run: codesign --force --deep --sign - napture/target/release/Napture.app
+      - name: Pack Napture into DMG
+        run: |
+          cd napture/target/release
+          create-dmg Napture-macos-universial.dmg Napture.app
+      - name: Upload DMG Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: napture-v${{ github.sha }}.dmg
+          path: napture/target/release/Napture-macos-universial.dmg
         
   build_win:
     name: Build Napture (Windows)
@@ -71,7 +117,6 @@ jobs:
     - name: Install Dependencies
       run: |
         echo "Installing dependencies..."
-        choco install -y gtk-runtime
         rustup toolchain install stable-gnu && rustup default stable-gnu
         echo "Dependencies installed."
 
@@ -82,28 +127,15 @@ jobs:
         install-dir: 'C:\msys64'
     
     - name: Install MSYS2 dependencies
-      shell: msys2 {0}
       run: |
         echo "Installing MSYS2 packages..."
-        pacman --noconfirm -S mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua mingw-w64-x86_64-pkg-config
-
-    - name: Set PATH
-      run: |
-        echo "Setting PATH..."
-        $Env:Path += ';C:\msys64\mingw64\include;C:\msys64\mingw64\bin;C:\msys64\mingw64\lib'
-
-    - name: Verify pkg-config
-      shell: powershell
-      run: |
-        echo "Verifying pkg-config installation..."
-        which pkg-config
-        pkg-config --version
+        C:\msys64\usr\bin\bash.exe -lc "pacman -Syu --noconfirm"
+        C:\msys64\usr\bin\bash.exe -lc "pacman -S --noconfirm mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua"
 
     - name: Build Napture
       run: |
         echo "Building Napture..."
         $Env:Path += ';C:\msys64\mingw64\include;C:\msys64\mingw64\bin;C:\msys64\mingw64\lib'
-        pkg-config --help
         cd napture
         cargo build --release --verbose
         echo "Napture built successfully."
@@ -122,6 +154,7 @@ jobs:
    needs:
       - build
       - build_win
+      - build_macos
    steps:
       - name: Download Ubuntu Artifact
         uses: actions/download-artifact@v4.1.7
@@ -132,6 +165,10 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: napture-v${{ github.sha }}.exe
+      - name: Download MacOS Artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: napture-v${{ github.sha }}.dmg    
       - name: Download Dependencies
         run: |
             sudo add-apt-repository universe
@@ -145,4 +182,5 @@ jobs:
           files: |
             napture-v${{ github.sha }}.AppImage
             napture-v${{ github.sha }}.exe
+            napture-v${{ github.sha }}.dmg
           prerelease: true

From 9faae85ddb34c8cd24af6dd1d770155ef4b50302 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 02:46:45 -0400
Subject: [PATCH 097/140] Update rust.yml

---
 .github/workflows/rust.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 090e7b06..89d1b6ed 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -140,14 +140,19 @@ jobs:
         cargo build --release --verbose
         echo "Napture built successfully."
 
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v2
+    - name: Copy files to workspace
+      run: |
+        mkdir -p napture/target/release/libs
+        cp C:/msys64/mingw64/lib/* napture/target/release/libs
+
+    - name: Upload Napture
+      uses: actions/upload-artifact@v4
       with:
-        name: napture-v${{ github.sha }}.exe
+        name: Napture-windows-x86_64
         path: |
-          napture/target/release/webx.exe
-          C:\msys64\mingw64\lib\*
-
+          napture/target/release/Napture-windows-x86_64.exe
+          napture/target/release/libs/*
+          
   upload:
    name: "Upload Release"
    runs-on: ubuntu-24.04

From fc308d748110630f1e7c4d0a5439fda462995c20 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 02:59:20 -0400
Subject: [PATCH 098/140] Update rust.yml

---
 .github/workflows/rust.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 89d1b6ed..b4484146 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -148,7 +148,7 @@ jobs:
     - name: Upload Napture
       uses: actions/upload-artifact@v4
       with:
-        name: Napture-windows-x86_64
+        name: napture-v${{ github.sha }}.exe
         path: |
           napture/target/release/Napture-windows-x86_64.exe
           napture/target/release/libs/*
@@ -185,7 +185,7 @@ jobs:
         with:
           token: ${{ env.GITHUB_TOKEN }}
           files: |
-            napture-v${{ github.sha }}.AppImage
-            napture-v${{ github.sha }}.exe
-            napture-v${{ github.sha }}.dmg
+            napture-v${{ github.sha }}-linux.AppImage
+            napture-v${{ github.sha }}-windows.exe
+            napture-v${{ github.sha }}-macos.dmg
           prerelease: true

From 7623c053cd19736f8ee53d02caa9cc8acd3adadb Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 03:03:15 -0400
Subject: [PATCH 099/140] Update rust.yml

---
 .github/workflows/rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b4484146..650b3780 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -148,7 +148,7 @@ jobs:
     - name: Upload Napture
       uses: actions/upload-artifact@v4
       with:
-        name: napture-v${{ github.sha }}.exe
+        name: napture-v${{ github.sha }}.zip
         path: |
           napture/target/release/Napture-windows-x86_64.exe
           napture/target/release/libs/*
@@ -169,7 +169,7 @@ jobs:
       - name: Download Windows Artifact
         uses: actions/download-artifact@v2
         with:
-          name: napture-v${{ github.sha }}.exe
+          name: napture-v${{ github.sha }}.zip
       - name: Download MacOS Artifact
         uses: actions/download-artifact@v2
         with:
@@ -186,6 +186,6 @@ jobs:
           token: ${{ env.GITHUB_TOKEN }}
           files: |
             napture-v${{ github.sha }}-linux.AppImage
-            napture-v${{ github.sha }}-windows.exe
+            napture-v${{ github.sha }}-windows.zip
             napture-v${{ github.sha }}-macos.dmg
           prerelease: true

From c7da773162de58e2a9148c62e9e56c37f4db69b1 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 03:07:00 -0400
Subject: [PATCH 100/140] Update rust.yml

---
 .github/workflows/rust.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 650b3780..77ed30a5 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -148,9 +148,9 @@ jobs:
     - name: Upload Napture
       uses: actions/upload-artifact@v4
       with:
-        name: napture-v${{ github.sha }}.zip
+        name: napture-v${{ github.sha }}.exe
         path: |
-          napture/target/release/Napture-windows-x86_64.exe
+          napture/target/release/napture-v${{ github.sha }}.exe
           napture/target/release/libs/*
           
   upload:
@@ -165,11 +165,10 @@ jobs:
         uses: actions/download-artifact@v4.1.7
         with:
           name: napture-v${{ github.sha }}.AppImage
-          # Windows is still a WIP.
       - name: Download Windows Artifact
         uses: actions/download-artifact@v2
         with:
-          name: napture-v${{ github.sha }}.zip
+          name: napture-v${{ github.sha }}.exe
       - name: Download MacOS Artifact
         uses: actions/download-artifact@v2
         with:
@@ -186,6 +185,6 @@ jobs:
           token: ${{ env.GITHUB_TOKEN }}
           files: |
             napture-v${{ github.sha }}-linux.AppImage
-            napture-v${{ github.sha }}-windows.zip
+            napture-v${{ github.sha }}-windows.exe
             napture-v${{ github.sha }}-macos.dmg
           prerelease: true

From 11c0700302ea70cbeff092ba2924882e57420dc1 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 03:19:27 -0400
Subject: [PATCH 101/140] Update rust.yml

---
 .github/workflows/rust.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 77ed30a5..361508d7 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -61,7 +61,7 @@ jobs:
       env:
         UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}  
   build_macos:
-    name: Build Napture (MacOS)
+    name: Build Napture (macOS)
     runs-on: macos-latest
 
     steps:
@@ -150,7 +150,7 @@ jobs:
       with:
         name: napture-v${{ github.sha }}.exe
         path: |
-          napture/target/release/napture-v${{ github.sha }}.exe
+          napture/target/release/webx.exe
           napture/target/release/libs/*
           
   upload:
@@ -169,7 +169,7 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: napture-v${{ github.sha }}.exe
-      - name: Download MacOS Artifact
+      - name: Download macOS Artifact
         uses: actions/download-artifact@v2
         with:
           name: napture-v${{ github.sha }}.dmg    
@@ -184,7 +184,7 @@ jobs:
         with:
           token: ${{ env.GITHUB_TOKEN }}
           files: |
-            napture-v${{ github.sha }}-linux.AppImage
-            napture-v${{ github.sha }}-windows.exe
-            napture-v${{ github.sha }}-macos.dmg
+            napture-v${{ github.sha }}.AppImage
+            napture-v${{ github.sha }}.exe
+            napture-v${{ github.sha }}.dmg
           prerelease: true

From 3ee38f7c946d0fd984c384a7af9ed33e7f4eaa91 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 11:51:39 -0400
Subject: [PATCH 102/140] Update rust.yml

---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 361508d7..b78bd94a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -1,4 +1,4 @@
-name: Rust
+name: Napture Nightly
 
 on:
   push:
@@ -185,6 +185,6 @@ jobs:
           token: ${{ env.GITHUB_TOKEN }}
           files: |
             napture-v${{ github.sha }}.AppImage
-            napture-v${{ github.sha }}.exe
+            napture-v${{ github.sha }}.exe.zip
             napture-v${{ github.sha }}.dmg
           prerelease: true

From feffbf0c6cbe64ca6c7fe73146b93eefca11c3cf Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 12:09:38 -0400
Subject: [PATCH 103/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b78bd94a..68f54704 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -168,7 +168,7 @@ jobs:
       - name: Download Windows Artifact
         uses: actions/download-artifact@v2
         with:
-          name: napture-v${{ github.sha }}.exe
+          name: napture-v${{ github.sha }}.exe.zip
       - name: Download macOS Artifact
         uses: actions/download-artifact@v2
         with:

From f64b5fc2a1d91679903df80bb8e478486fcedce5 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 12:23:38 -0400
Subject: [PATCH 104/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 68f54704..e9fbb92a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -148,7 +148,7 @@ jobs:
     - name: Upload Napture
       uses: actions/upload-artifact@v4
       with:
-        name: napture-v${{ github.sha }}.exe
+        name: napture-v${{ github.sha }}.exe.zip
         path: |
           napture/target/release/webx.exe
           napture/target/release/libs/*

From b2fe88c239f0e31864f73d5679f9f959575f5bd8 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:10:01 -0400
Subject: [PATCH 105/140] Update rust.yml

---
 .github/workflows/rust.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index e9fbb92a..ec93dfa5 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -56,7 +56,7 @@ jobs:
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: napture-v${{ github.sha }}.AppImage
+        name: napture-linux-nightly.AppImage
         path: napture-v${{ github.sha }}.AppImage
       env:
         UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}  
@@ -104,7 +104,7 @@ jobs:
       - name: Upload DMG Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: napture-v${{ github.sha }}.dmg
+          name: napture-macos-nightly.dmg
           path: napture/target/release/Napture-macos-universial.dmg
         
   build_win:
@@ -148,7 +148,7 @@ jobs:
     - name: Upload Napture
       uses: actions/upload-artifact@v4
       with:
-        name: napture-v${{ github.sha }}.exe.zip
+        name: napture-windows-nightly.exe
         path: |
           napture/target/release/webx.exe
           napture/target/release/libs/*
@@ -164,15 +164,15 @@ jobs:
       - name: Download Ubuntu Artifact
         uses: actions/download-artifact@v4.1.7
         with:
-          name: napture-v${{ github.sha }}.AppImage
+          name: napture-linux-nightly.AppImage
       - name: Download Windows Artifact
         uses: actions/download-artifact@v2
         with:
-          name: napture-v${{ github.sha }}.exe.zip
+          name: napture-windows-nightly.exe
       - name: Download macOS Artifact
         uses: actions/download-artifact@v2
         with:
-          name: napture-v${{ github.sha }}.dmg    
+          name: napture-macos-nightly.dmg    
       - name: Download Dependencies
         run: |
             sudo add-apt-repository universe
@@ -185,6 +185,6 @@ jobs:
           token: ${{ env.GITHUB_TOKEN }}
           files: |
             napture-v${{ github.sha }}.AppImage
-            napture-v${{ github.sha }}.exe.zip
+            napture-v${{ github.sha }}.exe
             napture-v${{ github.sha }}.dmg
           prerelease: true

From c1a17b3ac7d29aa3ef46d366f470cb944f80e366 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:22:47 -0400
Subject: [PATCH 106/140] fix the download of artifacts for release

---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index ec93dfa5..5406e51e 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -166,11 +166,11 @@ jobs:
         with:
           name: napture-linux-nightly.AppImage
       - name: Download Windows Artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4.1.7
         with:
           name: napture-windows-nightly.exe
       - name: Download macOS Artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4.1.7
         with:
           name: napture-macos-nightly.dmg    
       - name: Download Dependencies

From b1327ac6f8fa9de39da3822d2a9a59b754255f08 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:35:00 -0400
Subject: [PATCH 107/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 5406e51e..db7f4281 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -183,6 +183,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           token: ${{ env.GITHUB_TOKEN }}
+          name: Nightly Build (nightly-${{ github.GITHUB.ref }})
+          tag_name: nightly-${{ github.GITHUB.ref }}
           files: |
             napture-v${{ github.sha }}.AppImage
             napture-v${{ github.sha }}.exe

From 09476c36eddaa69f9b6070338b98255e2f058f48 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:46:49 -0400
Subject: [PATCH 108/140] Update rust.yml

---
 .github/workflows/rust.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index db7f4281..a908cb3f 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -183,10 +183,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           token: ${{ env.GITHUB_TOKEN }}
-          name: Nightly Build (nightly-${{ github.GITHUB.ref }})
-          tag_name: nightly-${{ github.GITHUB.ref }}
+          name: Nightly Build
+          tag_name: nightly
           files: |
-            napture-v${{ github.sha }}.AppImage
-            napture-v${{ github.sha }}.exe
-            napture-v${{ github.sha }}.dmg
+            napture-linux-nightly.AppImage
+            napture-windows-nightly.exe
+            napture-macos-nightly.dmg
           prerelease: true

From 3ff278ddc6e9a88e5f22a4a0dd08fc9f13da8f11 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:52:13 -0400
Subject: [PATCH 109/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index a908cb3f..505ead3c 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -185,6 +185,8 @@ jobs:
           token: ${{ env.GITHUB_TOKEN }}
           name: Nightly Build
           tag_name: nightly
+          tag: nightly
+          generate_release_notes: true
           files: |
             napture-linux-nightly.AppImage
             napture-windows-nightly.exe

From 1bf31e88a7f6482d39c216d8a2e9e62271972250 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:55:59 -0400
Subject: [PATCH 110/140] Update rust.yml

---
 .github/workflows/rust.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 505ead3c..b2a97979 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+    paths:
+      - /napture/*
 
 env:
   CARGO_TERM_COLOR: always
@@ -185,7 +187,6 @@ jobs:
           token: ${{ env.GITHUB_TOKEN }}
           name: Nightly Build
           tag_name: nightly
-          tag: nightly
           generate_release_notes: true
           files: |
             napture-linux-nightly.AppImage

From 54d94dfc64ffe488255ba0a2c48c29b08817c7f6 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:58:06 -0400
Subject: [PATCH 111/140] Update rust.yml

---
 .github/workflows/rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b2a97979..f4ebd0a0 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -189,7 +189,7 @@ jobs:
           tag_name: nightly
           generate_release_notes: true
           files: |
-            napture-linux-nightly.AppImage
-            napture-windows-nightly.exe
-            napture-macos-nightly.dmg
+            /napture-linux-nightly.AppImage
+            /napture-windows-nightly.exe
+            /napture-macos-nightly.dmg
           prerelease: true

From 0a61ccbfb3eb1e4f0315d07c341ed13db0ad4c31 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:59:06 -0400
Subject: [PATCH 112/140] []

---
 .github/workflows/rust.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index f4ebd0a0..3f2afcde 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - master
-    paths:
-      - /napture/*
 
 env:
   CARGO_TERM_COLOR: always

From 29aa7038d1c4a68edaa76301344a3462cf91b3ae Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:12:22 -0400
Subject: [PATCH 113/140] Update rust.yml

---
 .github/workflows/rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 3f2afcde..3fd96794 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -187,7 +187,7 @@ jobs:
           tag_name: nightly
           generate_release_notes: true
           files: |
-            /napture-linux-nightly.AppImage
-            /napture-windows-nightly.exe
-            /napture-macos-nightly.dmg
+            /home/runner/work/webx-github-actions/webx-github-actions/napture-linux-nightly.AppImage
+            /home/runner/work/webx-github-actions/webx-github-actions/napture-windows-nightly.exe
+            /home/runner/work/webx-github-actions/webx-github-actions/napture-macos-nightly.dmg
           prerelease: true

From 0f120527da348cfabb2c9a91d8ec50f9f896df97 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:24:40 -0400
Subject: [PATCH 114/140] Update rust.yml

---
 .github/workflows/rust.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 3fd96794..eca423b4 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -183,11 +183,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           token: ${{ env.GITHUB_TOKEN }}
-          name: Nightly Build
+          name: Nightly Build (${{ github.ref }})
           tag_name: nightly
           generate_release_notes: true
           files: |
-            /home/runner/work/webx-github-actions/webx-github-actions/napture-linux-nightly.AppImage
-            /home/runner/work/webx-github-actions/webx-github-actions/napture-windows-nightly.exe
-            /home/runner/work/webx-github-actions/webx-github-actions/napture-macos-nightly.dmg
+            *.AppImage
+            *.exe
+            *.dmg
           prerelease: true

From a0089edffd8837659c8dc742f43087357cea7dba Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:39:52 -0400
Subject: [PATCH 115/140] Update rust.yml

---
 .github/workflows/rust.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index eca423b4..b302b3ab 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -144,14 +144,17 @@ jobs:
       run: |
         mkdir -p napture/target/release/libs
         cp C:/msys64/mingw64/lib/* napture/target/release/libs
-
+  
+    - name: Zip Napture files
+      run: |
+        cd napture/target/release
+        tar -czvf napture-windows-nightly.tar.gz webx.exe libs
+  
     - name: Upload Napture
       uses: actions/upload-artifact@v4
       with:
-        name: napture-windows-nightly.exe
-        path: |
-          napture/target/release/webx.exe
-          napture/target/release/libs/*
+        name: napture-windows-nightly
+        path: napture/target/release/napture-windows-nightly.tar.gz
           
   upload:
    name: "Upload Release"
@@ -168,7 +171,7 @@ jobs:
       - name: Download Windows Artifact
         uses: actions/download-artifact@v4.1.7
         with:
-          name: napture-windows-nightly.exe
+          name: napture-windows-nightly
       - name: Download macOS Artifact
         uses: actions/download-artifact@v4.1.7
         with:
@@ -177,7 +180,7 @@ jobs:
         run: |
             sudo add-apt-repository universe
             sudo apt install libfuse2
-      - name: Publish AppImage to Releases
+      - name: Publish to Releases
         uses: softprops/action-gh-release@v2.0.5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -188,6 +191,6 @@ jobs:
           generate_release_notes: true
           files: |
             *.AppImage
-            *.exe
+            *.tar.gz
             *.dmg
           prerelease: true

From 88b5c7fdf04a1fdbaede0e099e27652a20da0329 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:41:46 -0400
Subject: [PATCH 116/140] Minor changes so that the result doesnt look
 disgusting

---
 .github/workflows/rust.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b302b3ab..a5c356c8 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -50,14 +50,14 @@ jobs:
     - name: Rename AppImage
       run: |
         echo "Renaming AppImage..."
-        mv Bussin.Napture-x86_64.AppImage napture-v${{ github.sha }}.AppImage
+        mv Bussin.Napture-x86_64.AppImage napture-linux-nightly.AppImage
         echo "AppImage renamed successfully."
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
         name: napture-linux-nightly.AppImage
-        path: napture-v${{ github.sha }}.AppImage
+        path: napture-linux-nightly.AppImage
       env:
         UPLOAD_URL: ${{ steps.upload.outputs.upload_url }}  
   build_macos:
@@ -100,7 +100,7 @@ jobs:
       - name: Pack Napture into DMG
         run: |
           cd napture/target/release
-          create-dmg Napture-macos-universial.dmg Napture.app
+          create-dmg napture-macos-nightly.dmg Napture.app
       - name: Upload DMG Artifact
         uses: actions/upload-artifact@v4
         with:

From 785cd879c984b1543bd19c851803c1afad08f41d Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:51:54 -0400
Subject: [PATCH 117/140] Final Changes

---
 .github/workflows/rust.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index a5c356c8..d1f5b989 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+    paths:
+      - /napture/**
 
 env:
   CARGO_TERM_COLOR: always

From 0dfef6c32a143fc203fbde4e018c3f31c6cf0d27 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 15:09:37 -0400
Subject: [PATCH 118/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index d1f5b989..6f3f4c2c 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -107,7 +107,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: napture-macos-nightly.dmg
-          path: napture/target/release/Napture-macos-universial.dmg
+          path: napture/target/release/napture-macos-nightly.dmg
         
   build_win:
     name: Build Napture (Windows)

From e7cec403a0ca9c74ff877c86090b79b7dd87c051 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 15:20:20 -0400
Subject: [PATCH 119/140] test fix

---
 .github/workflows/rust.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 6f3f4c2c..7a596485 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - master
-    paths:
-      - /napture/**
 
 env:
   CARGO_TERM_COLOR: always

From 306aa0d5ca4a531b3a098f8b28429ef97f041925 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 15:36:44 -0400
Subject: [PATCH 120/140] Copy all of the stuff underneath /libs

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 7a596485..47d4abbd 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -143,7 +143,7 @@ jobs:
     - name: Copy files to workspace
       run: |
         mkdir -p napture/target/release/libs
-        cp C:/msys64/mingw64/lib/* napture/target/release/libs
+        cp -r C:/msys64/mingw64/lib/* napture/target/release/libs
   
     - name: Zip Napture files
       run: |

From 46526cc711d33f55029da046a4882b849bdb1659 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 16:08:12 -0400
Subject: [PATCH 121/140] Update rust.yml

---
 .github/workflows/rust.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 47d4abbd..269d9d4e 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -139,16 +139,23 @@ jobs:
         cd napture
         cargo build --release --verbose
         echo "Napture built successfully."
-
-    - name: Copy files to workspace
+        
+    - name: Copy DLLs to Workspace
       run: |
         mkdir -p napture/target/release/libs
-        cp -r C:/msys64/mingw64/lib/* napture/target/release/libs
+        cd C:/msys64/mingw64/lib
+        find . -name "*.dll" -exec cp --parents \{\} ../../../../napture/target/release/libs \;
+  
+    - name: Move DLLs to Executable Directory
+      run: |
+        cd napture/target/release
+        find libs -name "*.dll" -exec mv {} . \;
+        rm -rf libs
   
     - name: Zip Napture files
       run: |
         cd napture/target/release
-        tar -czvf napture-windows-nightly.tar.gz webx.exe libs
+        tar -czvf napture-windows-nightly.tar.gz webx.exe *.dll
   
     - name: Upload Napture
       uses: actions/upload-artifact@v4

From 97b2e28b11bcf32e2d9d90f99ba1579c6b7d07c3 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 16:20:15 -0400
Subject: [PATCH 122/140] Update rust.yml

---
 .github/workflows/rust.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 269d9d4e..f0be06c9 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -142,18 +142,20 @@ jobs:
         
     - name: Copy DLLs to Workspace
       run: |
+        echo "Copying DLLs to workspace..."
         mkdir -p napture/target/release/libs
-        cd C:/msys64/mingw64/lib
-        find . -name "*.dll" -exec cp --parents \{\} ../../../../napture/target/release/libs \;
-  
+        C:\msys64\usr\bin\bash.exe -lc "find /mingw64/lib -name '*.dll' -exec cp --parents \{\} /c/projects/napture/target/release/libs \;"
+
     - name: Move DLLs to Executable Directory
       run: |
+        echo "Moving DLLs to executable directory..."
         cd napture/target/release
         find libs -name "*.dll" -exec mv {} . \;
         rm -rf libs
   
     - name: Zip Napture files
       run: |
+        echo "Zipping Napture files..."
         cd napture/target/release
         tar -czvf napture-windows-nightly.tar.gz webx.exe *.dll
   

From 0d6fc5fa3c328681dd1893bde35bba4fc862a56a Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 16:38:09 -0400
Subject: [PATCH 123/140] Update rust.yml

---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index f0be06c9..773a2c92 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -150,8 +150,8 @@ jobs:
       run: |
         echo "Moving DLLs to executable directory..."
         cd napture/target/release
-        find libs -name "*.dll" -exec mv {} . \;
-        rm -rf libs
+        move libs\*.dll .
+        rmdir /s /q libs
   
     - name: Zip Napture files
       run: |

From 6bb2d01326fbf3e43029e7b5079d168c989fb016 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:08:47 -0400
Subject: [PATCH 124/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 773a2c92..4b44ab0b 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -151,7 +151,7 @@ jobs:
         echo "Moving DLLs to executable directory..."
         cd napture/target/release
         move libs\*.dll .
-        rmdir /s /q libs
+        rmdir /s /f libs
   
     - name: Zip Napture files
       run: |

From 97d2a603f6bc8b849e531618ba8ce487b27309e2 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:23:03 -0400
Subject: [PATCH 125/140] Update rust.yml

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 4b44ab0b..67779538 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -151,7 +151,7 @@ jobs:
         echo "Moving DLLs to executable directory..."
         cd napture/target/release
         move libs\*.dll .
-        rmdir /s /f libs
+        rmdir /q /s libs
   
     - name: Zip Napture files
       run: |

From 8b6619b0e7a81cc91d6eb8376cc456f9e9f654c3 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 14:35:16 -0700
Subject: [PATCH 126/140] Update rust.yml to not clean up libs folder as that
 is done by github

---
 .github/workflows/rust.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 67779538..41beb91e 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -151,7 +151,6 @@ jobs:
         echo "Moving DLLs to executable directory..."
         cd napture/target/release
         move libs\*.dll .
-        rmdir /q /s libs
   
     - name: Zip Napture files
       run: |

From 09f34cd87aa72ff3399ea88535c065fbaae4b70f Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:45:04 -0400
Subject: [PATCH 127/140] Trying to use 7z this time

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 41beb91e..cc436762 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -156,7 +156,7 @@ jobs:
       run: |
         echo "Zipping Napture files..."
         cd napture/target/release
-        tar -czvf napture-windows-nightly.tar.gz webx.exe *.dll
+        7z a -tzip napture-windows-nightly.zip webx.exe *.dll
   
     - name: Upload Napture
       uses: actions/upload-artifact@v4

From e72f7459f10fecfab1961caf8db289010acc8ebc Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:57:53 -0400
Subject: [PATCH 128/140] Update rust.yml

---
 .github/workflows/rust.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index cc436762..0607a1f9 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -144,13 +144,12 @@ jobs:
       run: |
         echo "Copying DLLs to workspace..."
         mkdir -p napture/target/release/libs
-        C:\msys64\usr\bin\bash.exe -lc "find /mingw64/lib -name '*.dll' -exec cp --parents \{\} /c/projects/napture/target/release/libs \;"
-
+        C:\msys64\usr\bin\bash.exe -lc "find /mingw64/lib -name '*.dll' -exec cp --parents {} /c/projects/napture/target/release/libs \;"
     - name: Move DLLs to Executable Directory
       run: |
         echo "Moving DLLs to executable directory..."
         cd napture/target/release
-        move libs\*.dll .
+        for /R %i in (*.dll) do move "%i" .
   
     - name: Zip Napture files
       run: |
@@ -162,7 +161,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: napture-windows-nightly
-        path: napture/target/release/napture-windows-nightly.tar.gz
+        path: napture/target/release/napture-windows-nightly.zip
           
   upload:
    name: "Upload Release"
@@ -199,6 +198,6 @@ jobs:
           generate_release_notes: true
           files: |
             *.AppImage
-            *.tar.gz
+            *.zip
             *.dmg
           prerelease: true

From 488d18ddf0288c2608c051b0dfc1a24e9840b7e4 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 18:10:33 -0400
Subject: [PATCH 129/140] Update rust.yml

---
 .github/workflows/rust.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 0607a1f9..d44058c4 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -146,6 +146,7 @@ jobs:
         mkdir -p napture/target/release/libs
         C:\msys64\usr\bin\bash.exe -lc "find /mingw64/lib -name '*.dll' -exec cp --parents {} /c/projects/napture/target/release/libs \;"
     - name: Move DLLs to Executable Directory
+      shell: cmd
       run: |
         echo "Moving DLLs to executable directory..."
         cd napture/target/release

From 7fe96d017f8c5717a44d737d5e2efb56f2f956db Mon Sep 17 00:00:00 2001
From: Sticks <sticks@teamhydra.dev>
Date: Wed, 5 Jun 2024 17:15:17 -0500
Subject: [PATCH 130/140] Update and rename rust.yml to build_napture.yml

---
 .github/workflows/{rust.yml => build_napture.yml} | 2 ++
 1 file changed, 2 insertions(+)
 rename .github/workflows/{rust.yml => build_napture.yml} (99%)

diff --git a/.github/workflows/rust.yml b/.github/workflows/build_napture.yml
similarity index 99%
rename from .github/workflows/rust.yml
rename to .github/workflows/build_napture.yml
index d44058c4..98b1314e 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/build_napture.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+    paths:
+      - napture/*
 
 env:
   CARGO_TERM_COLOR: always

From 8090df30db29f3e386b90a67d8c7f17ea6e52234 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 18:25:55 -0400
Subject: [PATCH 131/140] Update build_napture.yml

---
 .github/workflows/build_napture.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_napture.yml b/.github/workflows/build_napture.yml
index 98b1314e..b6d44812 100644
--- a/.github/workflows/build_napture.yml
+++ b/.github/workflows/build_napture.yml
@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - master
-    paths:
-      - napture/*
+#    paths: temp: just for testing purposes uncomment before merge
+#      - napture/*
 
 env:
   CARGO_TERM_COLOR: always
@@ -146,13 +146,7 @@ jobs:
       run: |
         echo "Copying DLLs to workspace..."
         mkdir -p napture/target/release/libs
-        C:\msys64\usr\bin\bash.exe -lc "find /mingw64/lib -name '*.dll' -exec cp --parents {} /c/projects/napture/target/release/libs \;"
-    - name: Move DLLs to Executable Directory
-      shell: cmd
-      run: |
-        echo "Moving DLLs to executable directory..."
-        cd napture/target/release
-        for /R %i in (*.dll) do move "%i" .
+        move *.dll napture/target/release/"
   
     - name: Zip Napture files
       run: |

From 1cf79b75d6cdcdcb47c2b10265af823a01455553 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 18:36:05 -0400
Subject: [PATCH 132/140] add terminator :)

---
 .github/workflows/build_napture.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_napture.yml b/.github/workflows/build_napture.yml
index b6d44812..d2ecc056 100644
--- a/.github/workflows/build_napture.yml
+++ b/.github/workflows/build_napture.yml
@@ -146,7 +146,7 @@ jobs:
       run: |
         echo "Copying DLLs to workspace..."
         mkdir -p napture/target/release/libs
-        move *.dll napture/target/release/"
+        move *.dll napture/target/release/".
   
     - name: Zip Napture files
       run: |

From 71a3b8cafcc5a9187194fc81bf88b02aec8605e7 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 18:46:49 -0400
Subject: [PATCH 133/140] Update build_napture.yml

---
 .github/workflows/build_napture.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_napture.yml b/.github/workflows/build_napture.yml
index d2ecc056..91a527a9 100644
--- a/.github/workflows/build_napture.yml
+++ b/.github/workflows/build_napture.yml
@@ -146,7 +146,7 @@ jobs:
       run: |
         echo "Copying DLLs to workspace..."
         mkdir -p napture/target/release/libs
-        move *.dll napture/target/release/".
+        move *.dll napture/target/release/
   
     - name: Zip Napture files
       run: |

From 187f253c3d5ac7ccdf54588f730070a8b47647a7 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 19:00:59 -0400
Subject: [PATCH 134/140] Update build_napture.yml

---
 .github/workflows/build_napture.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_napture.yml b/.github/workflows/build_napture.yml
index 91a527a9..732a918b 100644
--- a/.github/workflows/build_napture.yml
+++ b/.github/workflows/build_napture.yml
@@ -146,7 +146,7 @@ jobs:
       run: |
         echo "Copying DLLs to workspace..."
         mkdir -p napture/target/release/libs
-        move *.dll napture/target/release/
+        Get-ChildItem -Recurse -Filter *.dll -File -Force | ForEach-Object { Move-Item -Force -Path $_.FullName -Destination ../ }
   
     - name: Zip Napture files
       run: |

From 0def2d2903621be25e829a47926d37199d324bf4 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 19:12:33 -0400
Subject: [PATCH 135/140] Update build_napture.yml

---
 .github/workflows/build_napture.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_napture.yml b/.github/workflows/build_napture.yml
index 732a918b..e9c9955a 100644
--- a/.github/workflows/build_napture.yml
+++ b/.github/workflows/build_napture.yml
@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - master
-#    paths: temp: just for testing purposes uncomment before merge
-#      - napture/*
+    paths: 
+      - napture/*
 
 env:
   CARGO_TERM_COLOR: always

From 402ec20bd3acf99818a6a60b94facd5d906e7c3d Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 19:31:44 -0400
Subject: [PATCH 136/140] Update build_napture.yml

---
 .github/workflows/build_napture.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_napture.yml b/.github/workflows/build_napture.yml
index e9c9955a..90e13b6f 100644
--- a/.github/workflows/build_napture.yml
+++ b/.github/workflows/build_napture.yml
@@ -142,11 +142,12 @@ jobs:
         cargo build --release --verbose
         echo "Napture built successfully."
         
-    - name: Copy DLLs to Workspace
+    - name: Copy and Move DLLs
       run: |
-        echo "Copying DLLs to workspace..."
-        mkdir -p napture/target/release/libs
-        Get-ChildItem -Recurse -Filter *.dll -File -Force | ForEach-Object { Move-Item -Force -Path $_.FullName -Destination ../ }
+        echo "Copying and moving DLLs to executable directory..."
+        C:\msys64\usr\bin\bash.exe -lc "find /mingw64/lib -name '*.dll' -exec cp --parents {} /c/projects/napture/target/release \;"
+        cd napture/target/release
+        Get-ChildItem -Recurse -Filter *.dll -File -Force | ForEach-Object { Move-Item -Force -Path $_.FullName -Destination . }
   
     - name: Zip Napture files
       run: |

From 12dc3a824e0baa08f52639d0da6e5327a8703e16 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 19:32:01 -0400
Subject: [PATCH 137/140] Update build_napture.yml

---
 .github/workflows/build_napture.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_napture.yml b/.github/workflows/build_napture.yml
index 90e13b6f..43594e76 100644
--- a/.github/workflows/build_napture.yml
+++ b/.github/workflows/build_napture.yml
@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - master
-    paths: 
-      - napture/*
+#    paths: 
+#      - napture/*
 
 env:
   CARGO_TERM_COLOR: always

From 1d4b1abfee4f2b04ea1671d02eb5c73bf1165746 Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 19:50:57 -0400
Subject: [PATCH 138/140] Update build_napture.yml

---
 .github/workflows/build_napture.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_napture.yml b/.github/workflows/build_napture.yml
index 43594e76..e25a4ba0 100644
--- a/.github/workflows/build_napture.yml
+++ b/.github/workflows/build_napture.yml
@@ -147,7 +147,7 @@ jobs:
         echo "Copying and moving DLLs to executable directory..."
         C:\msys64\usr\bin\bash.exe -lc "find /mingw64/lib -name '*.dll' -exec cp --parents {} /c/projects/napture/target/release \;"
         cd napture/target/release
-        Get-ChildItem -Recurse -Filter *.dll -File -Force | ForEach-Object { Move-Item -Force -Path $_.FullName -Destination . }
+        Get-ChildItem -Path C:\projects\napture\target\release -Recurse -Include *.dll | ForEach-Object { Move-Item -Path $_.FullName -Destination C:\projects\napture\target\release -Force }
   
     - name: Zip Napture files
       run: |

From c3ac3fd64f168f8ec9b9c644dbd9ed9a8696f56b Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 20:03:45 -0400
Subject: [PATCH 139/140] Update build_napture.yml

---
 .github/workflows/build_napture.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_napture.yml b/.github/workflows/build_napture.yml
index e25a4ba0..d309682e 100644
--- a/.github/workflows/build_napture.yml
+++ b/.github/workflows/build_napture.yml
@@ -144,10 +144,14 @@ jobs:
         
     - name: Copy and Move DLLs
       run: |
-        echo "Copying and moving DLLs to executable directory..."
-        C:\msys64\usr\bin\bash.exe -lc "find /mingw64/lib -name '*.dll' -exec cp --parents {} /c/projects/napture/target/release \;"
-        cd napture/target/release
-        Get-ChildItem -Path C:\projects\napture\target\release -Recurse -Include *.dll | ForEach-Object { Move-Item -Path $_.FullName -Destination C:\projects\napture\target\release -Force }
+        echo "Copying DLLs..."
+        mkdir -p napture/target/release/libs
+        cp C:/msys64/mingw64/bin/*.dll napture/target/release/libs
+        cp C:/msys64/mingw64/lib/*.dll napture/target/release/libs
+        echo "DLLs copied."
+        echo "Moving DLLs to exe directory..."
+        mv napture/target/release/libs/*.dll napture/target/release/
+        echo "DLLs moved."
   
     - name: Zip Napture files
       run: |

From 2fe29f6dcdb14d63ba76d9f485477301eaafaffe Mon Sep 17 00:00:00 2001
From: the-broz <77699093+the-broz@users.noreply.github.com>
Date: Wed, 5 Jun 2024 20:17:22 -0400
Subject: [PATCH 140/140] Update build_napture.yml

---
 .github/workflows/build_napture.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_napture.yml b/.github/workflows/build_napture.yml
index d309682e..63d38ce2 100644
--- a/.github/workflows/build_napture.yml
+++ b/.github/workflows/build_napture.yml
@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - master
-#    paths: 
-#      - napture/*
+    paths: 
+      - napture/*
 
 env:
   CARGO_TERM_COLOR: always