Commit daf9a6b8 authored by Ohjne's avatar Ohjne Committed by Michal Koutenský
Browse files

aonsoku: 0.9.1 -> 0.13.0



Co-authored-by: default avatarOhjne <er@le.com>
parent d563dac0
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
diff --git a/electron/main/index.ts b/electron/main/index.ts
index 78256e3..93e3881 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -4,6 +4,8 @@ import { createAppMenu } from './core/menu'
 import { initAutoUpdater } from './core/updater'
 import { createWindow, mainWindow } from './window'
 
+app.setDesktopName("Aonsoku.desktop")
+
 export let isQuitting = false
 
 const currentDesktop = process.env.XDG_CURRENT_DESKTOP ?? ''
+74 −30
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchFromGitHub,
  rustPlatform,
  cargo-tauri,
  nodejs,
  pnpm_8,
  pnpm_9,
  fetchPnpmDeps,
  pnpmConfigHook,
  pkg-config,
  wrapGAppsHook3,
  openssl,
  webkitgtk_4_1,
  glib-networking,
  makeWrapper,
  electron,
  nix-update-script,
  makeDesktopItem,
  copyDesktopItems,
}:
rustPlatform.buildRustPackage (finalAttrs: {

stdenv.mkDerivation (finalAttrs: {
  pname = "aonsoku";
  version = "0.9.1";
  version = "0.13.0";

  src = fetchFromGitHub {
    owner = "victoralvesf";
    repo = "aonsoku";
    tag = "v${finalAttrs.version}";
    hash = "sha256-qlc7P222e6prYG30iVTAZhP772za3H7gVszfWvOr2NM=";
    hash = "sha256-jpBO5MqOc18KGncpOWB/3IjCgkWb2zFfNxTpkcayZwo=";
  };

  # lockfileVersion: '6.0' need old pnpm
  patches = [
    ./remove_updater.patch
    ./fix_appid.patch
  ];

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
    pnpm = pnpm_8;
    pnpm = pnpm_9;
    fetcherVersion = 3;
    hash = "sha256-gOPjNZCljr8OvU/xLs9ZQ27dl3RatscXddOyPfSVdoE=";
    hash = "sha256-B5bEAj6Ii/c7ZZobQmc8nHFbpBX9n/eYwRZ7lsLs3fk=";
  };

  cargoRoot = "src-tauri";
  buildAndTestSubdir = finalAttrs.cargoRoot;

  cargoHash = "sha256-8UtfL8iB1XKP31GT9Ok5hIQSobQTm681uiluG+IhK/s=";

  patches = [ ./remove_updater.patch ];

  nativeBuildInputs = [
    nodejs
    pnpm_9
    pnpmConfigHook
    pnpm_8
    cargo-tauri.hook
    pkg-config
    wrapGAppsHook3
    makeWrapper
    electron
    copyDesktopItems
  ];

  buildInputs = [
    openssl
    webkitgtk_4_1
    glib-networking
  buildInputs = [ finalAttrs.pnpmDeps ];

  desktopItems = [
    (makeDesktopItem {
      name = "aonsoku";
      desktopName = "Aonsoku";
      comment = "Modern desktop client for Navidrome/Subsonic servers";
      exec = "Aonsoku";
      icon = "aonsoku";
      categories = [
        "AudioVideo"
        "Audio"
        "Music"
        "Player"
      ];
      startupWMClass = "Aonsoku";
    })
  ];

  preConfigure = ''
    export ELECTRON_SKIP_BINARY_DOWNLOAD=1
  '';

  buildPhase = ''
    runHook preBuild
    pnpm run electron:build
    runHook postBuild
  '';

  installPhase = ''
    runHook preInstall

    mkdir -p $out/lib/aonsoku/out
    cp -r out/* $out/lib/aonsoku/out/

    mkdir -p $out/lib/aonsoku/out/main/resources
    cp -r resources/* $out/lib/aonsoku/out/main/resources/

    cp -r node_modules $out/lib/aonsoku/

    mkdir -p $out/bin
    makeWrapper ${electron}/bin/electron $out/bin/Aonsoku \
      --add-flags $out/lib/aonsoku/out/main/index.js \
      --set ELECTRON_IS_DEV 0

    mkdir -p $out/share/icons/hicolor/512x512/apps
    cp resources/icons/icon.png \
      $out/share/icons/hicolor/512x512/apps/aonsoku.png

    runHook postInstall
  '';

  passthru.updateScript = nix-update-script { };

@@ -62,7 +104,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
    homepage = "https://github.com/victoralvesf/aonsoku";
    changelog = "https://github.com/victoralvesf/aonsoku/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ genga898 ];
    maintainers = with lib.maintainers; [
      genga898
    ];
    mainProgram = "Aonsoku";
  };
})
+15 −39
Original line number Diff line number Diff line
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 112ee8e..35137f2 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -50,7 +50,6 @@ fn main() {
             Ok(())
         })
         .plugin(tauri_plugin_shell::init())
-        .plugin(tauri_plugin_updater::Builder::new().build())
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_os::init())
         .invoke_handler(tauri::generate_handler![commands::download_file])
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 3afc5f6..19785e5 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,6 @@
   "bundle": {
     "active": true,
     "category": "Music",
-    "createUpdaterArtifacts": true,
     "targets": "all",
     "icon": [
       "icons/32x32.png",
@@ -26,14 +25,6 @@
   "productName": "Aonsoku",
   "mainBinaryName": "Aonsoku",
   "identifier": "com.victoralvesf.aonsoku",
-  "plugins": {
-    "updater": {
-      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDRDNTlENjZCNTJFRDdDRDAKUldUUWZPMVNhOVpaVENsbXg5RTM1TzFnME43TmZoaHU5bWplS1VSSW9YcE1QT0w1ZHRIWHNUOVoK",
-      "endpoints": [
-        "https://github.com/victoralvesf/aonsoku/releases/latest/download/latest.json"
-      ]
-    }
-  },
   "app": {
     "withGlobalTauri": true,
     "security": {
diff --git a/src/app/observers/update-observer.tsx b/src/app/observers/update-observer.tsx
index 7dd77aa..4a88a4f 100644
--- a/src/app/observers/update-observer.tsx
+++ b/src/app/observers/update-observer.tsx
@@ -30,8 +30,8 @@ export function UpdateObserver() {
 
   const { data: updateCheckResult } = useQuery({
     queryKey: [queryKeys.update.check],
-    queryFn: async () => await window.api.checkForUpdates(),
-    enabled: !remindOnNextBoot,
+    queryFn: async () => ({ files: [] }),
+    enabled: false,
     refetchOnWindowFocus: false,
     refetchOnMount: false,
     staleTime: Infinity,