ARM support, ommiting episode names and adding a "0" prefix to episode and season numbers

.github/workflows/build.yml

@@ -52,6 +52,110 @@ jobs:
           name: linux
           path: target/release/jellyfin-rpc-x86_64-linux
 
+  ubuntu-arm32:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Alpine Linux v3.15 for armv7
+        uses: jirutka/setup-alpine@v1
+        with:
+          arch: armv7
+          branch: v3.15
+          packages: binutils
+
+      - name: Install latest rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: armv7-unknown-linux-gnueabihf
+          default: true
+          override: true
+
+      - name: Install ARM32 gcc
+        run: sudo apt install gcc-arm-linux-gnueabihf -y
+
+      - name: Cache target folder
+        uses: actions/cache@v3
+        env:
+          cache-name: target-folder
+        with:
+          path: target
+          key: arm32-linux-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            arm32-linux-
+
+      - name: Build for ARM32 Linux
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: true
+          command: build
+          args: --target armv7-unknown-linux-gnueabihf --workspace --locked --release
+
+      - name: Strip and rename binary
+        run: strip target/armv7-unknown-linux-gnueabihf/release/jellyfin-rpc && mv target/armv7-unknown-linux-gnueabihf/release/jellyfin-rpc target/armv7-unknown-linux-gnueabihf/release/jellyfin-rpc-arm32-linux
+        shell: alpine.sh {0}
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: linux-arm32
+          path: target/armv7-unknown-linux-gnueabihf/release/jellyfin-rpc-arm32-linux
+
+  ubuntu-arm64:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Alpine Linux v3.15 for armv7
+        uses: jirutka/setup-alpine@v1
+        with:
+          arch: aarch64
+          branch: v3.15
+          packages: binutils
+
+      - name: Install latest rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: aarch64-unknown-linux-gnu
+          default: true
+          override: true
+
+      - name: Install ARM64 gcc
+        run: sudo apt install gcc-aarch64-linux-gnu -y
+
+      - name: Cache target folder
+        uses: actions/cache@v3
+        env:
+          cache-name: target-folder
+        with:
+          path: target
+          key: arm64-linux-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            arm64-linux-
+
+      - name: Build for ARM64 Linux
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: true
+          command: build
+          args: --target aarch64-unknown-linux-gnu --workspace --locked --release
+
+      - name: Strip and rename binary
+        run: strip target/aarch64-unknown-linux-gnu/release/jellyfin-rpc && mv target/aarch64-unknown-linux-gnu/release/jellyfin-rpc target/aarch64-unknown-linux-gnu/release/jellyfin-rpc-arm64-linux
+        shell: alpine.sh {0}          
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: linux-arm64
+          path: target/aarch64-unknown-linux-gnu/release/jellyfin-rpc-arm64-linux
+
   windows:
     runs-on: windows-latest
 

.github/workflows/release.yml

@@ -53,6 +53,61 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+  ubuntu-arm:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Alpine Linux v3.15 for armv7
+        uses: jirutka/setup-alpine@v1
+        with:
+          arch: armv7
+          branch: v3.15
+          packages: binutils
+
+      - name: Install latest rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: armv7-unknown-linux-gnueabihf
+          default: true
+          override: true
+
+      - name: Install ARM gcc
+        run: sudo apt install gcc-arm-linux-gnueabihf -y
+
+      - name: Cache target folder
+        uses: actions/cache@v3
+        env:
+          cache-name: target-folder
+        with:
+          path: target
+          key: arm-linux-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            arm-linux-
+
+      - name: Build for ARM Linux
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: true
+          command: build
+          args: --target armv7-unknown-linux-gnueabihf --workspace --locked --release
+
+      - name: Strip and rename binary
+        run: strip target/armv7-unknown-linux-gnueabihf/release/jellyfin-rpc && mv target/armv7-unknown-linux-gnueabihf/release/jellyfin-rpc target/armv7-unknown-linux-gnueabihf/release/jellyfin-rpc-arm-linux
+        shell: alpine.sh {0}
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            target/armv7-unknown-linux-gnueabihf/release/jellyfin-rpc-arm-linux
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   windows:
     runs-on: windows-latest
 

jellyfin-rpc/example.json

@@ -8,6 +8,9 @@
             "separator": "-"
         },
         "self_signed_cert": false,
+        "show_simple": false,
+        "append_prefix": false,
+        "add_divider": false,
         "_comment": "the 4 lines below and this line arent needed and should be removed, by default nothing will display if these are present",
         "blacklist": {
             "media_types": ["music", "movie", "episode", "livetv"],

jellyfin-rpc/src/core/config.rs

@@ -37,6 +37,12 @@ pub struct Jellyfin {
     pub blacklist: Option<Blacklist>,
     /// Self signed certificate option
     pub self_signed_cert: Option<bool>,
+    /// Simple episode name
+    pub show_simple: Option<bool>,
+    /// Add "0" before season/episode number if lower than 10.
+    pub append_prefix: Option<bool>,
+    /// Add a divider between numbers
+    pub add_divider: Option<bool>
 }
 
 /// Username of the person that info should be gathered from.
@@ -168,6 +174,9 @@ impl Default for Config {
                 music: None,
                 blacklist: None,
                 self_signed_cert: None,
+                show_simple: Some(false),
+                append_prefix: Some(false),
+                add_divider: Some(false)
             },
             discord: None,
             imgur: None,

jellyfin-rpc/src/services/jellyfin.rs

@@ -223,21 +223,50 @@ impl Content {
         After the for loop is complete we remove the trailing ", " because it looks bad in the presence.
         Then we send it off as a Vec<String> with the external urls and the end timer to the main loop.
         */
-        let name = now_playing_item["Name"].as_str()?;
+        let name = if config.jellyfin.show_simple? {
+          ""
+        } else {
+          now_playing_item["Name"].as_str()?
+        };
         if now_playing_item["Type"].as_str()? == "Episode" {
-            let season = now_playing_item["ParentIndexNumber"].to_string();
-            let first_episode_number = now_playing_item["IndexNumber"].to_string();
-            let mut state = "S".to_owned() + &season + "E" + &first_episode_number;
+            let season = now_playing_item["ParentIndexNumber"].as_i64().unwrap_or(0) as i32;
+            let first_episode_number = now_playing_item["IndexNumber"].as_i64().unwrap_or(0) as i32;
+            let mut state;
+            if config.jellyfin.append_prefix? {
+                if config.jellyfin.add_divider? {
+                  state = format!("S{:02} - E{:02}", season, first_episode_number);
+                } else {
+                  state = format!("S{:02}E{:02}", season, first_episode_number);
+                }
+
+            } else {
+              if config.jellyfin.add_divider? {
+                state = format!("S{} - E{}", season, first_episode_number);
+              } else {
+                state = format!("S{}E{}", season, first_episode_number);
+              }
+            };
 
-            if season == *"null" {
-                state = "E".to_owned() + &first_episode_number;
+            if season.to_string() == *"null" {
+                if config.jellyfin.append_prefix? {
+                    state = format!("E{:02}", first_episode_number);
+                } else {
+                    state = format!("E{}", first_episode_number);
+                };
             }
 
             if now_playing_item.get("IndexNumberEnd").is_some() {
-                state += &("-".to_string() + &now_playing_item["IndexNumberEnd"].to_string());
+                let end_number = if config.jellyfin.append_prefix? {
+                    format!("{:02}", now_playing_item["IndexNumberEnd"])
+                } else {
+                    format!("{}", now_playing_item["IndexNumberEnd"])
+                };
+                state += &(" - ".to_string() + &end_number);
             }
 
-            state += &(" ".to_string() + name);
+            if !config.jellyfin.show_simple? {
+              state += &(" ".to_string() + name);
+            }
             content.media_type(MediaType::Episode);
             content.details(now_playing_item["SeriesName"].as_str()?.to_string());
             content.state_message(state);

jellyfin-rpc/src/tests.rs

@@ -22,6 +22,9 @@ fn load_example_config() {
                 libraries: Some(vec!["Anime".to_string(), "Anime Movies".to_string()]),
             }),
             self_signed_cert: Some(false),
+            show_simple: Some(false),
+            append_prefix: Some(false),
+            add_divider: Some(false)
         },
         discord: Some(Discord {
             application_id: Some("1053747938519679018".to_string()),
@@ -63,6 +66,9 @@ fn try_get_content() {
             music: None,
             blacklist: None,
             self_signed_cert: None,
+            show_simple: Some(false),
+            append_prefix: Some(false),
+            add_divider: Some(false)
         },
         discord: None,
         imgur: None,

scripts/installer.py

@@ -11,6 +11,19 @@
 from time import sleep
 import sys
 
+
+def is_arm():
+    try:
+        with open('/proc/cpuinfo', 'r') as cpuinfo:
+            for line in cpuinfo:
+                if line.startswith('model name'):
+                    hardware = line.split(':')[1].strip()
+                    if 'ARM' in hardware:
+                        return True
+    except FileNotFoundError:
+        pass
+    return False
+
 path = ""
 
 if platform.system() != "Windows":
@@ -130,13 +143,43 @@
 
         break
 
+    show_simple = input("Do you want to show episode names in RPC? (Y/n): ").lower()
+
+    if show_simple == "y":
+        show_simple = False
+    elif show_simple == "n":
+        show_simple = True
+    else:
+        show_simple = False
+
+    append_prefix = input("Do you want to add a leading 0 to season and episode numbers? (Y/n): ").lower()
+
+    if append_prefix == "y":
+        append_prefix = True
+    elif append_prefix == "n":
+        append_prefix = False
+    else:
+        append_prefix = False
+
+    add_divider = input("Do you want to add a divider between numbers, ex. S01 - E01? (Y/n): ").lower()
+
+    if add_divider == "y":
+        add_divider = True
+    elif add_divider == "n":
+        add_divider = False
+    else:
+        add_divider = False
+
     jellyfin = {
         "url": url,
         "api_key": api_key,
         "username": username,
         "music": music,
         "blacklist": blacklist,
-        "self_signed_cert": self_signed_cert
+        "self_signed_cert": self_signed_cert,
+        "show_simple": show_simple,
+        "append_prefix": append_prefix,
+        "add_divider": add_divider
     }
 
     print("----------Discord----------")
@@ -359,8 +402,13 @@
         print("If needed, you can run Jellyfin RPC at any time by running 'jellyfin-rpc' in a terminal.")
         break
 else:
+    if is_arm():
+      linux_binary = "jellyfin-rpc-arm-linux"
+    else :
+      linux_binary = "jellyfin-rpc-x86_64-linux"
+
     subprocess.run(["mkdir", "-p", os.environ["HOME"].removesuffix("/") + "/.local/bin"])
-    subprocess.run(["curl", "-o", os.environ["HOME"].removesuffix("/") + "/.local/bin/jellyfin-rpc", "-L", "https://github.com/Radiicall/jellyfin-rpc/releases/latest/download/jellyfin-rpc-x86_64-linux"])
+    subprocess.run(["curl", "-o", os.environ["HOME"].removesuffix("/") + "/.local/bin/jellyfin-rpc", "-L", f"https://github.com/Radiicall/jellyfin-rpc/releases/latest/download/{linux_binary}"])
     subprocess.run(["chmod", "+x", os.environ["HOME"].removesuffix("/") + "/.local/bin/jellyfin-rpc"])
 
     if os.environ.get("XDG_CONFIG_HOME"):