Minor fixes (#876)

* fix(backend): lowercase all headers

* ci: supply app version as env variable

* build(backend): add `dotenvy_macro` deps

* build: change to common version

* feat(backend): handle version variable correctly

* ci: exit early if env variable does not exist

Author: IgnisDa

.github/workflows/release.yml

@@ -95,6 +95,8 @@ jobs:
           script: |
             const repoName = context.payload.repository.name;
             const refName = context.ref.replace('refs/tags/', '');
+            core.setOutput('APP_VERSION', refName);
+
             const dockerHubActor = process.env.DOCKER_USERNAME;
             const ghcrRegistry = process.env.GHCR_REGISTRY;
             const ghcrActor = context.actor;
@@ -125,6 +127,8 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.required_args.outputs.image_names }}
+          build-args: |
+            APP_VERSION=${{ steps.required_args.outputs.APP_VERSION }}
 
   upload-kodi-plugin:
     runs-on: ubuntu-20.04

Cargo.lock

@@ -32,13 +32,16 @@ RUN cargo chef prepare --recipe-path recipe.json
 
 FROM backend-chef AS backend-builder
 ARG TARGETARCH
+ARG APP_VERSION
 ARG BUILD_PROFILE=release
 ENV RUST_TARGET_TRIPLE_arm64="aarch64-unknown-linux-gnu"
 ENV RUST_TARGET_TRIPLE_amd64="x86_64-unknown-linux-gnu"
 ENV TARGET_CC="clang"
 ENV TARGET_AR="llvm-ar"
 ENV CFLAGS_aarch64_unknown_linux_gnu="--sysroot=/usr/aarch64-linux-gnu"
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
+ENV APP_VERSION=$APP_VERSION
+RUN test -n "$APP_VERSION"
 COPY --from=backend-planner /app/recipe.json recipe.json
 RUN rustup target add $(eval "echo \$RUST_TARGET_TRIPLE_$TARGETARCH")
 RUN cargo chef cook --profile $BUILD_PROFILE --target $(eval "echo \$RUST_TARGET_TRIPLE_$TARGETARCH") --recipe-path recipe.json

Dockerfile

@@ -1,6 +1,6 @@
 [package]
 name = "ryot"
-version = "6.2.3"
+version = "0.1.0"
 edition = "2021"
 repository = "https://github.com/IgnisDa/ryot"
 license = "GPL-3.0"
@@ -30,6 +30,7 @@ derive_more = { version = "=1.0.0-beta.6", features = [
     "add_assign",
 ], default-features = false }
 dotenvy = "=0.15.7"
+dotenvy_macro = "=0.15.7"
 enum_meta = "=0.7.0"
 flate2 = "=1.0.30"
 futures = "=0.3.30"

apps/backend/Cargo.toml

@@ -650,7 +650,7 @@ async fn get_client(config: &config::VideoGameConfig) -> Client {
         URL,
         Some(vec![
             (
-                HeaderName::from_static("Client-ID"),
+                HeaderName::from_static("client-id"),
                 HeaderValue::from_str(&config.twitch.client_id).unwrap(),
             ),
             (

apps/backend/src/providers/igdb.rs

@@ -272,7 +272,7 @@ async fn get_client_config(url: &str, api_token: &str) -> (Client, Settings) {
     let client = get_base_http_client(
         url,
         Some(vec![(
-            HeaderName::from_static("X-ListenAPI-Key"),
+            HeaderName::from_static("x-listenapi-key"),
             HeaderValue::from_str(api_token).unwrap(),
         )]),
     );

apps/backend/src/providers/listennotes.rs

@@ -133,7 +133,7 @@ async fn get_client_config(url: &str, client_id: &str) -> Client {
     get_base_http_client(
         url,
         Some(vec![(
-            HeaderName::from_static("X-MAL-CLIENT-ID"),
+            HeaderName::from_static("x-mal-client-id"),
             HeaderValue::from_str(client_id).unwrap(),
         )]),
     )

apps/backend/src/providers/mal.rs

@@ -43,7 +43,10 @@ use crate::{
 };
 
 pub static BASE_DIR: &str = env!("CARGO_MANIFEST_DIR");
-pub const VERSION: &str = env!("CARGO_PKG_VERSION");
+#[cfg(debug_assertions)]
+pub const VERSION: &str = dotenvy_macro::dotenv!("APP_VERSION");
+#[cfg(not(debug_assertions))]
+pub const VERSION: &str = env!("APP_VERSION");
 pub const AUTHOR: &str = "ignisda";
 pub const AUTHOR_EMAIL: &str = "ignisda2001@gmail.com";
 pub const USER_AGENT_STR: &str = const_str::concat!(

apps/backend/src/utils.rs

@@ -1,6 +1,6 @@
 [package]
 name = "rs-utils"
-version = "0.0.0"
+version = "0.1.0"
 edition = "2021"
 
 [dependencies]