Remove playlist detail route file

- Typescript cannot determine if a function throws an error
- Does not work as a type guard when using ts-rest

.dockerignore

@@ -1,3 +0,0 @@
-node_modules
-Dockerfile
-docker-compose.*

.erb/configs/webpack.config.renderer.dev.ts

@@ -16,7 +16,7 @@ import webpackPaths from './webpack.paths';
 // When an ESLint server is running, we can't set the NODE_ENV so we'll check if it's
 // at the dev webpack config is not accidentally run in a production environment
 if (process.env.NODE_ENV === 'production') {
-    checkNodeEnv('development');
+  checkNodeEnv('development');
 }
 
 const port = process.env.PORT || 4343;
@@ -28,174 +28,171 @@ const requiredByDLLConfig = module.parent!.filename.includes('webpack.config.ren
  * Warn if the DLL is not built
  */
 if (!requiredByDLLConfig && !(fs.existsSync(webpackPaths.dllPath) && fs.existsSync(manifest))) {
-    console.log(
-        chalk.black.bgYellow.bold(
-            'The DLL files are missing. Sit back while we build them for you with "npm run build-dll"',
-        ),
-    );
-    execSync('npm run postinstall');
+  console.log(
+    chalk.black.bgYellow.bold(
+      'The DLL files are missing. Sit back while we build them for you with "npm run build-dll"',
+    ),
+  );
+  execSync('npm run postinstall');
 }
 
 const configuration: webpack.Configuration = {
-    devtool: 'inline-source-map',
+  devtool: 'inline-source-map',
 
-    mode: 'development',
+  mode: 'development',
 
-    target: ['web', 'electron-renderer'],
+  target: ['web', 'electron-renderer'],
 
-    entry: [
-        `webpack-dev-server/client?http://localhost:${port}/dist`,
-        'webpack/hot/only-dev-server',
-        path.join(webpackPaths.srcRendererPath, 'index.tsx'),
-    ],
+  entry: [
+    `webpack-dev-server/client?http://localhost:${port}/dist`,
+    'webpack/hot/only-dev-server',
+    path.join(webpackPaths.srcRendererPath, 'index.tsx'),
+  ],
 
-    output: {
-        path: webpackPaths.distRendererPath,
-        publicPath: '/',
-        filename: 'renderer.dev.js',
-        library: {
-            type: 'umd',
-        },
+  output: {
+    path: webpackPaths.distRendererPath,
+    publicPath: '/',
+    filename: 'renderer.dev.js',
+    library: {
+      type: 'umd',
     },
+  },
 
-    module: {
-        rules: [
-            {
-                test: /\.s?css$/,
-                use: [
-                    'style-loader',
-                    {
-                        loader: 'css-loader',
-                        options: {
-                            modules: {
-                                localIdentName: '[name]__[local]--[hash:base64:5]',
-                                exportLocalsConvention: 'camelCaseOnly',
-                            },
-                            sourceMap: true,
-                            importLoaders: 1,
-                        },
-                    },
-                    'sass-loader',
-                ],
-                include: /\.module\.s?(c|a)ss$/,
-            },
-            {
-                test: /\.s?css$/,
-                use: ['style-loader', 'css-loader', 'sass-loader'],
-                exclude: /\.module\.s?(c|a)ss$/,
-            },
-            // Fonts
-            {
-                test: /\.(woff|woff2|eot|ttf|otf)$/i,
-                type: 'asset/resource',
-            },
-            // Images
-            {
-                test: /\.(png|svg|jpg|jpeg|gif)$/i,
-                type: 'asset/resource',
+  module: {
+    rules: [
+      {
+        test: /\.s?css$/,
+        use: [
+          'style-loader',
+          {
+            loader: 'css-loader',
+            options: {
+              modules: {
+                localIdentName: '[name]__[local]--[hash:base64:5]',
+                exportLocalsConvention: 'camelCaseOnly',
+              },
+              sourceMap: true,
+              importLoaders: 1,
             },
+          },
+          'sass-loader',
         ],
-    },
-    plugins: [
-        ...(requiredByDLLConfig
-            ? []
-            : [
-                  new webpack.DllReferencePlugin({
-                      context: webpackPaths.dllPath,
-                      manifest: require(manifest),
-                      sourceType: 'var',
-                  }),
-              ]),
-
-        new webpack.NoEmitOnErrorsPlugin(),
-
-        /**
-         * Create global constants which can be configured at compile time.
-         *
-         * Useful for allowing different behaviour between development builds and
-         * release builds
-         *
-         * NODE_ENV should be production so that modules do not perform certain
-         * development checks
-         *
-         * By default, use 'development' as NODE_ENV. This can be overriden with
-         * 'staging', for example, by changing the ENV variables in the npm scripts
-         */
-        new webpack.EnvironmentPlugin({
-            NODE_ENV: 'development',
-        }),
-
-        new webpack.LoaderOptionsPlugin({
-            debug: true,
-        }),
-
-        new ReactRefreshWebpackPlugin(),
-
-        new HtmlWebpackPlugin({
-            filename: path.join('index.html'),
-            template: path.join(webpackPaths.srcRendererPath, 'index.ejs'),
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true,
-            },
-            isBrowser: false,
-            env: process.env.NODE_ENV,
-            isDevelopment: process.env.NODE_ENV !== 'production',
-            nodeModules: webpackPaths.appNodeModulesPath,
-            templateParameters: {
-                web: false,
-            },
-        }),
+        include: /\.module\.s?(c|a)ss$/,
+      },
+      {
+        test: /\.s?css$/,
+        use: ['style-loader', 'css-loader', 'sass-loader'],
+        exclude: /\.module\.s?(c|a)ss$/,
+      },
+      // Fonts
+      {
+        test: /\.(woff|woff2|eot|ttf|otf)$/i,
+        type: 'asset/resource',
+      },
+      // Images
+      {
+        test: /\.(png|svg|jpg|jpeg|gif)$/i,
+        type: 'asset/resource',
+      },
     ],
+  },
+  plugins: [
+    ...(requiredByDLLConfig
+      ? []
+      : [
+          new webpack.DllReferencePlugin({
+            context: webpackPaths.dllPath,
+            manifest: require(manifest),
+            sourceType: 'var',
+          }),
+        ]),
 
-    node: {
-        __dirname: false,
-        __filename: false,
+    new webpack.NoEmitOnErrorsPlugin(),
+
+    /**
+     * Create global constants which can be configured at compile time.
+     *
+     * Useful for allowing different behaviour between development builds and
+     * release builds
+     *
+     * NODE_ENV should be production so that modules do not perform certain
+     * development checks
+     *
+     * By default, use 'development' as NODE_ENV. This can be overriden with
+     * 'staging', for example, by changing the ENV variables in the npm scripts
+     */
+    new webpack.EnvironmentPlugin({
+      NODE_ENV: 'development',
+    }),
+
+    new webpack.LoaderOptionsPlugin({
+      debug: true,
+    }),
+
+    new ReactRefreshWebpackPlugin(),
+
+    new HtmlWebpackPlugin({
+      filename: path.join('index.html'),
+      template: path.join(webpackPaths.srcRendererPath, 'index.ejs'),
+      minify: {
+        collapseWhitespace: true,
+        removeAttributeQuotes: true,
+        removeComments: true,
+      },
+      isBrowser: false,
+      env: process.env.NODE_ENV,
+      isDevelopment: process.env.NODE_ENV !== 'production',
+      nodeModules: webpackPaths.appNodeModulesPath,
+    }),
+  ],
+
+  node: {
+    __dirname: false,
+    __filename: false,
+  },
+
+  devServer: {
+    port,
+    compress: true,
+    hot: true,
+    headers: { 'Access-Control-Allow-Origin': '*' },
+    static: {
+      publicPath: '/',
     },
-
-    devServer: {
-        port,
-        compress: true,
-        hot: true,
-        headers: { 'Access-Control-Allow-Origin': '*' },
-        static: {
-            publicPath: '/',
-        },
-        historyApiFallback: {
-            verbose: true,
-        },
-        setupMiddlewares(middlewares) {
-            console.log('Starting preload.js builder...');
-            const preloadProcess = spawn('npm', ['run', 'start:preload'], {
-                shell: true,
-                stdio: 'inherit',
-            })
-                .on('close', (code: number) => process.exit(code!))
-                .on('error', (spawnError) => console.error(spawnError));
-
-            console.log('Starting remote.js builder...');
-            const remoteProcess = spawn('npm', ['run', 'start:remote'], {
-                shell: true,
-                stdio: 'inherit',
-            })
-                .on('close', (code: number) => process.exit(code!))
-                .on('error', (spawnError) => console.error(spawnError));
-
-            console.log('Starting Main Process...');
-            spawn('npm', ['run', 'start:main'], {
-                shell: true,
-                stdio: 'inherit',
-            })
-                .on('close', (code: number) => {
-                    preloadProcess.kill();
-                    remoteProcess.kill();
-                    process.exit(code!);
-                })
-                .on('error', (spawnError) => console.error(spawnError));
-            return middlewares;
-        },
+    historyApiFallback: {
+      verbose: true,
     },
+    setupMiddlewares(middlewares) {
+      console.log('Starting preload.js builder...');
+      const preloadProcess = spawn('npm', ['run', 'start:preload'], {
+        shell: true,
+        stdio: 'inherit',
+      })
+        .on('close', (code: number) => process.exit(code!))
+        .on('error', (spawnError) => console.error(spawnError));
+
+      console.log('Starting remote.js builder...');
+      const remoteProcess = spawn('npm', ['run', 'start:remote'], {
+        shell: true,
+        stdio: 'inherit',
+      })
+        .on('close', (code: number) => process.exit(code!))
+        .on('error', (spawnError) => console.error(spawnError));
+
+      console.log('Starting Main Process...');
+      spawn('npm', ['run', 'start:main'], {
+        shell: true,
+        stdio: 'inherit',
+      })
+        .on('close', (code: number) => {
+          preloadProcess.kill();
+          remoteProcess.kill();
+          process.exit(code!);
+        })
+        .on('error', (spawnError) => console.error(spawnError));
+      return middlewares;
+    },
+  },
 };
 
 export default merge(baseConfig, configuration);

.erb/configs/webpack.config.renderer.prod.ts

@@ -21,117 +21,114 @@ checkNodeEnv('production');
 deleteSourceMaps();
 
 const devtoolsConfig =
-    process.env.DEBUG_PROD === 'true'
-        ? {
-              devtool: 'source-map',
-          }
-        : {};
+  process.env.DEBUG_PROD === 'true'
+    ? {
+        devtool: 'source-map',
+      }
+    : {};
 
 const configuration: webpack.Configuration = {
-    ...devtoolsConfig,
+  ...devtoolsConfig,
 
-    mode: 'production',
+  mode: 'production',
 
-    target: ['web', 'electron-renderer'],
+  target: ['web', 'electron-renderer'],
 
-    entry: [path.join(webpackPaths.srcRendererPath, 'index.tsx')],
+  entry: [path.join(webpackPaths.srcRendererPath, 'index.tsx')],
 
-    output: {
-        path: webpackPaths.distRendererPath,
-        publicPath: './',
-        filename: 'renderer.js',
-        library: {
-            type: 'umd',
-        },
+  output: {
+    path: webpackPaths.distRendererPath,
+    publicPath: './',
+    filename: 'renderer.js',
+    library: {
+      type: 'umd',
     },
+  },
 
-    module: {
-        rules: [
-            {
-                test: /\.s?(a|c)ss$/,
-                use: [
-                    MiniCssExtractPlugin.loader,
-                    {
-                        loader: 'css-loader',
-                        options: {
-                            modules: {
-                                localIdentName: '[name]__[local]--[hash:base64:5]',
-                                exportLocalsConvention: 'camelCaseOnly',
-                            },
-                            sourceMap: true,
-                            importLoaders: 1,
-                        },
-                    },
-                    'sass-loader',
-                ],
-                include: /\.module\.s?(c|a)ss$/,
-            },
-            {
-                test: /\.s?(a|c)ss$/,
-                use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'],
-                exclude: /\.module\.s?(c|a)ss$/,
-            },
-            // Fonts
-            {
-                test: /\.(woff|woff2|eot|ttf|otf)$/i,
-                type: 'asset/resource',
-            },
-            // Images
-            {
-                test: /\.(png|svg|jpg|jpeg|gif)$/i,
-                type: 'asset/resource',
+  module: {
+    rules: [
+      {
+        test: /\.s?(a|c)ss$/,
+        use: [
+          MiniCssExtractPlugin.loader,
+          {
+            loader: 'css-loader',
+            options: {
+              modules: {
+                localIdentName: '[name]__[local]--[hash:base64:5]',
+                exportLocalsConvention: 'camelCaseOnly',
+              },
+              sourceMap: true,
+              importLoaders: 1,
             },
+          },
+          'sass-loader',
         ],
-    },
-
-    optimization: {
-        minimize: true,
-        minimizer: [
-            new TerserPlugin({
-                parallel: true,
-            }),
-            new CssMinimizerPlugin(),
-        ],
-    },
-
-    plugins: [
-        /**
-         * Create global constants which can be configured at compile time.
-         *
-         * Useful for allowing different behaviour between development builds and
-         * release builds
-         *
-         * NODE_ENV should be production so that modules do not perform certain
-         * development checks
-         */
-        new webpack.EnvironmentPlugin({
-            NODE_ENV: 'production',
-            DEBUG_PROD: false,
-        }),
-
-        new MiniCssExtractPlugin({
-            filename: 'style.css',
-        }),
-
-        new BundleAnalyzerPlugin({
-            analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
-        }),
-
-        new HtmlWebpackPlugin({
-            filename: 'index.html',
-            template: path.join(webpackPaths.srcRendererPath, 'index.ejs'),
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true,
-            },
-            isBrowser: false,
-            isDevelopment: process.env.NODE_ENV !== 'production',
-            templateParameters: {
-                web: false,
-            },
-        }),
+        include: /\.module\.s?(c|a)ss$/,
+      },
+      {
+        test: /\.s?(a|c)ss$/,
+        use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'],
+        exclude: /\.module\.s?(c|a)ss$/,
+      },
+      // Fonts
+      {
+        test: /\.(woff|woff2|eot|ttf|otf)$/i,
+        type: 'asset/resource',
+      },
+      // Images
+      {
+        test: /\.(png|svg|jpg|jpeg|gif)$/i,
+        type: 'asset/resource',
+      },
     ],
+  },
+
+  optimization: {
+    minimize: true,
+    minimizer: [
+      new TerserPlugin({
+        parallel: true,
+      }),
+      new CssMinimizerPlugin(),
+    ],
+  },
+
+  plugins: [
+    /**
+     * Create global constants which can be configured at compile time.
+     *
+     * Useful for allowing different behaviour between development builds and
+     * release builds
+     *
+     * NODE_ENV should be production so that modules do not perform certain
+     * development checks
+     */
+    new webpack.EnvironmentPlugin({
+      NODE_ENV: 'production',
+      DEBUG_PROD: false,
+    }),
+
+    new MiniCssExtractPlugin({
+      filename: 'style.css',
+    }),
+
+    new BundleAnalyzerPlugin({
+      analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
+    }),
+
+    new HtmlWebpackPlugin({
+      filename: 'index.html',
+      template: path.join(webpackPaths.srcRendererPath, 'index.ejs'),
+      minify: {
+        collapseWhitespace: true,
+        removeAttributeQuotes: true,
+        removeComments: true,
+      },
+      isBrowser: false,
+      isDevelopment: process.env.NODE_ENV !== 'production',
+    }),
+  ],
 };
 
 export default merge(baseConfig, configuration);

.erb/configs/webpack.config.renderer.web.ts

@@ -116,9 +116,6 @@ const configuration: webpack.Configuration = {
             env: process.env.NODE_ENV,
             isDevelopment: process.env.NODE_ENV !== 'production',
             nodeModules: webpackPaths.appNodeModulesPath,
-            templateParameters: {
-                web: false, // with hot reload, we don't have NGINX injecting variables
-            },
         }),
     ],
 

.erb/configs/webpack.config.web.prod.ts

@@ -128,9 +128,6 @@ const configuration: webpack.Configuration = {
             },
             isBrowser: false,
             isDevelopment: process.env.NODE_ENV !== 'production',
-            templateParameters: {
-                web: true,
-            },
         }),
     ],
 };

.github/workflows/publish-linux.yml

@@ -37,17 +37,3 @@ jobs:
                       npm run build
                       npm exec electron-builder -- --publish always --linux
                   on_retry_command: npm cache clean --force
-
-            - name: Publish releases (arm64)
-              env:
-                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              uses: nick-invision/retry@v2.8.2
-              with:
-                  timeout_minutes: 30
-                  max_attempts: 3
-                  retry_on: error
-                  command: |
-                      npm run postinstall
-                      npm run build
-                      npm exec electron-builder -- --publish always --arm64
-                  on_retry_command: npm cache clean --force

.vscode/settings.json

@@ -11,10 +11,10 @@
     ],
     "typescript.tsserver.experimental.enableProjectDiagnostics": true,
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": "explicit",
-        "source.fixAll.stylelint": "explicit",
-        "source.organizeImports": "never",
-        "source.formatDocument": "explicit"
+        "source.fixAll.eslint": true,
+        "source.fixAll.stylelint": true,
+        "source.organizeImports": false,
+        "source.formatDocument": true
     },
     "css.validate": true,
     "less.validate": false,

Dockerfile

@@ -1,20 +1,16 @@
 # --- Builder stage
 FROM node:18-alpine as builder
 WORKDIR /app
+COPY . /app
 
-#Copy package.json first to cache node_modules
-COPY package.json package-lock.json .
 # Scripts include electron-specific dependencies, which we don't need
 RUN npm install --legacy-peer-deps --ignore-scripts
-#Copy code and build with cached modules
-COPY . .
 RUN npm run build:web
 
 # --- Production stage
 FROM nginx:alpine-slim
 
 COPY --chown=nginx:nginx --from=builder /app/release/app/dist/web /usr/share/nginx/html
-COPY ./settings.js.template /etc/nginx/templates/settings.js.template
 COPY ng.conf.template /etc/nginx/templates/default.conf.template
 
 ENV PUBLIC_PATH="/"

README.md

@@ -49,12 +49,8 @@ Rewrite of [Sonixd](https://github.com/jeffvli/sonixd).
 
 Download the [latest desktop client](https://github.com/jeffvli/feishin/releases). The desktop client is the recommended way to use Feishin. It supports both the MPV and web player backends, as well as includes built-in fetching for lyrics.
 
-#### MacOS Notes
-
 If you're using a device running macOS 12 (Monterey) or higher, [check here](https://github.com/jeffvli/feishin/issues/104#issuecomment-1553914730) for instructions on how to remove the app from quarantine.
 
-For media keys to work, you will be prompted to allow Feishin to be a Trusted Accessibility Client. After allowing, you will need to restart Feishin for the privacy settings to take effect.
-
 ### Web and Docker
 
 Visit [https://feishin.vercel.app](https://feishin.vercel.app) to use the hosted web version of Feishin. The web client only supports the web player backend.
@@ -77,12 +73,9 @@ docker run --name feishin -p 9180:9180 feishin
 2. After restarting the app, you will be prompted to select a server. Click the `Open menu` button and select `Manage servers`. Click the `Add server` button in the popup and fill out all applicable details. You will need to enter the full URL to your server, including the protocol and port if applicable (e.g. `https://navidrome.my-server.com` or `http://192.168.0.1:4533`).
 
 -   **Navidrome** - For the best experience, select "Save password" when creating the server and configure the `SessionTimeout` setting in your Navidrome config to a larger value (e.g. 72h).
-    -   **Linux users** - The default password store uses `libsecret`. `kwallet4/5/6` are also supported, but must be explicitly set in Settings > Window > Passwords/secret score.
 
 3. _Optional_ - If you want to host Feishin on a subpath (not `/`), then pass in the following environment variable: `PUBLIC_PATH=PATH`. For example, to host on `/feishin`, pass in `PUBLIC_PATH=/feishin`.
 
-4. _Optional_ - To hard code the server url, pass the following environment variables: `SERVER_NAME`, `SERVER_TYPE` (one of `jellyfin` or `navidrome`), `SERVER_URL`. To prevent users from changing these settings, pass `SERVER_LOCK=true`. This can only be set if all three of the previous values are set.
-
 ## FAQ
 
 ### MPV is either not working or is rapidly switching between pause/play states
@@ -93,7 +86,7 @@ First thing to do is check that your MPV binary path is correct. Navigate to the
 
 Feishin supports any music server that implements a [Navidrome](https://www.navidrome.org/) or [Jellyfin](https://jellyfin.org/) API. **Subsonic API is not currently supported**. This will likely be added in [later when the new Subsonic API is decided on](https://support.symfonium.app/t/subsonic-servers-participation/1233).
 
--   [Navidrome](https://github.com/navidrome/navidrome) version 0.48.0 and newer
+-   [Navidrome](https://github.com/navidrome/navidrome)
 -   [Jellyfin](https://github.com/jellyfin/jellyfin)
 -   [Funkwhale](https://funkwhale.audio/) - TBD
 -   Subsonic-compatible servers - TBD

docker-compose.yaml

@@ -1,13 +0,0 @@
-version: '3.5'
-services:
-    feishin:
-        container_name: feishin
-        image: jeffvli/feishin
-        restart: unless-stopped
-        ports:
-            - 9180:9180
-        environment:
-            - SERVER_NAME=jellyfin # pre defined server name
-            - SERVER_LOCK=true # When true AND name/type/url are set, only username/password can be toggled
-            - SERVER_TYPE=jellyfin # navidrome also works
-            - SERVER_URL= # http://address:port

ng.conf.template

@@ -16,12 +16,4 @@ server {
     alias /usr/share/nginx/html/;
     try_files $uri $uri/ /index.html =404;
   }
-
-  location ${PUBLIC_PATH}settings.js {
-    alias /etc/nginx/conf.d/settings.js;
-  }
-
-  location ${PUBLIC_PATH}/settings.js {
-    alias /etc/nginx/conf.d/settings.js;
-  }
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "feishin",
-    "version": "0.6.1",
+    "version": "0.5.2",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "feishin",
-            "version": "0.6.1",
+            "version": "0.5.2",
             "hasInstallScript": true,
             "license": "GPL-3.0",
             "dependencies": {
@@ -28,13 +28,13 @@
                 "@tanstack/react-query-persist-client": "^4.32.1",
                 "@ts-rest/core": "^3.23.0",
                 "@xhayper/discord-rpc": "^1.0.24",
-                "axios": "^1.6.0",
+                "axios": "^1.4.0",
                 "clsx": "^2.0.0",
                 "cmdk": "^0.2.0",
                 "dayjs": "^1.11.6",
                 "electron-debug": "^3.2.0",
                 "electron-localshortcut": "^3.2.1",
-                "electron-log": "^5.1.1",
+                "electron-log": "^4.4.6",
                 "electron-store": "^8.1.0",
                 "electron-updater": "^4.6.5",
                 "fast-average-color": "^9.3.0",
@@ -66,10 +66,9 @@
                 "react-virtualized-auto-sizer": "^1.0.17",
                 "react-window": "^1.8.9",
                 "react-window-infinite-loader": "^1.0.9",
-                "semver": "^7.5.4",
                 "styled-components": "^6.0.8",
                 "swiper": "^9.3.1",
-                "zod": "^3.22.3",
+                "zod": "^3.21.4",
                 "zustand": "^4.3.9"
             },
             "devDependencies": {
@@ -104,7 +103,7 @@
                 "css-loader": "^6.7.1",
                 "css-minimizer-webpack-plugin": "^3.4.1",
                 "detect-port": "^1.3.0",
-                "electron": "^26.6.10",
+                "electron": "^27.1.0",
                 "electron-builder": "^24.9.0",
                 "electron-devtools-installer": "^3.2.0",
                 "electron-notarize": "^1.2.1",
@@ -114,7 +113,7 @@
                 "eslint-config-erb": "^4.0.3",
                 "eslint-import-resolver-typescript": "^2.7.1",
                 "eslint-import-resolver-webpack": "^0.13.2",
-                "eslint-plugin-compat": "^4.2.0",
+                "eslint-plugin-compat": "^4.0.2",
                 "eslint-plugin-import": "^2.26.0",
                 "eslint-plugin-jest": "^26.1.3",
                 "eslint-plugin-jsx-a11y": "^6.5.1",
@@ -287,11 +286,11 @@
             }
         },
         "node_modules/@babel/code-frame": {
-            "version": "7.23.5",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-            "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+            "version": "7.22.13",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+            "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
             "dependencies": {
-                "@babel/highlight": "^7.23.4",
+                "@babel/highlight": "^7.22.13",
                 "chalk": "^2.4.2"
             },
             "engines": {
@@ -408,11 +407,11 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.23.6",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-            "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz",
+            "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==",
             "dependencies": {
-                "@babel/types": "^7.23.6",
+                "@babel/types": "^7.22.15",
                 "@jridgewell/gen-mapping": "^0.3.2",
                 "@jridgewell/trace-mapping": "^0.3.17",
                 "jsesc": "^2.5.1"
@@ -549,20 +548,20 @@
             }
         },
         "node_modules/@babel/helper-environment-visitor": {
-            "version": "7.22.20",
-            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-            "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+            "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-function-name": {
-            "version": "7.23.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-            "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+            "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
             "dependencies": {
-                "@babel/template": "^7.22.15",
-                "@babel/types": "^7.23.0"
+                "@babel/template": "^7.22.5",
+                "@babel/types": "^7.22.5"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -704,17 +703,17 @@
             }
         },
         "node_modules/@babel/helper-string-parser": {
-            "version": "7.23.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-            "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+            "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.22.20",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-            "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+            "version": "7.22.19",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.19.tgz",
+            "integrity": "sha512-Tinq7ybnEPFFXhlYOYFiSjespWQk0dq2dRNAiMdRTOYQzEGqnnNyrTxPYHP5r6wGjlF1rFgABdDV0g8EwD6Qbg==",
             "engines": {
                 "node": ">=6.9.0"
             }
@@ -754,11 +753,11 @@
             }
         },
         "node_modules/@babel/highlight": {
-            "version": "7.23.4",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-            "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+            "version": "7.22.13",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz",
+            "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==",
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.22.20",
+                "@babel/helper-validator-identifier": "^7.22.5",
                 "chalk": "^2.4.2",
                 "js-tokens": "^4.0.0"
             },
@@ -831,9 +830,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.23.6",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
-            "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
+            "version": "7.22.16",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz",
+            "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==",
             "bin": {
                 "parser": "bin/babel-parser.js"
             },
@@ -2179,19 +2178,19 @@
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.23.7",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
-            "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
+            "version": "7.22.19",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.19.tgz",
+            "integrity": "sha512-ZCcpVPK64krfdScRbpxF6xA5fz7IOsfMwx1tcACvCzt6JY+0aHkBk7eIU8FRDSZRU5Zei6Z4JfgAxN1bqXGECg==",
             "dependencies": {
-                "@babel/code-frame": "^7.23.5",
-                "@babel/generator": "^7.23.6",
-                "@babel/helper-environment-visitor": "^7.22.20",
-                "@babel/helper-function-name": "^7.23.0",
+                "@babel/code-frame": "^7.22.13",
+                "@babel/generator": "^7.22.15",
+                "@babel/helper-environment-visitor": "^7.22.5",
+                "@babel/helper-function-name": "^7.22.5",
                 "@babel/helper-hoist-variables": "^7.22.5",
                 "@babel/helper-split-export-declaration": "^7.22.6",
-                "@babel/parser": "^7.23.6",
-                "@babel/types": "^7.23.6",
-                "debug": "^4.3.1",
+                "@babel/parser": "^7.22.16",
+                "@babel/types": "^7.22.19",
+                "debug": "^4.1.0",
                 "globals": "^11.1.0"
             },
             "engines": {
@@ -2207,12 +2206,12 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.23.6",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
-            "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
+            "version": "7.22.19",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz",
+            "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==",
             "dependencies": {
-                "@babel/helper-string-parser": "^7.23.4",
-                "@babel/helper-validator-identifier": "^7.22.20",
+                "@babel/helper-string-parser": "^7.22.5",
+                "@babel/helper-validator-identifier": "^7.22.19",
                 "to-fast-properties": "^2.0.0"
             },
             "engines": {
@@ -3862,9 +3861,9 @@
             }
         },
         "node_modules/@mdn/browser-compat-data": {
-            "version": "5.5.10",
-            "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.5.10.tgz",
-            "integrity": "sha512-s2GGND9oLhEuksOFtICYOBZdMWPANBXTMqAXh89q6g1Mi3+OuWEmp9WFzw2v/nmS175vqeewpC1kDJA7taaxyA==",
+            "version": "5.3.5",
+            "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.3.5.tgz",
+            "integrity": "sha512-aGZ/OZCv96fEvUNuOoHbWN9ySODB1Xf04+TFgK3QO/PaM1NI95INaf0YUBLUbbK9lMKWqUzyJk2TPLe3ybFFXg==",
             "dev": true
         },
         "node_modules/@nicolo-ribaudo/chokidar-2": {
@@ -6326,9 +6325,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
-            "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
+            "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
             "dependencies": {
                 "follow-redirects": "^1.15.0",
                 "form-data": "^4.0.0",
@@ -6446,6 +6445,30 @@
                 "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
             }
         },
+        "node_modules/babel-plugin-styled-components": {
+            "version": "2.0.7",
+            "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz",
+            "integrity": "sha512-i7YhvPgVqRKfoQ66toiZ06jPNA3p6ierpfUuEWxNF+fV27Uv5gxBkf8KZLHUCc1nFA9j6+80pYoIpqCeyW3/bA==",
+            "optional": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.16.0",
+                "@babel/helper-module-imports": "^7.16.0",
+                "babel-plugin-syntax-jsx": "^6.18.0",
+                "lodash": "^4.17.11",
+                "picomatch": "^2.3.0"
+            },
+            "peerDependencies": {
+                "styled-components": ">= 2"
+            }
+        },
+        "node_modules/babel-plugin-syntax-jsx": {
+            "version": "6.18.0",
+            "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+            "integrity": "sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==",
+            "optional": true,
+            "peer": true
+        },
         "node_modules/babel-preset-current-node-syntax": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
@@ -7074,9 +7097,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001585",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001585.tgz",
-            "integrity": "sha512-yr2BWR1yLXQ8fMpdS/4ZZXpseBgE7o4g41x3a6AJOqZuOi+iE/WdJYAuZ6Y95i4Ohd2Y+9MzIWRR+uGABH4s3Q==",
+            "version": "1.0.30001517",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz",
+            "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -8897,9 +8920,9 @@
             }
         },
         "node_modules/electron": {
-            "version": "26.6.10",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-26.6.10.tgz",
-            "integrity": "sha512-pV2SD0RXzAiNRb/2yZrsVmVkBOMrf+DVsPulIgRjlL0+My9BL5spFuhHVMQO9yHl9tFpWtuRpQv0ofM/i9P8xg==",
+            "version": "27.1.0",
+            "resolved": "https://registry.npmjs.org/electron/-/electron-27.1.0.tgz",
+            "integrity": "sha512-XPdJiO475QJ8cx59/goWNNWnlV0vab+Ut3occymos7VDxkHV5mFrlW6tcGi+M3bW6gBfwpJocWMng8tw542vww==",
             "dev": true,
             "hasInstallScript": true,
             "dependencies": {
@@ -9075,12 +9098,9 @@
             }
         },
         "node_modules/electron-log": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.1.1.tgz",
-            "integrity": "sha512-If7HU4Slbh2xfjOXOLxifkbgu6HmWDNJyXPLW+XNTOHMfFKisg0trA3d/7syyu25S+lHosfsd0VMfDSjGn1+Pw==",
-            "engines": {
-                "node": ">= 14"
-            }
+            "version": "4.4.6",
+            "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.6.tgz",
+            "integrity": "sha512-nirYgRdY+F+vclr8ijdwy2vW03IzFpDHTaKNWu76dEN21Y76+smcES5knS7cgHUUB0qNLOi8vZO36taakjbSXA=="
         },
         "node_modules/electron-notarize": {
             "version": "1.2.1",
@@ -9929,18 +9949,19 @@
             }
         },
         "node_modules/eslint-plugin-compat": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.2.0.tgz",
-            "integrity": "sha512-RDKSYD0maWy5r7zb5cWQS+uSPc26mgOzdORJ8hxILmWM7S/Ncwky7BcAtXVY5iRbKjBdHsWU8Yg7hfoZjtkv7w==",
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.1.4.tgz",
+            "integrity": "sha512-RxySWBmzfIROLFKgeJBJue2BU/6vM2KJWXWAUq+oW4QtrsZXRxbjgxmO1OfF3sHcRuuIenTS/wgo3GyUWZF24w==",
             "dev": true,
             "dependencies": {
-                "@mdn/browser-compat-data": "^5.3.13",
+                "@mdn/browser-compat-data": "^5.2.47",
+                "@tsconfig/node14": "^1.0.3",
                 "ast-metadata-inferer": "^0.8.0",
-                "browserslist": "^4.21.10",
-                "caniuse-lite": "^1.0.30001524",
+                "browserslist": "^4.21.5",
+                "caniuse-lite": "^1.0.30001473",
                 "find-up": "^5.0.0",
-                "lodash.memoize": "^4.1.2",
-                "semver": "^7.5.4"
+                "lodash.memoize": "4.1.2",
+                "semver": "7.3.8"
             },
             "engines": {
                 "node": ">=14.x"
@@ -11035,9 +11056,9 @@
             }
         },
         "node_modules/follow-redirects": {
-            "version": "1.15.5",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-            "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
+            "version": "1.15.2",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
             "funding": [
                 {
                     "type": "individual",
@@ -12532,9 +12553,9 @@
             }
         },
         "node_modules/ip": {
-            "version": "1.1.9",
-            "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
-            "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+            "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
             "dev": true
         },
         "node_modules/ipaddr.js": {
@@ -15062,9 +15083,9 @@
             }
         },
         "node_modules/nanoid": {
-            "version": "3.3.7",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-            "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+            "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
             "funding": [
                 {
                     "type": "github",
@@ -15949,9 +15970,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.33",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
-            "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
+            "version": "8.4.27",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
+            "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -15967,7 +15988,7 @@
                 }
             ],
             "dependencies": {
-                "nanoid": "^3.3.7",
+                "nanoid": "^3.3.6",
                 "picocolors": "^1.0.0",
                 "source-map-js": "^1.0.2"
             },
@@ -17931,9 +17952,9 @@
             }
         },
         "node_modules/semver": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-            "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+            "version": "7.3.8",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+            "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
             "dependencies": {
                 "lru-cache": "^6.0.0"
             },
@@ -18230,6 +18251,21 @@
                 "node": ">=10"
             }
         },
+        "node_modules/simple-update-notifier/node_modules/semver": {
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+            "dev": true,
+            "dependencies": {
+                "lru-cache": "^6.0.0"
+            },
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
         "node_modules/sirv": {
             "version": "1.0.19",
             "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
@@ -19943,9 +19979,9 @@
             }
         },
         "node_modules/tslib": {
-            "version": "2.6.2",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-            "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+            "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
         },
         "node_modules/tsutils": {
             "version": "3.21.0",
@@ -21351,9 +21387,9 @@
             }
         },
         "node_modules/zod": {
-            "version": "3.22.3",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.3.tgz",
-            "integrity": "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug==",
+            "version": "3.21.4",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
+            "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==",
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }
@@ -21474,11 +21510,11 @@
             }
         },
         "@babel/code-frame": {
-            "version": "7.23.5",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-            "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+            "version": "7.22.13",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+            "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
             "requires": {
-                "@babel/highlight": "^7.23.4",
+                "@babel/highlight": "^7.22.13",
                 "chalk": "^2.4.2"
             },
             "dependencies": {
@@ -21568,11 +21604,11 @@
             }
         },
         "@babel/generator": {
-            "version": "7.23.6",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-            "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+            "version": "7.22.15",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz",
+            "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==",
             "requires": {
-                "@babel/types": "^7.23.6",
+                "@babel/types": "^7.22.15",
                 "@jridgewell/gen-mapping": "^0.3.2",
                 "@jridgewell/trace-mapping": "^0.3.17",
                 "jsesc": "^2.5.1"
@@ -21679,17 +21715,17 @@
             }
         },
         "@babel/helper-environment-visitor": {
-            "version": "7.22.20",
-            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-            "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+            "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q=="
         },
         "@babel/helper-function-name": {
-            "version": "7.23.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-            "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+            "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
             "requires": {
-                "@babel/template": "^7.22.15",
-                "@babel/types": "^7.23.0"
+                "@babel/template": "^7.22.5",
+                "@babel/types": "^7.22.5"
             }
         },
         "@babel/helper-hoist-variables": {
@@ -21786,14 +21822,14 @@
             }
         },
         "@babel/helper-string-parser": {
-            "version": "7.23.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-            "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ=="
+            "version": "7.22.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+            "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw=="
         },
         "@babel/helper-validator-identifier": {
-            "version": "7.22.20",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-            "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A=="
+            "version": "7.22.19",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.19.tgz",
+            "integrity": "sha512-Tinq7ybnEPFFXhlYOYFiSjespWQk0dq2dRNAiMdRTOYQzEGqnnNyrTxPYHP5r6wGjlF1rFgABdDV0g8EwD6Qbg=="
         },
         "@babel/helper-validator-option": {
             "version": "7.22.15",
@@ -21821,11 +21857,11 @@
             }
         },
         "@babel/highlight": {
-            "version": "7.23.4",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-            "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+            "version": "7.22.13",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz",
+            "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==",
             "requires": {
-                "@babel/helper-validator-identifier": "^7.22.20",
+                "@babel/helper-validator-identifier": "^7.22.5",
                 "chalk": "^2.4.2",
                 "js-tokens": "^4.0.0"
             },
@@ -21882,9 +21918,9 @@
             }
         },
         "@babel/parser": {
-            "version": "7.23.6",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
-            "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ=="
+            "version": "7.22.16",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz",
+            "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA=="
         },
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
             "version": "7.22.15",
@@ -22753,19 +22789,19 @@
             }
         },
         "@babel/traverse": {
-            "version": "7.23.7",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
-            "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
+            "version": "7.22.19",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.19.tgz",
+            "integrity": "sha512-ZCcpVPK64krfdScRbpxF6xA5fz7IOsfMwx1tcACvCzt6JY+0aHkBk7eIU8FRDSZRU5Zei6Z4JfgAxN1bqXGECg==",
             "requires": {
-                "@babel/code-frame": "^7.23.5",
-                "@babel/generator": "^7.23.6",
-                "@babel/helper-environment-visitor": "^7.22.20",
-                "@babel/helper-function-name": "^7.23.0",
+                "@babel/code-frame": "^7.22.13",
+                "@babel/generator": "^7.22.15",
+                "@babel/helper-environment-visitor": "^7.22.5",
+                "@babel/helper-function-name": "^7.22.5",
                 "@babel/helper-hoist-variables": "^7.22.5",
                 "@babel/helper-split-export-declaration": "^7.22.6",
-                "@babel/parser": "^7.23.6",
-                "@babel/types": "^7.23.6",
-                "debug": "^4.3.1",
+                "@babel/parser": "^7.22.16",
+                "@babel/types": "^7.22.19",
+                "debug": "^4.1.0",
                 "globals": "^11.1.0"
             },
             "dependencies": {
@@ -22777,12 +22813,12 @@
             }
         },
         "@babel/types": {
-            "version": "7.23.6",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
-            "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
+            "version": "7.22.19",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz",
+            "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==",
             "requires": {
-                "@babel/helper-string-parser": "^7.23.4",
-                "@babel/helper-validator-identifier": "^7.22.20",
+                "@babel/helper-string-parser": "^7.22.5",
+                "@babel/helper-validator-identifier": "^7.22.19",
                 "to-fast-properties": "^2.0.0"
             }
         },
@@ -24019,9 +24055,9 @@
             "requires": {}
         },
         "@mdn/browser-compat-data": {
-            "version": "5.5.10",
-            "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.5.10.tgz",
-            "integrity": "sha512-s2GGND9oLhEuksOFtICYOBZdMWPANBXTMqAXh89q6g1Mi3+OuWEmp9WFzw2v/nmS175vqeewpC1kDJA7taaxyA==",
+            "version": "5.3.5",
+            "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.3.5.tgz",
+            "integrity": "sha512-aGZ/OZCv96fEvUNuOoHbWN9ySODB1Xf04+TFgK3QO/PaM1NI95INaf0YUBLUbbK9lMKWqUzyJk2TPLe3ybFFXg==",
             "dev": true
         },
         "@nicolo-ribaudo/chokidar-2": {
@@ -25965,9 +26001,9 @@
             "dev": true
         },
         "axios": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
-            "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
+            "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
             "requires": {
                 "follow-redirects": "^1.15.0",
                 "form-data": "^4.0.0",
@@ -26059,6 +26095,27 @@
                 "@babel/helper-define-polyfill-provider": "^0.4.2"
             }
         },
+        "babel-plugin-styled-components": {
+            "version": "2.0.7",
+            "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz",
+            "integrity": "sha512-i7YhvPgVqRKfoQ66toiZ06jPNA3p6ierpfUuEWxNF+fV27Uv5gxBkf8KZLHUCc1nFA9j6+80pYoIpqCeyW3/bA==",
+            "optional": true,
+            "peer": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.16.0",
+                "@babel/helper-module-imports": "^7.16.0",
+                "babel-plugin-syntax-jsx": "^6.18.0",
+                "lodash": "^4.17.11",
+                "picomatch": "^2.3.0"
+            }
+        },
+        "babel-plugin-syntax-jsx": {
+            "version": "6.18.0",
+            "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+            "integrity": "sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==",
+            "optional": true,
+            "peer": true
+        },
         "babel-preset-current-node-syntax": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
@@ -26540,9 +26597,9 @@
             }
         },
         "caniuse-lite": {
-            "version": "1.0.30001585",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001585.tgz",
-            "integrity": "sha512-yr2BWR1yLXQ8fMpdS/4ZZXpseBgE7o4g41x3a6AJOqZuOi+iE/WdJYAuZ6Y95i4Ohd2Y+9MzIWRR+uGABH4s3Q=="
+            "version": "1.0.30001517",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz",
+            "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA=="
         },
         "chalk": {
             "version": "4.1.2",
@@ -27901,9 +27958,9 @@
             }
         },
         "electron": {
-            "version": "26.6.10",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-26.6.10.tgz",
-            "integrity": "sha512-pV2SD0RXzAiNRb/2yZrsVmVkBOMrf+DVsPulIgRjlL0+My9BL5spFuhHVMQO9yHl9tFpWtuRpQv0ofM/i9P8xg==",
+            "version": "27.1.0",
+            "resolved": "https://registry.npmjs.org/electron/-/electron-27.1.0.tgz",
+            "integrity": "sha512-XPdJiO475QJ8cx59/goWNNWnlV0vab+Ut3occymos7VDxkHV5mFrlW6tcGi+M3bW6gBfwpJocWMng8tw542vww==",
             "dev": true,
             "requires": {
                 "@electron/get": "^2.0.0",
@@ -28052,9 +28109,9 @@
             }
         },
         "electron-log": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.1.1.tgz",
-            "integrity": "sha512-If7HU4Slbh2xfjOXOLxifkbgu6HmWDNJyXPLW+XNTOHMfFKisg0trA3d/7syyu25S+lHosfsd0VMfDSjGn1+Pw=="
+            "version": "4.4.6",
+            "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.6.tgz",
+            "integrity": "sha512-nirYgRdY+F+vclr8ijdwy2vW03IzFpDHTaKNWu76dEN21Y76+smcES5knS7cgHUUB0qNLOi8vZO36taakjbSXA=="
         },
         "electron-notarize": {
             "version": "1.2.1",
@@ -28723,18 +28780,19 @@
             }
         },
         "eslint-plugin-compat": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.2.0.tgz",
-            "integrity": "sha512-RDKSYD0maWy5r7zb5cWQS+uSPc26mgOzdORJ8hxILmWM7S/Ncwky7BcAtXVY5iRbKjBdHsWU8Yg7hfoZjtkv7w==",
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.1.4.tgz",
+            "integrity": "sha512-RxySWBmzfIROLFKgeJBJue2BU/6vM2KJWXWAUq+oW4QtrsZXRxbjgxmO1OfF3sHcRuuIenTS/wgo3GyUWZF24w==",
             "dev": true,
             "requires": {
-                "@mdn/browser-compat-data": "^5.3.13",
+                "@mdn/browser-compat-data": "^5.2.47",
+                "@tsconfig/node14": "^1.0.3",
                 "ast-metadata-inferer": "^0.8.0",
-                "browserslist": "^4.21.10",
-                "caniuse-lite": "^1.0.30001524",
+                "browserslist": "^4.21.5",
+                "caniuse-lite": "^1.0.30001473",
                 "find-up": "^5.0.0",
-                "lodash.memoize": "^4.1.2",
-                "semver": "^7.5.4"
+                "lodash.memoize": "4.1.2",
+                "semver": "7.3.8"
             },
             "dependencies": {
                 "ast-metadata-inferer": {
@@ -29531,9 +29589,9 @@
             }
         },
         "follow-redirects": {
-            "version": "1.15.5",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-            "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw=="
+            "version": "1.15.2",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
         },
         "form-data": {
             "version": "4.0.0",
@@ -30660,9 +30718,9 @@
             }
         },
         "ip": {
-            "version": "1.1.9",
-            "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
-            "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==",
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+            "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
             "dev": true
         },
         "ipaddr.js": {
@@ -32545,9 +32603,9 @@
             }
         },
         "nanoid": {
-            "version": "3.3.7",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-            "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g=="
+            "version": "3.3.6",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+            "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
         },
         "natural-compare": {
             "version": "1.4.0",
@@ -33215,11 +33273,11 @@
             }
         },
         "postcss": {
-            "version": "8.4.33",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz",
-            "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==",
+            "version": "8.4.27",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
+            "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
             "requires": {
-                "nanoid": "^3.3.7",
+                "nanoid": "^3.3.6",
                 "picocolors": "^1.0.0",
                 "source-map-js": "^1.0.2"
             }
@@ -34592,9 +34650,9 @@
             }
         },
         "semver": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-            "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+            "version": "7.3.8",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+            "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
             "requires": {
                 "lru-cache": "^6.0.0"
             }
@@ -34837,6 +34895,17 @@
             "dev": true,
             "requires": {
                 "semver": "^7.5.3"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "7.5.4",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+                    "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+                    "dev": true,
+                    "requires": {
+                        "lru-cache": "^6.0.0"
+                    }
+                }
             }
         },
         "sirv": {
@@ -36151,9 +36220,9 @@
             }
         },
         "tslib": {
-            "version": "2.6.2",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-            "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+            "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
         },
         "tsutils": {
             "version": "3.21.0",
@@ -37186,9 +37255,9 @@
             "dev": true
         },
         "zod": {
-            "version": "3.22.3",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.3.tgz",
-            "integrity": "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug=="
+            "version": "3.21.4",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
+            "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="
         },
         "zustand": {
             "version": "4.3.9",

package.json

@@ -2,14 +2,14 @@
     "name": "feishin",
     "productName": "Feishin",
     "description": "Feishin music server",
-    "version": "0.6.1",
+    "version": "0.5.2",
     "scripts": {
         "build": "concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:remote\"",
         "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
         "build:remote": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.remote.prod.ts",
         "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts",
         "build:web": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.web.prod.ts",
-        "build:docker": "docker build -t jeffvli/feishin .",
+        "build:docker": "npm run build:web && docker build -t jeffvli/feishin .",
         "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
         "lint": "concurrently \"npm run lint:code\" \"npm run lint:styles\"",
         "lint:code": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx --fix",
@@ -132,7 +132,7 @@
                 "tar.xz"
             ],
             "icon": "assets/icons/icon.png",
-            "category": "AudioVideo;Audio;Player"
+            "category": "Development"
         },
         "directories": {
             "app": "release/app",
@@ -230,7 +230,7 @@
         "css-loader": "^6.7.1",
         "css-minimizer-webpack-plugin": "^3.4.1",
         "detect-port": "^1.3.0",
-        "electron": "^26.6.10",
+        "electron": "^27.1.0",
         "electron-builder": "^24.9.0",
         "electron-devtools-installer": "^3.2.0",
         "electron-notarize": "^1.2.1",
@@ -240,7 +240,7 @@
         "eslint-config-erb": "^4.0.3",
         "eslint-import-resolver-typescript": "^2.7.1",
         "eslint-import-resolver-webpack": "^0.13.2",
-        "eslint-plugin-compat": "^4.2.0",
+        "eslint-plugin-compat": "^4.0.2",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-jest": "^26.1.3",
         "eslint-plugin-jsx-a11y": "^6.5.1",
@@ -307,13 +307,13 @@
         "@tanstack/react-query-persist-client": "^4.32.1",
         "@ts-rest/core": "^3.23.0",
         "@xhayper/discord-rpc": "^1.0.24",
-        "axios": "^1.6.0",
+        "axios": "^1.4.0",
         "clsx": "^2.0.0",
         "cmdk": "^0.2.0",
         "dayjs": "^1.11.6",
         "electron-debug": "^3.2.0",
         "electron-localshortcut": "^3.2.1",
-        "electron-log": "^5.1.1",
+        "electron-log": "^4.4.6",
         "electron-store": "^8.1.0",
         "electron-updater": "^4.6.5",
         "fast-average-color": "^9.3.0",
@@ -345,10 +345,9 @@
         "react-virtualized-auto-sizer": "^1.0.17",
         "react-window": "^1.8.9",
         "react-window-infinite-loader": "^1.0.9",
-        "semver": "^7.5.4",
         "styled-components": "^6.0.8",
         "swiper": "^9.3.1",
-        "zod": "^3.22.3",
+        "zod": "^3.21.4",
         "zustand": "^4.3.9"
     },
     "resolutions": {

release/app/package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "feishin",
-    "version": "0.6.1",
+    "version": "0.5.2",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "feishin",
-            "version": "0.6.1",
+            "version": "0.5.2",
             "hasInstallScript": true,
             "license": "GPL-3.0",
             "dependencies": {
@@ -15,7 +15,7 @@
                 "ws": "^8.13.0"
             },
             "devDependencies": {
-                "electron": "25.8.4"
+                "electron": "25.3.0"
             }
         },
         "node_modules/@electron/get": {
@@ -453,9 +453,9 @@
             "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
         },
         "node_modules/electron": {
-            "version": "25.8.4",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.4.tgz",
-            "integrity": "sha512-hUYS3RGdaa6E1UWnzeGnsdsBYOggwMMg4WGxNGvAoWtmRrr6J1BsjFW/yRq4WsJHJce2HdzQXtz4OGXV6yUCLg==",
+            "version": "25.3.0",
+            "resolved": "https://registry.npmjs.org/electron/-/electron-25.3.0.tgz",
+            "integrity": "sha512-cyqotxN+AroP5h2IxUsJsmehYwP5LrFAOO7O7k9tILME3Sa1/POAg3shrhx4XEnaAMyMqMLxzGvkzCVxzEErnA==",
             "dev": true,
             "hasInstallScript": true,
             "dependencies": {
@@ -647,9 +647,9 @@
             }
         },
         "node_modules/global-agent/node_modules/semver": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-            "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+            "version": "7.3.8",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+            "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
             "dev": true,
             "optional": true,
             "dependencies": {
@@ -1166,9 +1166,9 @@
             "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
         },
         "node_modules/semver": {
-            "version": "6.3.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
             "dev": true,
             "bin": {
                 "semver": "bin/semver.js"
@@ -1672,9 +1672,9 @@
             "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
         },
         "electron": {
-            "version": "25.8.4",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-25.8.4.tgz",
-            "integrity": "sha512-hUYS3RGdaa6E1UWnzeGnsdsBYOggwMMg4WGxNGvAoWtmRrr6J1BsjFW/yRq4WsJHJce2HdzQXtz4OGXV6yUCLg==",
+            "version": "25.3.0",
+            "resolved": "https://registry.npmjs.org/electron/-/electron-25.3.0.tgz",
+            "integrity": "sha512-cyqotxN+AroP5h2IxUsJsmehYwP5LrFAOO7O7k9tILME3Sa1/POAg3shrhx4XEnaAMyMqMLxzGvkzCVxzEErnA==",
             "dev": true,
             "requires": {
                 "@electron/get": "^2.0.0",
@@ -1818,9 +1818,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "7.6.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-                    "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+                    "version": "7.3.8",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+                    "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
                     "dev": true,
                     "optional": true,
                     "requires": {
@@ -2198,9 +2198,9 @@
             "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
         },
         "semver": {
-            "version": "6.3.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
             "dev": true
         },
         "semver-compare": {

release/app/package.json

@@ -1,6 +1,6 @@
 {
     "name": "feishin",
-    "version": "0.6.1",
+    "version": "0.5.2",
     "description": "",
     "main": "./dist/main/main.js",
     "author": {
@@ -18,7 +18,7 @@
         "ws": "^8.13.0"
     },
     "devDependencies": {
-        "electron": "25.8.4"
+        "electron": "25.3.0"
     },
     "license": "GPL-3.0"
 }

settings.js.template

@@ -1 +0,0 @@
-"use strict";window.SERVER_URL="${SERVER_URL}";window.SERVER_NAME="${SERVER_NAME}";window.SERVER_TYPE="${SERVER_TYPE}";window.SERVER_LOCK=${SERVER_LOCK};

src/i18n/i18n.ts

@@ -1,4 +1,4 @@
-import { PostProcessorModule, TOptions, StringMap } from 'i18next';
+import { PostProcessorModule } from 'i18next';
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import en from './locales/en.json';
@@ -125,18 +125,16 @@ const titleCasePostProcessor: PostProcessorModule = {
     },
 };
 
-const ignoreSentenceCaseLanguages = ['de']
-
 const sentenceCasePostProcessor: PostProcessorModule = {
     type: 'postProcessor',
     name: 'sentenceCase',
-    process: (value: string, _key: string, _options: TOptions<StringMap>, translator: any) => {
+    process: (value: string) => {
         const sentences = value.split('. ');
 
         return sentences
             .map((sentence) => {
                 return (
-                    sentence.charAt(0).toLocaleUpperCase() + (!ignoreSentenceCaseLanguages.includes(translator.language) ? sentence.slice(1).toLocaleLowerCase() : sentence.slice(1))
+                    sentence.charAt(0).toLocaleUpperCase() + sentence.slice(1).toLocaleLowerCase()
                 );
             })
             .join('. ');

src/i18n/locales/cs.json

@@ -41,6 +41,7 @@
         "hotkey_playbackPause": "pozastavení",
         "replayGainFallback": "fallback {{ReplayGain}}",
         "sidebarCollapsedNavigation_description": "zobrazit nebo skrýt navigaci ve sbaleném postranním panelu",
+        "mpvExecutablePath_help": "jedna na řádek",
         "hotkey_volumeUp": "zvýšení hlasitosti",
         "skipDuration": "doba k přeskočení",
         "discordIdleStatus_description": "při povolení bude upraven stav když je přehrávač nečinný",
@@ -52,7 +53,7 @@
         "skipDuration_description": "nastavení doby k přeskočení při použití tlačítek k přeskočení na liště přehrávače",
         "enableRemote_description": "povolí vzdálený ovládací server pro umožnění ostatním zařízením ovládat aplikaci",
         "fontType_optionSystem": "systémové písmo",
-        "mpvExecutablePath_description": "nastavení cesty ke spustitelnému souboru mpv. pokud je prázdné, bude použita výchozí cesta",
+        "mpvExecutablePath_description": "nastavení cesty ke spustitelnému souboru mpv",
         "replayGainClipping_description": "Zabránění clippingu způsobenému funkcí {{ReplayGain}} automatickým snížením zesílení",
         "replayGainPreamp": "před-zesílení {{ReplayGain}} (dB)",
         "hotkey_favoriteCurrentSong": "oblíbit $t(common.currentSong)",
@@ -60,7 +61,7 @@
         "crossfadeStyle": "způsob prolnutí",
         "sidePlayQueueStyle_optionAttached": "připojené",
         "sidebarConfiguration": "nastavení postranního panelu",
-        "sampleRate_description": "vyberte výstupní vzorkovací frekvenci k použití, když je vybraná vzorkovací frekvence jiná, než ta u aktuálního média. hodnota nižší než 8000 použije výchozí frekvenci",
+        "sampleRate_description": "vyberte výstupní vzorkovací frekvenci k použití, když je vybraná vzorkovací frekvence jiná, než ta u aktuálního média",
         "replayGainMode_optionNone": "$t(common.none)",
         "replayGainClipping": "clipping {{ReplayGain}}",
         "hotkey_zoomIn": "přiblížení",
@@ -190,13 +191,7 @@
         "discordRichPresence": "{{discord}} rich presence",
         "font_description": "nastavení písma použitého v aplikaci",
         "savePlayQueue_description": "uložit frontu přehrávání, když je aplikace zavřena a obnovit ji při otevření aplikace",
-        "useSystemTheme": "použít systémový motiv",
-        "buttonSize": "velikost tlačítek lišty přehrávače",
-        "buttonSize_description": "velikost tlačítek na liště přehrávače",
-        "clearCache": "vymazat mezipaměť prohlížeče",
-        "clearCache_description": "„tvrdé pročištění“ aplikace feishin. kromě mezipaměti aplikace feishin vymaže i mezipaměť prohlížeče (uložené obrázky a další zdroje). přihlašovací údaje k serveru a nastavení nebudou ovlivněny",
-        "clearQueryCache": "vymazat mezipaměť aplikace feishin",
-        "clearQueryCache_description": "„lehké pročištění“ aplikace feishin. tímto obnovíte seznamy skladeb, metadata skladeb a resetujete uložené texty. nastavení, přihlašovací údaje k serveru a obrázky v mezipaměti nebudou ovlivněny"
+        "useSystemTheme": "použít systémový motiv"
     },
     "action": {
         "editPlaylist": "upravit $t(entity.playlist_one)",
@@ -564,7 +559,7 @@
             "error_savePassword": "při ukládání hesla se vyskytla chyba"
         },
         "addToPlaylist": {
-            "success": "přidáno $t(entity.trackWithCount, {\"count\": {{message}} }) do $t(entity.playlistWithCount, {\"count\": {{numOfPlaylists}} })",
+            "success": "přidáno {{message}} $t(entity.song_other) do {{numOfPlaylists}} $t(entity.playlist_other)",
             "title": "přidat do $t(entity.playlist_one)",
             "input_skipDuplicates": "přeskočit duplicity",
             "input_playlists": "$t(entity.playlist_other)"
@@ -622,7 +617,7 @@
         "artistWithCount_other": "{{count}} umělců",
         "folder_one": "složka",
         "folder_few": "složky",
-        "folder_other": "složky",
+        "folder_other": "složek",
         "smartPlaylist": "chytrý $t(entity.playlist_one)",
         "album_one": "album",
         "album_few": "alba",

src/i18n/locales/de.json

@@ -8,8 +8,8 @@
         "deletePlaylist": "löschen $t(entity.playlist_one)",
         "deselectAll": "Alle abwählen",
         "goToPage": "Gehe zur Seite",
-        "moveToTop": "Nach oben",
-        "moveToBottom": "Nach unten",
+        "moveToTop": "Nach Oben",
+        "moveToBottom": "Nach Unten",
         "removeFromPlaylist": "Entfernen von $t(entity.playlist_one)",
         "viewPlaylists": "Ansicht $t(entity.playlist_other)",
         "refresh": "$t(common.refresh)",
@@ -23,7 +23,7 @@
         "increase": "erhöhen",
         "rating": "Wertung",
         "bpm": "bpm",
-        "refresh": "Aktualisieren",
+        "refresh": "erneuern",
         "unknown": "Unbekannt",
         "areYouSure": "Bist Du sicher?",
         "edit": "Bearbeiten",
@@ -61,9 +61,7 @@
         "delete": "Löschen",
         "cancel": "Abbrechen",
         "forceRestartRequired": "Neustarten um die Änderungen zu übernehmen... Schließe die Benachrichtigung zum Neustarten",
-        "setting": "Einstellungen",
-        "setting_one": "",
-        "setting_other": "Einstellungen",
+        "setting": "Einstellung",
         "version": "Version",
         "title": "Titel",
         "filter_one": "Filter",
@@ -86,7 +84,7 @@
         "sortOrder": "Reihenfolge",
         "none": "keine",
         "menu": "Menü",
-        "restartRequired": "(Neustart benötigt)",
+        "restartRequired": "Neustart benötigt",
         "previousSong": "vorheriger $t(entity.track_one)",
         "noResultsFromQuery": "Die Abfrage brachte keine Ergebnisse",
         "quit": "Verlassen",
@@ -122,7 +120,7 @@
         "loginRateError": "Zu viele Anmeldeversuche, bitte versuche es in einigen Sekunden erneut"
     },
     "filter": {
-        "mostPlayed": "Meistgespielt",
+        "mostPlayed": "Meist gespielt",
         "comment": "Kommentar",
         "playCount": "Anzahl abgespielt",
         "recentlyUpdated": "kürzlich aktualisiert",
@@ -193,7 +191,7 @@
             "error_savePassword": "Beim Versuch, das Passwort zu speichern, ist ein Fehler aufgetreten"
         },
         "addToPlaylist": {
-            "success": "{{message}} $t(entity.track_other) zu {{numOfPlaylists}} $t(entity.playlist_other) hinzugefügt",
+            "success": "{{message}} $t(entity.song_other) zu {{numOfPlaylists}} $t(entity.playlist_other) hinzugefügt",
             "title": "Zu $t(entity.playlist_one) hinzufügen",
             "input_skipDuplicates": "Duplikate überspringen",
             "input_playlists": "$t(entity.playlist_other)"
@@ -226,12 +224,12 @@
         "artist_other": "Interpreten",
         "folderWithCount_one": "{{count}} Verzeichnis",
         "folderWithCount_other": "{{count}} Verzeichnisse",
-        "albumArtist_one": "Albuminterpret",
-        "albumArtist_other": "Albuminterpreten",
+        "albumArtist_one": "Album Interpret",
+        "albumArtist_other": "Album Interpreten",
         "track_one": "Track",
         "track_other": "Tracks",
-        "albumArtistCount_one": "{{count}} Albuminterpret",
-        "albumArtistCount_other": "{{count}} Albuminterpreten",
+        "albumArtistCount_one": "{{count}} Album Interpret",
+        "albumArtistCount_other": "{{count}} Album Interpreten",
         "albumWithCount_one": "{{count}} Album",
         "albumWithCount_other": "{{count}} Alben",
         "favorite_one": "Favorit",
@@ -251,41 +249,10 @@
     "table": {
         "config": {
             "view": {
-                "table": "Tabelle",
-                "card": "Karte",
-                "poster": "Poster"
+                "table": "Tabelle"
             },
             "general": {
-                "tableColumns": "Tabellenspalten",
-                "gap": "$t(common.gap)",
-                "size": "$t(common.size)",
-                "displayType": "Anzeigestil"
-            },
-            "label": {
-                "dateAdded": "Hinzugefügt am",
-                "lastPlayed": "zuletzt gespielt",
-                "rowIndex": "Reihenindex",
-                "trackNumber": "Tracknummer",
-                "biography": "$t(common.biography)",
-                "bitrate": "$t(common.bitrate)",
-                "albumArtist": "$t(entity.albumArtist_one)",
-                "artist": "$t(entity.artist_one)",
-                "favorite": "$t(common.favorite)",
-                "actions": "$t(common.action_other)",
-                "genre": "$t(entity.genre_one)",
-                "album": "$t(entity.album_one)",
-                "size": "$t(common.size)",
-                "bpm": "$t(common.bpm)",
-                "titleCombined": "$t(common.title) (kombiniert)",
-                "channels": "$t(common.channel_other)",
-                "duration": "$t(common.duration)",
-                "note": "$t(common.note)",
-                "owner": "$t(common.owner)",
-                "path": "$t(common.path)",
-                "rating": "$t(common.rating)",
-                "releaseDate": "Veröffentlichungsdatum",
-                "title": "$t(common.title)",
-                "year": "$t(common.year)"
+                "tableColumns": "Tabellenspalten"
             }
         },
         "column": {
@@ -294,23 +261,7 @@
             "releaseDate": "Veröffentlichungsdatum",
             "bitrate": "Bitrate",
             "title": "Titel",
-            "path": "Pfad",
-            "album": "Album",
-            "albumArtist": "Albenkünstler",
-            "bpm": "bpm",
-            "favorite": "Favorit",
-            "lastPlayed": "zuletzt gespielt",
-            "rating": "Bewertung",
-            "albumCount": "$t(entity.album_other)",
-            "artist": "$t(entity.artist_one)",
-            "channels": "$t(common.channel_other)",
-            "comment": "Kommentar",
-            "dateAdded": "hinzugefügt am",
-            "playCount": "Abgespielt",
-            "discNumber": "Disk",
-            "genre": "$t(entity.genre_one)",
-            "songCount": "$t(entity.track_other)",
-            "trackNumber": "Nr."
+            "path": "Pfad"
         }
     },
     "page": {
@@ -321,12 +272,12 @@
                 "synchronized": "synchronisiert",
                 "followCurrentLyric": "dem Songtext folgen",
                 "opacity": "Deckkraft",
-                "lyricSize": "Songtext-Größe",
+                "lyricSize": "Songtext Größe",
                 "showLyricProvider": "Songtext-Anbieter anzeigen",
                 "unsynchronized": "nicht synchronisiert",
-                "lyricAlignment": "Songtext-Ausrichtung",
+                "lyricAlignment": "Songtext Ausrichtung",
                 "useImageAspectRatio": "Bildseitenverhältnis verwenden",
-                "lyricGap": "Songtext-Lücke"
+                "lyricGap": "Songtext Lücke"
             },
             "upNext": "als nächstes",
             "lyrics": "Songtexte",
@@ -338,21 +289,21 @@
             "manageServers": "Server verwalten",
             "expandSidebar": "Seitenleiste erweitern",
             "collapseSidebar": "Seitenleiste einklappen",
-            "openBrowserDevtools": "Browser-Entwicklungswerkzeuge öffnen",
+            "openBrowserDevtools": "Browser Entwicklungswerkzeuge öffnen",
             "goBack": "Gehe zurück",
             "goForward": "Gehe vorwärts",
             "settings": "$t(common.setting_other)",
             "quit": "$t(common.quit)"
         },
         "home": {
-            "mostPlayed": "Meistgespielt",
+            "mostPlayed": "Meist gespielt",
             "newlyAdded": "Neu hinzugefügte Veröffentlichungen",
-            "explore": "Entdecke deine Bibliothek",
+            "explore": "Entdecken Sie Ihre Bibliothek",
             "recentlyPlayed": "Kürzlich gespielt",
             "title": "$t(common.home)"
         },
         "albumDetail": {
-            "moreFromArtist": "Mehr von diesem $t(entity.artist_one)",
+            "moreFromArtist": "Mehr von diesem $t(entity.genre_one)",
             "moreFromGeneric": "Mehr von {{item}}"
         },
         "globalSearch": {
@@ -449,7 +400,7 @@
     },
     "setting": {
         "audioDevice_description": "Wählen Sie das Audiogerät aus, das für die Wiedergabe verwendet werden soll (nur Webplayer).",
-        "audioExclusiveMode": "Audio-Exklusivmodus",
+        "audioExclusiveMode": "Audio Exklusiver Modus",
         "audioDevice": "Audiogerät",
         "accentColor": "Akzentfarbe",
         "accentColor_description": "Legt die Akzentfarbe für die Anwendung fest",
@@ -478,22 +429,23 @@
         "theme_description": "Legt das für die Anwendung zu verwendende Thema fest",
         "hotkey_playbackPause": "Pause",
         "sidebarCollapsedNavigation_description": "Zeigt die Navigation in der minimierten Seitenleiste an oder verbirgt sie",
+        "mpvExecutablePath_help": "eine pro Zeile",
         "hotkey_volumeUp": "Lauter",
-        "skipDuration": "Sprungdauer",
+        "skipDuration": "Sprung Dauer",
         "showSkipButtons": "Schaltflächen zum Überspringen anzeigen",
         "playButtonBehavior_optionPlay": "$t(player.play)",
         "minimumScrobblePercentage": "minimale Scrobble-Dauer (Prozentsatz)",
         "lyricFetch": "Songtexte aus dem Internet abrufen",
         "scrobble": "Scrobbeln",
         "skipDuration_description": "Legt die zu überspringende Dauer fest, wenn die Überspringen-Schaltflächen in der Player-Leiste verwendet werden",
-        "mpvExecutablePath_description": "Legt den Pfad zur ausführbaren MPV-Datei fest. Wenn leer gelassen, wird der Standard-Pfad verwendet",
+        "mpvExecutablePath_description": "Legt den Pfad zur ausführbaren MPV-Datei fest",
         "replayGainClipping_description": "Verhindern Sie durch {{ReplayGain}} verursachtes Clipping, indem Sie die Verstärkung automatisch verringern",
         "replayGainPreamp": "{{ReplayGain}} Vorverstärker (db)",
         "hotkey_favoriteCurrentSong": "Favorit $t(common.currentSong)",
         "sampleRate": "Abtastrate",
         "sidePlayQueueStyle_optionAttached": "angefügt",
         "sidebarConfiguration": "Seitenleistenkonfiguration",
-        "sampleRate_description": "Wähle die auszugebende Abtastrate aus, wenn sich die ausgewählte Abtastfrequenz von der des aktuellen Mediums unterscheidet. Ein Wert unter 8000 wird die Standard-Frequenz verwenden",
+        "sampleRate_description": "Wählen Sie die auszugebende Abtastrate aus, wenn sich die ausgewählte Abtastfrequenz von der des aktuellen Mediums unterscheidet",
         "replayGainMode_optionNone": "$t(common.none)",
         "hotkey_zoomIn": "Hineinzoomen",
         "scrobble_description": "Scrobble wird auf Ihrem Medienserver abgespielt",
@@ -543,7 +495,7 @@
         "savePlayQueue": "Wiedergabe-Warteschlange speichern",
         "minimumScrobbleSeconds_description": "die Mindestdauer in Sekunden, die das Lied abspielen muss, bevor es gescrobbelt wird",
         "skipPlaylistPage_description": "Gehen Sie beim Navigieren zu einer Wiedergabeliste zur Titelseite der Wiedergabeliste und nicht zur Standardseite",
-        "fontType_description": "Die integrierte Schriftart wählt eine der von Feishin bereitgestellten Schriftarten aus. Mit der Systemschriftart können Sie jede von Ihrem Betriebssystem bereitgestellte Schriftart auswählen. Benutzerdefiniert erlaubt es eine eigene Schriftart bereitzustellen",
+        "fontType_description": "Die integrierte Schriftart wählt eine der von Feishin bereitgestellten Schriftarten aus. Mit der Systemschriftart können Sie jede von Ihrem Betriebssystem bereitgestellte Schriftart auswählen. Benutzerdefiniert erlaubt es eine eigene Schriftart bereitstellen",
         "playButtonBehavior": "Verhalten der Wiedergabetaste",
         "volumeWheelStep": "Lautstärkeregler Stufe",
         "sidebarPlaylistList_description": "Ein- oder Ausblenden der Playlisten-Liste in der Seitenleiste",
@@ -558,7 +510,7 @@
         "sidebarConfiguration_description": "Wählen Sie die Elemente und die Reihenfolge aus, in der sie in der Seitenleiste angezeigt werden",
         "remotePort": "Port des Fernsteuerungsserver",
         "hotkey_playbackNext": "Nächster Track",
-        "useSystemTheme_description": "der systemdefinierten Hell- oder Dunkelpräferenz folgen",
+        "useSystemTheme_description": "der systemdefinierten Hell oder Dunkel Präferenz folgen",
         "playButtonBehavior_optionAddNext": "$t(player.addNext)",
         "lyricFetch_description": "Songtexte aus verschiedenen Internetquellen abrufen",
         "lyricFetchProvider_description": "Wählen Sie die Anbieter aus, von denen Sie Liedtexte abrufen möchten. Die Reihenfolge der Anbieter ist die Reihenfolge, in der sie abgefragt werden",
@@ -599,15 +551,6 @@
         "font_description": "Wähle die Schriftart für die Anwendung",
         "themeLight": "Thema (hell)",
         "sidePlayQueueStyle_optionDetached": "lösgelöst",
-        "windowBarStyle_description": "Wähle den Stil der Windows-Leiste",
-        "hotkey_toggleCurrentSongFavorite": "$t(common.currentSong) zu Favoriten hinzufügen",
-        "clearQueryCache_description": "\"Weiches\" Zurücksetzen. Dies wird Playlisten, Musik-Metadaten und gespeicherte Liedtexte zurücksetzen, Zugangsinformationen und zwischengespeicherte Bilder werden behalten",
-        "discordRichPresence_description": "Zeige deinen Wiedergabe-Status in {{discord}} als rich presence an. Angezeigte Bilder sind: {{icon}}, {{playing}}, und {{paused}} ",
-        "clearCache": "Browser-Zwischenspeicher löschen",
-        "clearQueryCache": "feishins Zwischenspeicher leeren",
-        "clearCache_description": "Hartes Zurücksetzen. Neben feishins Zwischenspeicher wird auch der des Browsers gelöscht (Bilder und andere Daten). Zugangsinformationen und Einstellungen werden behalten",
-        "sidePlayQueueStyle": "Wiedergabelistenstil in der Seitenleiste",
-        "zoom_description": "Setzt den Zoom (in %) für das Programm",
-        "zoom": "Zoom"
+        "windowBarStyle_description": "Wähle den Stil der Windows-Leiste"
     }
 }

src/i18n/locales/en.json

@@ -16,11 +16,7 @@
         "removeFromQueue": "remove from queue",
         "setRating": "set rating",
         "toggleSmartPlaylistEditor": "toggle $t(entity.smartPlaylist) editor",
-        "viewPlaylists": "view $t(entity.playlist_other)",
-        "openIn": {
-            "lastfm": "Open in Last.fm",
-            "musicbrainz": "Open in MusicBrainz"
-        }
+        "viewPlaylists": "view $t(entity.playlist_other)"
     },
     "common": {
         "action_one": "action",
@@ -37,8 +33,6 @@
         "channel_one": "channel",
         "channel_other": "channels",
         "clear": "clear",
-        "close": "close",
-        "codec": "codec",
         "collapse": "collapse",
         "comingSoon": "coming soon…",
         "configure": "configure",
@@ -86,7 +80,6 @@
         "random": "random",
         "rating": "rating",
         "refresh": "refresh",
-        "reload": "reload",
         "reset": "reset",
         "resetToDefault": "reset to default",
         "restartRequired": "restart required",
@@ -223,7 +216,7 @@
         "addToPlaylist": {
             "input_playlists": "$t(entity.playlist_other)",
             "input_skipDuplicates": "skip duplicates",
-            "success": "added $t(entity.trackWithCount, {\"count\": {{message}} }) to $t(entity.playlistWithCount, {\"count\": {{numOfPlaylists}} })",
+            "success": "added {{message}} $t(entity.song_other) to {{numOfPlaylists}} $t(entity.playlist_other)",
             "title": "add to $t(entity.playlist_one)"
         },
         "createPlaylist": {
@@ -257,17 +250,6 @@
         }
     },
     "page": {
-        "albumArtistDetail": {
-            "about": "About {{artist}}",
-            "appearsOn": "appears on",
-            "recentReleases": "recent releases",
-            "viewDiscography": "view discography",
-            "relatedArtists": "related $t(entity.artist_other)",
-            "topSongs": "top songs",
-            "topSongsFrom": "Top songs from {{title}}",
-            "viewAll": "view all",
-            "viewAllTracks": "view all $t(entity.track_other)"
-        },
         "albumArtistList": {
             "title": "$t(entity.albumArtist_other)"
         },
@@ -311,8 +293,6 @@
         "fullscreenPlayer": {
             "config": {
                 "dynamicBackground": "dynamic background",
-                "dynamicImageBlur": "image blur size",
-                "dynamicIsImage": "enable background image",
                 "followCurrentLyric": "follow current lyric",
                 "lyricAlignment": "lyric alignment",
                 "lyricGap": "lyric gap",
@@ -366,12 +346,9 @@
             "playlists": "$t(entity.playlist_other)",
             "search": "$t(common.search)",
             "settings": "$t(common.setting_other)",
-            "shared": "shared $t(entity.playlist_other)",
             "tracks": "$t(entity.track_other)"
         },
         "trackList": {
-            "artistTracks": "Tracks by {{artist}}",
-            "genreTracks": "\"{{genre}}\" $t(entity.track_other)",
             "title": "$t(entity.track_other)"
         }
     },
@@ -419,13 +396,6 @@
         "audioExclusiveMode_description": "enable exclusive output mode. In this mode, the system is usually locked out, and only mpv will be able to output audio",
         "audioPlayer": "audio player",
         "audioPlayer_description": "select the audio player to use for playback",
-        "buttonSize": "player bar button size",
-        "buttonSize_description": "the size of the player bar buttons",
-        "clearCache": "clear browser cache",
-        "clearCache_description": "a 'hard clear' of feishin. in addition to clearing feishin's cache, empty the browser cache (saved images and other assets). server credentials and settings are preserved",
-        "clearQueryCache": "clear feishin cache",
-        "clearQueryCache_description": "a 'soft clear' of feishin. this will refresh playlists, track metadata, and reset saved lyrics. settings, server credentials and cached images are preserved",
-        "clearCacheSuccess": "cache cleared successfully",
         "crossfadeDuration": "crossfade duration",
         "crossfadeDuration_description": "sets the duration of the crossfade effect",
         "crossfadeStyle": "crossfade style",
@@ -444,8 +414,6 @@
         "discordUpdateInterval_description": "the time in seconds between each update (minimum 15 seconds)",
         "enableRemote": "enable remote control server",
         "enableRemote_description": "enables the remote control server to allow other devices to control the application",
-        "externalLinks": "show external links",
-        "externalLinks_description": "enables showing external links (Last.fm, MusicBrainz) on artist/album pages",
         "exitToTray": "exit to tray",
         "exitToTray_description": "exit the application to the system tray",
         "floatingQueueArea": "show floating queue hover area",
@@ -464,8 +432,6 @@
         "gaplessAudio_optionWeak": "weak (recommended)",
         "globalMediaHotkeys": "global media hotkeys",
         "globalMediaHotkeys_description": "enable or disable the usage of your system media hotkeys to control playback",
-        "homeConfiguration": "home page configuration",
-        "homeConfiguration_description": "configure what items are shown, and in what order, on the home page",
         "hotkey_browserBack": "browser back",
         "hotkey_browserForward": "browser forward",
         "hotkey_favoriteCurrentSong": "favorite $t(common.currentSong)",
@@ -514,11 +480,9 @@
         "minimumScrobbleSeconds": "minimum scrobble (seconds)",
         "minimumScrobbleSeconds_description": "the minimum duration in seconds of the song that must be played before it is scrobbled",
         "mpvExecutablePath": "mpv executable path",
-        "mpvExecutablePath_description": "sets the path to the mpv executable. if left empty, the default path will be used",
+        "mpvExecutablePath_description": "sets the path to the mpv executable",
+        "mpvExecutablePath_help": "one per line",
         "mpvExtraParameters": "mpv parameters",
-        "mpvExtraParameters_help": "one per line",
-        "passwordStore": "passwords/secret store",
-        "passwordStore_description": "what password/secret store to use. change this if you are having issues storing passwords.",
         "playbackStyle": "playback style",
         "playbackStyle_description": "select the playback style to use for the audio player",
         "playbackStyle_optionCrossFade": "crossfade",
@@ -528,8 +492,6 @@
         "playButtonBehavior_optionAddLast": "$t(player.addLast)",
         "playButtonBehavior_optionAddNext": "$t(player.addNext)",
         "playButtonBehavior_optionPlay": "$t(player.play)",
-        "playerAlbumArtResolution": "player album art resolution",
-        "playerAlbumArtResolution_description": "the resolution for the large player's album art preview. larger makes it look more crisp, but may slow loading down. defaults to 0, meaning auto",
         "remotePassword": "remote control server password",
         "remotePassword_description": "sets the password for the remote control server. These credentials are by default transferred insecurely, so you should use a unique password that you do not care about",
         "remotePort": "remote control server port",
@@ -548,7 +510,7 @@
         "replayGainPreamp": "{{ReplayGain}} preamp (dB)",
         "replayGainPreamp_description": "adjust the preamp gain applied to the {{ReplayGain}} values",
         "sampleRate": "sample rate",
-        "sampleRate_description": "select the output sample rate to be used if the sample frequency selected is different from that of the current media. a value less than 8000 will use the default frequency",
+        "sampleRate_description": "select the output sample rate to be used if the sample frequency selected is different from that of the current media",
         "savePlayQueue": "save play queue",
         "savePlayQueue_description": "save the play queue when the application is closed and restore it when the application is opened",
         "scrobble": "scrobble",
@@ -571,8 +533,6 @@
         "skipDuration_description": "sets the duration to skip when using the skip buttons on the player bar",
         "skipPlaylistPage": "skip playlist page",
         "skipPlaylistPage_description": "when navigating to a playlist, go to the playlist song list page instead of the default page",
-        "startMinimized": "start minimized",
-        "startMinimized_description": "start the application in system tray",
         "theme": "theme",
         "theme_description": "sets the theme to use for the application",
         "themeDark": "theme (dark)",
@@ -592,13 +552,12 @@
         "column": {
             "album": "album",
             "albumArtist": "album artist",
-            "albumCount": "$t(entity.album_other)",
+            "albumCount": "$t(entity.album_one)",
             "artist": "$t(entity.artist_one)",
             "biography": "biography",
             "bitrate": "bitrate",
             "bpm": "bpm",
             "channels": "$t(common.channel_other)",
-            "codec": "$t(common.codec)",
             "comment": "comment",
             "dateAdded": "date added",
             "discNumber": "disc",
@@ -619,8 +578,6 @@
                 "autoFitColumns": "auto fit columns",
                 "displayType": "display type",
                 "gap": "$t(common.gap)",
-                "itemGap": "item gap (px)",
-                "itemSize": "item size (px)",
                 "size": "$t(common.size)",
                 "tableColumns": "table columns"
             },
@@ -633,7 +590,6 @@
                 "bitrate": "$t(common.bitrate)",
                 "bpm": "$t(common.bpm)",
                 "channels": "$t(common.channel_other)",
-                "codec": "$t(common.codec)",
                 "dateAdded": "date added",
                 "discNumber": "disc number",
                 "duration": "$t(common.duration)",

src/i18n/locales/es.json

@@ -40,6 +40,7 @@
         "hotkey_playbackPause": "pausa",
         "replayGainFallback": "{{ReplayGain}} alternativa",
         "sidebarCollapsedNavigation_description": "mostrar u ocultar la navegación en la barra lateral contraída",
+        "mpvExecutablePath_help": "uno por línea",
         "hotkey_volumeUp": "subir volumen",
         "skipDuration": "duración de salto",
         "discordIdleStatus_description": "cuando se activa, actualiza el estado mientras el reproductor está inactivo",
@@ -51,7 +52,7 @@
         "skipDuration_description": "establece la duración a saltar cuando se usa los botones de saltar en la barra del reproductor",
         "enableRemote_description": "activa el control remoto del servidor para permitir a otros dispositivos controlar la aplicación",
         "fontType_optionSystem": "fuente del sistema",
-        "mpvExecutablePath_description": "establece la ruta del ejecutable mpv. si se deja vacío, se usará la ruta predeterminada",
+        "mpvExecutablePath_description": "establece la ruta del ejecutable mpv",
         "replayGainClipping_description": "previene el recorte causado por {{ReplayGain}} bajando automáticamente la ganancia",
         "replayGainPreamp": "preamplificador (dB) de {{ReplayGain}}",
         "hotkey_favoriteCurrentSong": "$t(common.currentSong) favorita",
@@ -59,7 +60,7 @@
         "crossfadeStyle": "estilo de crossfade",
         "sidePlayQueueStyle_optionAttached": "acoplada",
         "sidebarConfiguration": "configuración de la barra lateral",
-        "sampleRate_description": "selecciona el ratio de muestreo de salida a ser usado si la frecuencia de muestreo seleccionada es diferente de la del medio actual. un valor inferior a 8000 usará la frecuencia predeterminada",
+        "sampleRate_description": "selecciona el ratio de muestreo de salida a ser usado si la frecuencia de muestreo seleccionada es diferente de la del medio actual",
         "replayGainMode_optionNone": "$t(common.none)",
         "replayGainClipping": "recortar {{ReplayGain}}",
         "hotkey_zoomIn": "ampliar",
@@ -190,13 +191,7 @@
         "accentColor_description": "establece el color de realce de la aplicación",
         "skipPlaylistPage": "saltar página de lista de reproducción",
         "hotkey_browserForward": "avance",
-        "hotkey_browserBack": "retroceso",
-        "clearCache": "limpiar la caché del navegador",
-        "clearQueryCache": "limpiar la caché de feishin",
-        "clearQueryCache_description": "una 'limpieza suave' de feishin. esto refrescará las listas de reproducción, metadatos de pistas y restablece las letras guardadas. se mantienen los ajustes, credenciales del servidor y las imágenes en caché",
-        "buttonSize": "tamaño del botón de la barra de reproducción",
-        "clearCache_description": "una 'limpieza fuerte' de feishin. para limpiar la caché de feishin, vacía la caché del navegador (imágenes guardadas y otros elementos). se mantienen las credenciales y ajustes del servidor",
-        "buttonSize_description": "el tamaño de los botones de la barra de reproducción"
+        "hotkey_browserBack": "retroceso"
     },
     "action": {
         "editPlaylist": "editar $t(entity.playlist_one)",
@@ -496,7 +491,7 @@
             "error_savePassword": "un error ocurrió cuando se intentó guardar la contraseña"
         },
         "addToPlaylist": {
-            "success": "añadido $t(entity.trackWithCount, {\"count\": {{message}} }) a $t(entity.playlistWithCount, {\"count\": {{numOfPlaylists}} })",
+            "success": "añadido {{message}} $t(entity.song_other) a {{numOfPlaylists}} $t(entity.playlist_other)",
             "title": "añadir a $t(entity.playlist_one)",
             "input_skipDuplicates": "saltar duplicados",
             "input_playlists": "$t(entity.playlist_other)"

src/i18n/locales/fa.json

@@ -1,305 +0,0 @@
-{
-    "player": {
-        "repeat_all": "تکرار همه",
-        "stop": "توقف",
-        "repeat": "تکرار",
-        "skip": "رد کن",
-        "toggleFullscreenPlayer": "تغییر به پخش‌کنندهٔ تمام‌صفحه",
-        "skip_back": "برو عقب",
-        "shuffle": "شافل",
-        "repeat_off": "تکرار غیرفعال",
-        "pause": "pause",
-        "unfavorite": "حذف از موردعلاقه‌ها",
-        "shuffle_off": "شافل غیرفعال",
-        "skip_forward": "برو جلو"
-    },
-    "action": {
-        "editPlaylist": "ویرایش $t(entity.playlist_one)",
-        "goToPage": "برو به صفحهٔ",
-        "moveToTop": "انتقال به بالا",
-        "clearQueue": "خالی کردن صف",
-        "addToFavorites": "افزودن به $t(entity.favorite_other)",
-        "addToPlaylist": "افزودن به $t(entity.playlist_one)",
-        "createPlaylist": "ساخت $t(entity.playlist_one)",
-        "removeFromPlaylist": "حذف از $t(entity.playlist_one)",
-        "viewPlaylists": "نمایش $t(entity.playlist_other)",
-        "refresh": "$t(common.refresh)",
-        "deletePlaylist": "حذف $t(entity.playlist_one)",
-        "removeFromQueue": "حذف از صف",
-        "deselectAll": "لغو انتخاب همه",
-        "moveToBottom": "انتقال به پایین",
-        "setRating": "تعیین امتیاز",
-        "toggleSmartPlaylistEditor": "تغییر $t(entity.smartPlaylist) ویرایشگر",
-        "removeFromFavorites": "حذف از $t(entity.favorite_other)"
-    },
-    "setting": {
-        "hotkey_skipBackward": "برو عقب",
-        "audioDevice_description": "دستگاه صوتی را برای پخش انتخاب کنید (فقط پخش‌کنندهٔ تحت وب)",
-        "hotkey_playbackPause": "pause",
-        "hotkey_volumeUp": "زیاد کردن صدا",
-        "playButtonBehavior_optionPlay": "$t(player.play)",
-        "lyricFetch": "دریافت متن ترانه از اینترنت",
-        "enableRemote_description": "کنترل از راه دور سرویس‌دهنده را فعال کنید تا به دستگاه‌های دیگر اجازهٔ مدیریت اپلیکیشن را بدهید",
-        "mpvExecutablePath_description": "تعیین مسیر فایل اجرایی MPV",
-        "sampleRate": "sample rate",
-        "replayGainMode_optionNone": "$t(common.none)",
-        "hotkey_rate1": "امتیاز ۱ ستاره",
-        "hotkey_skipForward": "برو جلو",
-        "disableLibraryUpdateOnStartup": "غیرفعال کردن بررسی آخرین نسخه در آغاز به کار برنامه",
-        "discordApplicationId_description": "the application id for {{discord}} rich presence (defaults to {{defaultId}})",
-        "playButtonBehavior_optionAddLast": "$t(player.addLast)",
-        "hotkey_playbackPlay": "پخش",
-        "hotkey_volumeDown": "کم کردن صدا",
-        "audioPlayer_description": "پخش‌کنندهٔ صدا را برای پخش انتخاب کنید",
-        "hotkey_globalSearch": "جست و جوی سراسری",
-        "disableAutomaticUpdates": "غیرفعال کردن به‌‌روزرسانی خودکار",
-        "exitToTray_description": "خروج از اپلیکیشن به system tray",
-        "replayGainMode_optionAlbum": "$t(entity.album_one)",
-        "discordUpdateInterval_description": "فاصلهٔ بین هر به روزرسانی به ثانیه (حداقل ۱۵ ثانیه)",
-        "audioExclusiveMode": "حالت اختصاصی صدا",
-        "remotePassword": "رمز عبور کنترل از راه دور",
-        "language_description": "زبان اپلیکیشن را معین می‌کند $t(common.restartRequired)",
-        "hotkey_rate3": "امتیاز ۳ ستاره",
-        "font": "قلم",
-        "replayGainMode_optionTrack": "$t(entity.track_one)",
-        "hotkey_toggleFullScreenPlayer": "تغییر به پخش‌کنندهٔ تمام‌صفحه",
-        "hotkey_localSearch": "جست و جو در صفحه",
-        "hotkey_toggleQueue": "تغییر صف",
-        "hotkey_rate5": "امتیاز ۵ ستاره",
-        "hotkey_playbackPrevious": "قطعهٔ قبل",
-        "language": "زبان",
-        "hotkey_toggleShuffle": "تغییر شافل",
-        "mpvExecutablePath": "مسیر اجرای MPV",
-        "audioDevice": "دستگاه صوتی",
-        "hotkey_rate2": "امتیاز ۲ ستاره",
-        "playButtonBehavior_description": "رفتار پیش‌فرض دکمهٔ پخش را هنگامی که آهنگی به صف اضافه می‌شود معین می‌کند",
-        "exitToTray": "خروج به tray",
-        "hotkey_rate4": "امتیاز ۴ ستاره",
-        "enableRemote": "فعال کردن کنترل از راه دور سرویس‌دهنده",
-        "showSkipButton_description": "نمایش یا مخفی کردن دکمهٔ رد کردن روی نوار پخش‌کننده",
-        "playButtonBehavior": "رفتار دکمهٔ پخش",
-        "playbackStyle_optionNormal": "عادی",
-        "hotkey_toggleRepeat": "تغییر تکرار",
-        "fontType": "نوع قلم",
-        "hotkey_playbackNext": "قطعهٔ بعد",
-        "playButtonBehavior_optionAddNext": "$t(player.addNext)",
-        "lyricFetch_description": "دریافت متن ترانه از منابع اینترنتی",
-        "customFontPath": "مسیر قلم سفارشی",
-        "audioPlayer": "پخش‌کنندهٔ صدا",
-        "hotkey_rate0": "حذف امتیاز",
-        "discordApplicationId": "{{discord}} application id",
-        "hotkey_volumeMute": "بستن صدا",
-        "showSkipButton": "نمایش دکمهٔ رد کردن",
-        "customFontPath_description": "مسیر قلم سفارشی را برای استفاده در اپلیکیشن مشخص کنید",
-        "gaplessAudio_optionWeak": "ضعیف (توصیه شده)",
-        "hotkey_playbackStop": "توقف",
-        "font_description": "قلم مورد استفادهٔ اپلیکیشن را معین می‌کند"
-    },
-    "common": {
-        "backward": "به عقب",
-        "increase": "افزایش",
-        "rating": "امتیاز",
-        "bpm": "bpm",
-        "refresh": "تازه‌سازی",
-        "unknown": "ناشناخته",
-        "areYouSure": "مطمئنید؟",
-        "edit": "ویرایش",
-        "favorite": "موردعلاقه",
-        "left": "چپ",
-        "save": "ذخیره",
-        "right": "راست",
-        "currentSong": "فعلی $t(entity.track_one)",
-        "collapse": "بستن",
-        "trackNumber": "قطعه",
-        "descending": "نزولی",
-        "add": "افزودن",
-        "gap": "فاصله",
-        "ascending": "صعودی",
-        "dismiss": "رد",
-        "year": "سال",
-        "manage": "مدیریت",
-        "limit": "محدود",
-        "minimize": "کمینه",
-        "modified": "ویراسته شده",
-        "duration": "مدت",
-        "name": "نام",
-        "maximize": "بیشینه",
-        "decrease": "کم کردن",
-        "ok": "باشه",
-        "description": "شرح",
-        "configure": "تنظیم",
-        "path": "مسیر",
-        "center": "وسط",
-        "no": "خیر",
-        "owner": "مالک",
-        "enable": "فعال",
-        "clear": "خالی",
-        "forward": "جلو",
-        "delete": "حذف",
-        "cancel": "لغو",
-        "forceRestartRequired": "برای اعمال تغییرها دوباره راه‌اندازی کنید… اعلان را برای راه‌اندازی دوباره ببندید",
-        "version": "نسخه",
-        "title": "عنوان",
-        "filter_one": "فیلتر",
-        "filter_other": "فیلتر",
-        "filters": "فیلتر",
-        "create": "ساختن",
-        "bitrate": "بیت‌ریت",
-        "saveAndReplace": "ذخیره و جایگزین",
-        "action_one": "عملیات",
-        "action_other": "عملیات",
-        "playerMustBePaused": "پخش‌کننده باید متوقف شود",
-        "confirm": "تایید",
-        "resetToDefault": "بازنشانی به پیش‌فرض",
-        "home": "خانه",
-        "comingSoon": "به زودی…",
-        "reset": "بازنشانی",
-        "channel_one": "کانال",
-        "channel_other": "کانال",
-        "disable": "غیرفعال",
-        "sortOrder": "ترتیب",
-        "none": "هیچ",
-        "menu": "منو",
-        "restartRequired": "راه‌اندازی دوباره لازم است",
-        "previousSong": "$t(entity.track_one) پیشین",
-        "noResultsFromQuery": "جست و جو نتیجه‌ای نداشت",
-        "quit": "خروج",
-        "expand": "گسترش",
-        "search": "جست و جو",
-        "saveAs": "ذخیره کن با اسم",
-        "disc": "دیسک",
-        "yes": "بله",
-        "random": "تصادفی",
-        "size": "حجم",
-        "biography": "زندگی‌نامه",
-        "note": "توجه"
-    },
-    "error": {
-        "remotePortWarning": "برای تعیین port تازه، سرویس دهنده را دوباره راه‌اندازی کنید",
-        "playbackError": "هنگام پخش خطایی رخ داد",
-        "remotePortError": "هنگام تعیین port سرویس دهنده خطایی رخ داد",
-        "serverRequired": "سرویس‌دهنده ضروری است",
-        "authenticationFailed": "احراز هویت شکست خورد",
-        "apiRouteError": "درخواست منتقل نشد",
-        "genericError": "خطایی رخ داد",
-        "credentialsRequired": "باید وارد شوید",
-        "sessionExpiredError": "جلسه شما منقضی شده است",
-        "remoteEnableError": "هنگام $t(common.enable) سرویس دهنده خطای رخ داد",
-        "serverNotSelectedError": "سرویس‌دهنده‌ای انتخاب نشده",
-        "remoteDisableError": "هنگام $t(common.disable) سرویس دهنده خطایی رخ داد",
-        "mpvRequired": "وجود MPV ضروری است",
-        "audioDeviceFetchError": "هنگام دسترسی به دستگاه صوتی خطایی رخ داد"
-    },
-    "filter": {
-        "mostPlayed": "بیشتر پخش شده",
-        "comment": "نظر",
-        "playCount": "تعداد پخش",
-        "recentlyUpdated": "به تازگی به روز شده",
-        "channels": "$t(common.channel_other)",
-        "recentlyPlayed": "به تازگی پخش شده",
-        "isRated": "امتیاز داده شده است",
-        "owner": "$t(common.owner)",
-        "title": "عنوان",
-        "rating": "امتیاز",
-        "search": "جست و جو",
-        "bitrate": "بیت‌ریت",
-        "genre": "$t(entity.genre_one)",
-        "recentlyAdded": "به تازگی اضافه شده",
-        "note": "توجه",
-        "name": "نام",
-        "dateAdded": "تاریخ اضافه شدن",
-        "releaseDate": "تاریخ انتشار",
-        "albumCount": "$t(entity.album_other) عدد",
-        "path": "مسیر",
-        "favorited": "موردعلاقه",
-        "albumArtist": "$t(entity.albumArtist_one)",
-        "isRecentlyPlayed": "به تازگی پخش شده است",
-        "isFavorited": "موردعلاقه است",
-        "bpm": "bpm",
-        "releaseYear": "سال انتشار",
-        "id": "id",
-        "disc": "دیسک",
-        "biography": "زندگی‌نامه",
-        "songCount": "تعداد ترانه",
-        "artist": "$t(entity.artist_one)",
-        "duration": "مدت",
-        "isPublic": "عمومی است",
-        "random": "تصادفی",
-        "lastPlayed": "به تازگی پخش شده",
-        "toYear": "تا سال",
-        "fromYear": "از سال",
-        "criticRating": "امتیاز منتقدین",
-        "album": "$t(entity.album_one)",
-        "trackNumber": "قطعه"
-    },
-    "form": {
-        "deletePlaylist": {
-            "title": "حذف $t(entity.playlist_one)",
-            "success": "$t(entity.playlist_one) حذف شد",
-            "input_confirm": "برای تایید، نام $t(entity.playlist_one) را وارد کنید"
-        },
-        "createPlaylist": {
-            "input_description": "$t(common.description)",
-            "title": "ساخت $t(entity.playlist_one)",
-            "input_public": "عمومی",
-            "input_name": "$t(common.name)",
-            "success": "$t(entity.playlist_one) ساخته شد",
-            "input_owner": "$t(common.owner)"
-        },
-        "addServer": {
-            "title": "افزودن سرویس دهنده",
-            "input_username": "نام کاربری",
-            "input_url": "نشانی",
-            "input_password": "رمز عبور",
-            "input_name": "نام سرویس‌دهنده",
-            "success": "سرویس‌دهنده اضافه شد",
-            "input_savePassword": "ذخیرهٔ رمز",
-            "error_savePassword": "هنگام ذخیره رمز خطایی رخ داد"
-        },
-        "addToPlaylist": {
-            "success": "$t(entity.song_other) به {{numOfPlaylists}}$t(entity.playlist_other) اضافه شد",
-            "title": "افزودن به $t(entity.playlist_one)",
-            "input_playlists": "$t(entity.playlist_other)"
-        },
-        "lyricSearch": {
-            "input_name": "$t(common.name)",
-            "input_artist": "$t(entity.artist_one)"
-        },
-        "editPlaylist": {
-            "title": "ویرایش $t(entity.playlist_one)"
-        }
-    },
-    "entity": {
-        "genre_one": "ژانر",
-        "genre_other": "ژانر",
-        "playlistWithCount_one": "{{count}} فهرست پخش",
-        "playlistWithCount_other": "{{count}} فهرست پخش",
-        "playlist_one": "فهرست پخش",
-        "playlist_other": "فهرست پخش",
-        "artist_one": "هنرمند",
-        "artist_other": "هنرمند",
-        "folderWithCount_one": "{{count}} پوشه",
-        "folderWithCount_other": "{{count}} پوشه",
-        "albumArtist_one": "هنرمند آلبوم",
-        "albumArtist_other": "هنرمند آلبوم",
-        "track_one": "قطعه",
-        "track_other": "قطعه",
-        "albumArtistCount_one": "{{count}} هنرمند آلبوم",
-        "albumArtistCount_other": "{{count}} هنرمند آلبوم",
-        "albumWithCount_one": "{{count}} آلبوم",
-        "albumWithCount_other": "{{count}} آلبوم",
-        "favorite_one": "موردعلاقه",
-        "favorite_other": "موردعلاقه",
-        "artistWithCount_one": "{{count}} هنرمند",
-        "artistWithCount_other": "{{count}} هنرمند",
-        "folder_one": "پوشه",
-        "folder_other": "پوشه",
-        "smartPlaylist": "$t(entity.playlist_one) هوشمند",
-        "album_one": "آلبوم",
-        "album_other": "آلبوم",
-        "genreWithCount_one": "{{count}} ژانر",
-        "genreWithCount_other": "{{count}} ژانر",
-        "trackWithCount_one": "{{count}} قطعه",
-        "trackWithCount_other": "{{count}} قطعه"
-    }
-}

src/i18n/locales/fr.json

@@ -320,6 +320,7 @@
         "remotePort_description": "définit le port du serveur de contrôle à distance",
         "hotkey_skipBackward": "reculer",
         "hotkey_playbackPause": "pause",
+        "mpvExecutablePath_help": "line par line",
         "hotkey_volumeUp": "monter le volume",
         "discordIdleStatus_description": "quand activé, mettre à jour le status pendant que le lecteur est inactif",
         "showSkipButtons": "affiche les boutons suivants et précédents",
@@ -482,7 +483,7 @@
             "error_savePassword": "une erreur s’est produite lors de la tentative de sauvegarde du mot de passe"
         },
         "addToPlaylist": {
-            "success": "{{message}} $t(entity.track_other) ajouté à {{numOfPlaylists}} $t(entity.playlist_other)",
+            "success": "{{message}} $t(entity.song_other) ajouté à {{numOfPlaylists}} $t(entity.playlist_other)",
             "title": "ajouter à $t(entity.playlist_one)",
             "input_skipDuplicates": "sauter les doublons",
             "input_playlists": "$t(entity.playlist_other)"

src/i18n/locales/it.json

@@ -140,6 +140,7 @@
         "audioDevice_description": "seleziona il device audioda usare per la riproduzione (solo web player)",
         "theme_description": "imposta il tema da usare per l'applicazione",
         "hotkey_playbackPause": "pausa",
+        "mpvExecutablePath_help": "uno per linea",
         "hotkey_volumeUp": "alza volume",
         "skipDuration": "salta durata",
         "discordIdleStatus_description": "quando è attivo, aggiorna lo stato mentre il player è inattivo",
@@ -486,7 +487,7 @@
             "error_savePassword": "si è verificato un errore quando si è provato a salvare la password"
         },
         "addToPlaylist": {
-            "success": "aggiunto {{message}} $t(entity.track_other) a {{numOfPlaylists}} $t(entity.playlist_other)",
+            "success": "aggiunto {{message}} $t(entity.song_other) a {{numOfPlaylists}} $t(entity.playlist_other)",
             "title": "aggiungi a $t(entity.playlist_one)",
             "input_skipDuplicates": "salta duplicati",
             "input_playlists": "$t(entity.playlist_other)"

src/i18n/locales/ja.json

@@ -41,6 +41,7 @@
         "hotkey_playbackPause": "一時停止",
         "replayGainFallback": "{{ReplayGain}} フォールバック",
         "sidebarCollapsedNavigation_description": "折りたたみサイドバーのナビゲーションを表示/非表示にします",
+        "mpvExecutablePath_help": "1行ごとに1アイテム",
         "hotkey_volumeUp": "音量を上げる",
         "skipDuration": "スキップの長さ",
         "discordIdleStatus_description": "プレイヤーがアイドル状態でもステータスを更新します",
@@ -552,7 +553,7 @@
             "error_savePassword": "パスワードを保存する際にエラーが発生しました"
         },
         "addToPlaylist": {
-            "success": "{{message}} $t(entity.track_other) を {{numOfPlaylists}} $t(entity.playlist_other) に追加しました",
+            "success": "{{message}} $t(entity.song_other) を {{numOfPlaylists}} $t(entity.playlist_other) に追加しました",
             "title": "$t(entity.playlist_one) に追加",
             "input_skipDuplicates": "重複をスキップ",
             "input_playlists": "$t(entity.playlist_other)"

src/i18n/locales/nl.json

@@ -143,54 +143,7 @@
     },
     "page": {
         "contextMenu": {
-            "setRating": "$t(action.setRating)",
-            "addToPlaylist": "$t(action.addToPlaylist)",
-            "addToFavorites": "$t(action.addToFavorites)",
-            "moveToTop": "$t(action.moveToTop)",
-            "deletePlaylist": "$t(action.deletePlaylist)",
-            "moveToBottom": "$t(action.moveToBottom)",
-            "createPlaylist": "$t(action.createPlaylist)",
-            "removeFromPlaylist": "$t(action.removeFromPlaylist)",
-            "removeFromFavorites": "$t(action.removeFromFavorites)",
-            "addNext": "$t(player.addNext)",
-            "deselectAll": "$t(action.deselectAll)",
-            "addLast": "$t(player.addLast)",
-            "addFavorite": "$t(action.addToFavorites)",
-            "play": "$t(player.play)",
-            "numberSelected": "{{count}} geselecteerd",
-            "removeFromQueue": "$t(action.removeFromQueue)"
-        },
-        "appMenu": {
-            "selectServer": "selecteer server",
-            "version": "versie {{version}}",
-            "settings": "$t(common.setting_other)",
-            "manageServers": "beheer servers",
-            "expandSidebar": "sidebar uitklappen",
-            "collapseSidebar": "sidebar inklappen",
-            "openBrowserDevtools": "open browser devtools",
-            "quit": "$t(common.quit)",
-            "goBack": "terug",
-            "goForward": "vooruit"
-        },
-        "albumDetail": {
-            "moreFromArtist": "meer van deze $t(entity.artist_one)",
-            "moreFromGeneric": "meer van {{item}}"
-        },
-        "fullscreenPlayer": {
-            "config": {
-                "dynamicBackground": "dynamische achtergrond",
-                "followCurrentLyric": "volg de actuele songtekst",
-                "opacity": "opaciteit",
-                "lyricSize": "tekstgrootte",
-                "lyricAlignment": "songtekst uitlijning",
-                "lyricGap": "tekstkloof"
-            }
-        },
-        "albumArtistList": {
-            "title": "$t(entity.albumArtist_other)"
-        },
-        "albumList": {
-            "title": "$t(entity.album_other)"
+            "setRating": "$t(action.setRating)"
         }
     },
     "error": {
@@ -274,41 +227,6 @@
             "ignoreSsl": "negeer ssl $t(common.restartRequired)",
             "ignoreCors": "negeer cors $t(common.restartRequired)",
             "error_savePassword": "er is iets mis gegaan met het opslaan van het wachtwoord"
-        },
-        "deletePlaylist": {
-            "title": "verwijder $t(entity.playlist_one)",
-            "success": "$t(entity.playlist_one) succesvol verwijdert",
-            "input_confirm": "Typ de naam van $t(entity.playlist_one) om te bevestigen"
-        },
-        "createPlaylist": {
-            "input_description": "$t(common.description)",
-            "title": "$t(entity.playlist_one) aanmaken",
-            "input_public": "publiek",
-            "input_name": "$t(common.name)",
-            "success": "$t(entity.playlist_one) aangemaakt",
-            "input_owner": "$t(common.owner)"
-        },
-        "addToPlaylist": {
-            "success": "{{message}}$t(entity.song_other) aan {{numOfPlaylists}} $t(entity.playlist_other) toegevoegd",
-            "title": "aan $t(entity.playlist_one) toevoegen",
-            "input_skipDuplicates": "duplicaten overslaan",
-            "input_playlists": "$t(entity.playlist_other)"
-        },
-        "queryEditor": {
-            "input_optionMatchAll": "alles matchen",
-            "input_optionMatchAny": "elke match"
-        },
-        "lyricSearch": {
-            "input_name": "$t(common.name)",
-            "input_artist": "$t(entity.artist_one)",
-            "title": "tekst zoeken"
-        },
-        "editPlaylist": {
-            "title": "$t(entity.playlist_one) aanpassen"
-        },
-        "updateServer": {
-            "title": "update server",
-            "success": "server succesvol geüpdatet"
         }
     }
 }

src/i18n/locales/pl.json

@@ -242,7 +242,7 @@
             "error_savePassword": "wystąpił błąd podczas próby zapisania hasła"
         },
         "addToPlaylist": {
-            "success": "dodano {{message}} $t(entity.track_other) do {{numOfPlaylists}} $t(entity.playlist_other)",
+            "success": "dodano {{message}} $t(entity.song_other) do {{numOfPlaylists}} $t(entity.playlist_other)",
             "title": "dodano do $t(entity.playlist_one)",
             "input_skipDuplicates": "pomiń duplikaty",
             "input_playlists": "$t(entity.playlist_other)"
@@ -372,7 +372,7 @@
         "stop": "stop",
         "repeat": "powtarzaj jeden",
         "queue_remove": "usuń zaznaczone",
-        "playRandom": "odtwarzaj losowo",
+        "playRandom": "odtwarzaj losowe",
         "skip": "pomiń",
         "previous": "poprzedni",
         "toggleFullscreenPlayer": "przełącz odtwarzacz pełnoekranowy",
@@ -487,6 +487,7 @@
         "hotkey_playbackStop": "zatrzymaj",
         "discordRichPresence": "{{discord}} obszernie obecny",
         "font_description": "ustaw czcionkę dla aplikacji",
+        "mpvExecutablePath_help": "jedna na linnię",
         "playButtonBehavior_optionPlay": "$t(player.play)",
         "minimumScrobblePercentage": "minimalny czas trwania scrobble (procentowy)",
         "mpvExecutablePath_description": "ustaw ścieżkę dla plików wykonywalnych mpv",

src/i18n/locales/ru.json

@@ -434,7 +434,7 @@
             "error_savePassword": "произошла ошибка во время попытки сохранения пароля"
         },
         "addToPlaylist": {
-            "success": "добавлено(а) {{message}} $t(entity.track_other) в {{numOfPlaylists}} $t(entity.playlist_other)",
+            "success": "добавлено(а) {{message}} $t(entity.song_other) в {{numOfPlaylists}} $t(entity.playlist_other)",
             "title": "добавить в $t(entity.playlist_one)",
             "input_skipDuplicates": "пропустить дубликаты",
             "input_playlists": "$t(entity.playlist_other)"

src/i18n/locales/sr.json

@@ -41,6 +41,7 @@
         "hotkey_playbackPause": "pauza",
         "replayGainFallback": "{{ReplayGain}} alternativa",
         "sidebarCollapsedNavigation_description": "prikaži ili sakrij navigaciju u sklopljenoj bočnoj traci",
+        "mpvExecutablePath_help": "po jedna po liniji",
         "hotkey_volumeUp": "pojačaj glasnoću",
         "skipDuration": "dužina preskakanja",
         "discordIdleStatus_description": "kada je omogućeno, ažurira status dok je plejer u mirovanju",
@@ -558,7 +559,7 @@
             "error_savePassword": "došlo je do greške prilikom pokušaja čuvanja lozinke"
         },
         "addToPlaylist": {
-            "success": "dodato {{message}} $t(entity.track_other) u {{numOfPlaylists}} $t(entity.playlist_other)",
+            "success": "dodato {{message}} $t(entity.song_other) u {{numOfPlaylists}} $t(entity.playlist_other)",
             "title": "dodaj u $t(entity.playlist_one)",
             "input_skipDuplicates": "preskoči duplikate",
             "input_playlists": "$t(entity.playlist_other)"

src/i18n/locales/sv.json

@@ -190,7 +190,7 @@
             "error_savePassword": "ett fel uppstod när lösenordet skulle sparas"
         },
         "addToPlaylist": {
-            "success": "tillade {{message}} $t(entity.track_other) til {{numOfPlaylists}} $t(entity.playlist_other)",
+            "success": "tillade {{message}} $t(entity.song_other) til {{numOfPlaylists}} $t(entity.playlist_other)",
             "title": "lägg till i $t(entity.playlist_one)",
             "input_skipDuplicates": "hoppa över dubbletter",
             "input_playlists": "$t(entity.playlist_other)"

src/i18n/locales/zh-Hans.json

@@ -192,11 +192,11 @@
         "scrobble": "记录播放信息（Scrobble）",
         "skipDuration_description": "设置每次按下跳过按钮将会跳过的时长",
         "fontType_optionSystem": "系统字体",
-        "mpvExecutablePath_description": "设置 mpv 二进制文件的路径。如果留空，则使用默认路径",
+        "mpvExecutablePath_description": "设置 mpv 二进制文件的路径",
         "sampleRate": "采样率",
         "sidePlayQueueStyle_optionAttached": "吸附",
         "sidebarConfiguration": "侧边栏设定",
-        "sampleRate_description": "如果选择的采样频率与当前媒体的采样频率不同，请选择要使用的输出采样率。小于 8000 的值将使用默认频率",
+        "sampleRate_description": "所选的采样率与当前媒体的频率不同时，用于输出的采样率",
         "replayGainMode_optionNone": "$t(common.none)",
         "hotkey_zoomIn": "放大",
         "scrobble_description": "在你的社交媒体中记录播放信息",
@@ -292,6 +292,7 @@
         "windowBarStyle_description": "选择窗口顶栏的风格",
         "savePlayQueue_description": "当应用程序关闭时保存播放队列，并在应用程序打开时恢复它",
         "useSystemTheme": "跟随系统",
+        "mpvExecutablePath_help": "每行一个",
         "discordIdleStatus_description": "启用后将会在播放器闲置时更新状态",
         "replayGainClipping_description": "自动降低增益以防止{{ReplayGain}}造成削波",
         "replayGainPreamp": "{{ReplayGain}}前置放大（分贝）",
@@ -304,13 +305,7 @@
         "accentColor_description": "设置应用的强调色",
         "replayGainPreamp_description": "调整应用在{{ReplayGain}}值上的前置放大增益",
         "discordIdleStatus": "显示 rich presence 闲置状态",
-        "discordRichPresence": "{{discord}} rich presence",
-        "clearCache": "清除浏览器缓存",
-        "buttonSize": "播放器栏按钮大小",
-        "buttonSize_description": "播放器栏按钮大小",
-        "clearCache_description": "feishin的“硬清除”。除了清除feishin的缓存，清空浏览器缓存（保存的图像和其他资源）。会保留服务器凭据和设置",
-        "clearQueryCache_description": "feishin的“软清除”。这将会刷新播放列表、元数据并重置保存的歌词。会保留设置、服务器凭据和缓存图像",
-        "clearQueryCache": "清除feishin缓存"
+        "discordRichPresence": "{{discord}} rich presence"
     },
     "error": {
         "remotePortWarning": "重启服务器使新端口生效",
@@ -500,7 +495,7 @@
             "input_url": "url"
         },
         "addToPlaylist": {
-            "success": "添加 $t(entity.trackWithCount, {\"count\": {{message}} }) 到 $t(entity.playlistWithCount, {\"count\": {{numOfPlaylists}} })",
+            "success": "添加 {{message}} $t(entity.song_other) 到 {{numOfPlaylists}} $t(entity.playlist_other)",
             "title": "添加到$t(entity.playlist_one)",
             "input_skipDuplicates": "跳过重复",
             "input_playlists": "$t(entity.playlist_other)"

src/i18n/locales/zh-Hant.json

@@ -1,600 +1 @@
-{
-    "common": {
-        "backward": "返回",
-        "biography": "簡介",
-        "bitrate": "比特率",
-        "bpm": "bpm",
-        "clear": "清空",
-        "collapse": "折疊",
-        "comingSoon": "即將上線…",
-        "confirm": "確認",
-        "decrease": "降低",
-        "delete": "刪除",
-        "descending": "降序",
-        "description": "描述",
-        "forceRestartRequired": "重啓應用使更改生效…關閉通知即可重啓",
-        "menu": "菜單",
-        "action_other": "操作",
-        "add": "添加",
-        "areYouSure": "是否繼續？",
-        "ascending": "升序",
-        "disable": "禁用",
-        "disc": "盤",
-        "dismiss": "忽略",
-        "duration": "時長",
-        "edit": "編輯",
-        "enable": "啓用",
-        "expand": "展開",
-        "favorite": "收藏",
-        "filter_other": "篩選",
-        "filters": "篩選",
-        "forward": "前進",
-        "gap": "空隙",
-        "home": "主頁",
-        "increase": "增高",
-        "left": "左",
-        "limit": "限制",
-        "manage": "管理",
-        "maximize": "最大化",
-        "ok": "好",
-        "owner": "所有者",
-        "path": "路徑",
-        "playerMustBePaused": "播放器須被暫停",
-        "previousSong": "上壹首$t(entity.track_one)",
-        "quit": "退出",
-        "random": "隨機",
-        "rating": "評分",
-        "refresh": "刷新",
-        "reset": "重置",
-        "resetToDefault": "重置爲默認",
-        "restartRequired": "需要重啓應用",
-        "right": "右",
-        "save": "保存",
-        "saveAndReplace": "保存並替換",
-        "saveAs": "保存爲",
-        "search": "搜索",
-        "sortOrder": "順序",
-        "title": "標題",
-        "trackNumber": "音軌編號",
-        "unknown": "未知",
-        "size": "大小",
-        "version": "版本",
-        "year": "年份",
-        "yes": "是",
-        "cancel": "取消",
-        "center": "中央",
-        "channel_other": "頻道",
-        "configure": "配置",
-        "create": "創建",
-        "currentSong": "當前$t(entity.track_one)",
-        "minimize": "最小化",
-        "modified": "已修改",
-        "name": "名稱",
-        "no": "否",
-        "none": "無",
-        "noResultsFromQuery": "未查詢到匹配結果",
-        "note": "注釋"
-    },
-    "error": {
-        "endpointNotImplementedError": "{{serverType}} 尚未實現端點 {{endpoint}}",
-        "apiRouteError": "請求失敗：無法路由",
-        "audioDeviceFetchError": "無法獲取音頻設備",
-        "authenticationFailed": "認證失敗",
-        "credentialsRequired": "需要憑證",
-        "genericError": "發生了錯誤",
-        "invalidServer": "無效的服務器",
-        "localFontAccessDenied": "無法獲取本地字體",
-        "loginRateError": "登錄請求嘗試次數過多，請稍後再試",
-        "remoteDisableError": "$t(common.disable)遠程服務器時出現錯誤",
-        "remoteEnableError": "$t(common.enable)遠程服務器時出現錯誤",
-        "remotePortError": "設置遠程服務器端口時發生錯誤",
-        "remotePortWarning": "重啓服務器使新端口生效",
-        "serverRequired": "需要服務器",
-        "sessionExpiredError": "會話已過期",
-        "systemFontError": "獲取系統字體時出現錯誤",
-        "serverNotSelectedError": "未選擇服務器",
-        "mpvRequired": "需要 MPV",
-        "playbackError": "無法播放媒體"
-    },
-    "page": {
-        "contextMenu": {
-            "removeFromFavorites": "$t(action.removeFromFavorites)",
-            "addToFavorites": "$t(action.addToFavorites)",
-            "addToPlaylist": "$t(action.addToPlaylist)",
-            "removeFromPlaylist": "$t(action.removeFromPlaylist)",
-            "removeFromQueue": "$t(action.removeFromQueue)",
-            "addFavorite": "$t(action.addToFavorites)",
-            "addLast": "$t(player.addLast)",
-            "addNext": "$t(player.addNext)",
-            "createPlaylist": "$t(action.createPlaylist)",
-            "deletePlaylist": "$t(action.deletePlaylist)",
-            "deselectAll": "$t(action.deselectAll)",
-            "moveToBottom": "$t(action.moveToBottom)",
-            "setRating": "$t(action.setRating)",
-            "moveToTop": "$t(action.moveToTop)",
-            "numberSelected": "{{count}} 已選擇",
-            "play": "$t(player.play)"
-        },
-        "globalSearch": {
-            "title": "命令",
-            "commands": {
-                "goToPage": "跳至頁面",
-                "searchFor": "搜索 {{query}}",
-                "serverCommands": "服務器命令"
-            }
-        },
-        "home": {
-            "explore": "從庫中搜索",
-            "recentlyPlayed": "最近播放",
-            "title": "$t(common.home)",
-            "mostPlayed": "最多播放",
-            "newlyAdded": "最近添加的發布"
-        },
-        "appMenu": {
-            "openBrowserDevtools": "打開浏覽器開發者工具",
-            "collapseSidebar": "折疊側邊欄",
-            "expandSidebar": "展開側邊欄",
-            "goBack": "返回",
-            "goForward": "前進",
-            "quit": "$t(common.quit)",
-            "selectServer": "選擇服務器",
-            "settings": "$t(common.setting_other)",
-            "version": "版本 {{version}}",
-            "manageServers": "管理服務器"
-        },
-        "fullscreenPlayer": {
-            "config": {
-                "showLyricProvider": "顯示歌詞提供者",
-                "useImageAspectRatio": "使用圖片縱橫比",
-                "dynamicBackground": "動態背景",
-                "followCurrentLyric": "跟隨當前歌詞",
-                "lyricAlignment": "歌詞對齊",
-                "lyricGap": "歌詞間距",
-                "lyricSize": "歌詞字體大小",
-                "synchronized": "已同步",
-                "unsynchronized": "未同步",
-                "opacity": "透明度",
-                "showLyricMatch": "顯示匹配的歌詞"
-            },
-            "lyrics": "歌詞",
-            "related": "相關",
-            "upNext": "即將播放"
-        },
-        "playlistList": {
-            "title": "$t(entity.playlist_other)"
-        },
-        "setting": {
-            "hotkeysTab": "快捷鍵",
-            "playbackTab": "播放",
-            "windowTab": "窗口",
-            "generalTab": "通用"
-        },
-        "albumArtistList": {
-            "title": "$t(entity.albumArtist_other)"
-        },
-        "albumDetail": {
-            "moreFromArtist": "更多該$t(entity.artist_one)作品",
-            "moreFromGeneric": "更多{{item}}作品"
-        },
-        "albumList": {
-            "title": "$t(entity.album_other)"
-        },
-        "genreList": {
-            "title": "$t(entity.genre_other)"
-        },
-        "sidebar": {
-            "albumArtists": "$t(entity.albumArtist_other)",
-            "albums": "$t(entity.album_other)",
-            "artists": "$t(entity.artist_other)",
-            "folders": "$t(entity.folder_other)",
-            "search": "$t(common.search)",
-            "settings": "$t(common.setting_other)",
-            "tracks": "$t(entity.track_other)",
-            "genres": "$t(entity.genre_other)",
-            "home": "$t(common.home)",
-            "nowPlaying": "正在播放",
-            "playlists": "$t(entity.playlist_other)"
-        },
-        "trackList": {
-            "title": "$t(entity.track_other)"
-        }
-    },
-    "player": {
-        "playbackFetchInProgress": "正在加載歌曲…",
-        "addLast": "添加到播放列表末尾",
-        "addNext": "添加爲播放列表下壹首",
-        "favorite": "收藏",
-        "mute": "靜音",
-        "muted": "已靜音",
-        "playbackFetchNoResults": "未找到歌曲",
-        "playbackSpeed": "播放速度",
-        "playRandom": "隨機播放",
-        "previous": "上壹首",
-        "queue_clear": "清空播放隊列",
-        "queue_remove": "移除所選",
-        "repeat": "循環",
-        "repeat_all": "全部循環",
-        "repeat_off": "不循環",
-        "shuffle": "隨機播放",
-        "shuffle_off": "未啓用隨機播放",
-        "skip": "跳過",
-        "skip_back": "向後跳過",
-        "skip_forward": "向前跳過",
-        "stop": "停止",
-        "toggleFullscreenPlayer": "全屏",
-        "unfavorite": "取消收藏",
-        "pause": "暫停",
-        "next": "下壹首",
-        "play": "播放",
-        "playbackFetchCancel": "請稍等…關閉通知以取消操作",
-        "queue_moveToBottom": "使所選置頂",
-        "queue_moveToTop": "使所選置底"
-    },
-    "setting": {
-        "audioPlayer_description": "選擇用于播放的音頻播放器",
-        "themeLight": "主題（淺色）",
-        "themeLight_description": "應用將使用淺色主題",
-        "discordRichPresence": "{{discord}} rich presence",
-        "hotkey_volumeDown": "音量降低",
-        "hotkey_volumeMute": "靜音",
-        "minimumScrobblePercentage": "最小 scrobble 時長（百分比）",
-        "minimumScrobblePercentage_description": "歌曲被記錄爲已播放（scrobble）所需的最小播放百分比",
-        "theme_description": "設置應用的主題",
-        "accentColor": "強調色",
-        "accentColor_description": "設置應用的強調色",
-        "applicationHotkeys": "應用快捷鍵",
-        "applicationHotkeys_description": "配置應用快捷鍵。勾選設爲全局快捷鍵（僅桌面端）",
-        "audioDevice": "音頻設備",
-        "audioDevice_description": "選擇用于播放的音頻設備（僅 web 播放器）",
-        "audioExclusiveMode": "音頻獨占模式",
-        "audioExclusiveMode_description": "啓用獨占輸出模式。在此模式下，系統通常被鎖定，只有 mpv 能夠輸出音頻",
-        "audioPlayer": "音頻播放器",
-        "crossfadeDuration": "淡入淡出持續時間",
-        "crossfadeDuration_description": "設置淡入淡出持續時間",
-        "crossfadeStyle": "淡入淡出風格",
-        "crossfadeStyle_description": "選擇用于音頻播放器的淡入淡出風格",
-        "customFontPath": "自定義字體路徑",
-        "customFontPath_description": "設置應用使用的自定義字體路徑",
-        "disableAutomaticUpdates": "禁用自動更新",
-        "disableLibraryUpdateOnStartup": "禁用啓動時查找新版本",
-        "discordApplicationId": "{{discord}} 應用 id",
-        "discordApplicationId_description": "{{discord}} rich presence 應用 id（默認爲 {{defaultId}}）",
-        "discordIdleStatus": "顯示 rich presence 閑置狀態",
-        "discordIdleStatus_description": "啓用後將會在播放器閑置時更新狀態",
-        "discordRichPresence_description": "在 {{discord}} rich presence 中顯示播放狀態。圖片鍵爲：{{icon}}、{{playing}} 和 {{paused}} ",
-        "discordUpdateInterval": "{{discord}} rich presence 更新間隔",
-        "discordUpdateInterval_description": "更新間隔秒數（至少 15 秒）",
-        "enableRemote": "啓用遠程控制服務器",
-        "enableRemote_description": "啓用遠程控制服務器，以允許其他設備控制此應用",
-        "exitToTray": "退出時最小化到托盤",
-        "floatingQueueArea_description": "在屏幕右側顯示壹個懸停圖標，以查看播放隊列",
-        "followLyric": "跟隨當前歌詞",
-        "font_description": "設置應用使用的字體",
-        "fontType": "字體類型",
-        "fontType_description": "內置字體可以選擇 Feishin 提供的字體之壹。系統字體允許您選擇操作系統提供的任何字體。自定義選項允許您使用自己的字體",
-        "fontType_optionBuiltIn": "內置字體",
-        "fontType_optionCustom": "自定義字體",
-        "fontType_optionSystem": "系統字體",
-        "gaplessAudio": "無縫音頻",
-        "gaplessAudio_description": "調整 mpv 無縫音頻設置",
-        "gaplessAudio_optionWeak": "弱（推薦）",
-        "globalMediaHotkeys": "全局媒體快捷鍵",
-        "hotkey_browserForward": "浏覽器前進",
-        "hotkey_favoritePreviousSong": "收藏 $t(common.previousSong)",
-        "hotkey_globalSearch": "全局搜索",
-        "hotkey_localSearch": "頁面內搜索",
-        "hotkey_playbackNext": "下壹曲",
-        "hotkey_playbackPause": "暫停",
-        "hotkey_playbackPlay": "播放",
-        "hotkey_playbackPlayPause": "播放/暫停",
-        "hotkey_playbackPrevious": "上壹曲",
-        "hotkey_rate2": "評爲 2 星",
-        "hotkey_rate1": "評爲 1 星",
-        "hotkey_rate3": "評爲 3 星",
-        "hotkey_rate4": "評爲 4 星",
-        "hotkey_rate5": "評爲 5 星",
-        "hotkey_skipBackward": "向回跳過",
-        "hotkey_skipForward": "向後跳過",
-        "hotkey_toggleCurrentSongFavorite": "收藏 / 取消收藏$t(common.currentSong)",
-        "hotkey_toggleFullScreenPlayer": "全屏播放",
-        "hotkey_togglePreviousSongFavorite": "收藏 / 取消收藏$t(common.previousSong)",
-        "hotkey_toggleQueue": "顯示 / 隱藏播放隊列",
-        "hotkey_toggleRepeat": "切換循環播放設定",
-        "hotkey_toggleShuffle": "切換隨機播放設定",
-        "hotkey_unfavoriteCurrentSong": "取消收藏$t(common.currentSong)",
-        "hotkey_unfavoritePreviousSong": "取消收藏$t(common.previousSong)",
-        "hotkey_zoomIn": "放大",
-        "hotkey_zoomOut": "縮小",
-        "language": "語言",
-        "language_description": "設置應用的語言（$t(common.restartRequired)）",
-        "lyricFetch": "從互聯網獲取歌詞",
-        "lyricFetch_description": "從多個互聯網源獲取歌詞",
-        "lyricFetchProvider": "歌詞源",
-        "lyricOffset": "歌詞偏移（毫秒）",
-        "lyricOffset_description": "將歌詞偏移指定的毫秒數",
-        "lyricFetchProvider_description": "選擇歌詞源。 歌詞源順序與查詢順序壹致",
-        "minimizeToTray": "最小化到托盤",
-        "minimizeToTray_description": "將應用程序最小化到系統托盤",
-        "minimumScrobbleSeconds": "最小 scrobble 時間（秒）",
-        "minimumScrobbleSeconds_description": "歌曲被記錄爲已播放（scrobble）所需的最小播放時間",
-        "mpvExecutablePath": "mpv 二進制文件路徑",
-        "playbackStyle_optionCrossFade": "交叉淡入淡出",
-        "playbackStyle_optionNormal": "通常",
-        "playButtonBehavior": "播放按鈕行爲",
-        "playButtonBehavior_description": "設置將歌曲添加到隊列時播放按鈕的默認行爲",
-        "playButtonBehavior_optionAddLast": "$t(player.addLast)",
-        "playButtonBehavior_optionAddNext": "$t(player.addNext)",
-        "remotePort": "遠程服務器端口",
-        "remoteUsername": "遠程服務器用戶名",
-        "replayGainClipping": "{{ReplayGain}}削波",
-        "replayGainFallback": "{{ReplayGain}}後備替代",
-        "replayGainFallback_description": "樂曲沒有{{ReplayGain}}標簽時應用的增益（以分貝爲單位）",
-        "replayGainMode": "{{ReplayGain}}模式",
-        "replayGainMode_description": "根據樂曲元數據中存儲的{{ReplayGain}}值調整音量增益",
-        "replayGainMode_optionAlbum": "$t(entity.album_one)",
-        "replayGainMode_optionNone": "$t(common.none)",
-        "replayGainMode_optionTrack": "$t(entity.track_one)",
-        "replayGainPreamp": "{{ReplayGain}}前置放大（分貝）",
-        "replayGainPreamp_description": "調整應用在{{ReplayGain}}值上的前置放大增益",
-        "savePlayQueue": "保存播放列表",
-        "sampleRate_description": "如果選擇的采樣頻率與當前媒體的采樣頻率不同，請選擇要使用的輸出采樣率。小于 8000 的值將使用默認頻率",
-        "savePlayQueue_description": "當應用程序關閉時保存播放隊列，並在應用程序打開時恢複它",
-        "scrobble": "記錄播放信息（Scrobble）",
-        "scrobble_description": "在妳的社交媒體中記錄播放信息",
-        "showSkipButton": "顯示跳過按鈕",
-        "showSkipButton_description": "在播放條上顯示/隱藏跳過按鈕",
-        "sidebarPlaylistList": "側邊欄歌單列表",
-        "sidebarCollapsedNavigation": "側邊欄（已折疊）導航",
-        "sidebarCollapsedNavigation_description": "在折疊的側邊欄中顯示或隱藏導航",
-        "sidebarConfiguration": "側邊欄設定",
-        "sidebarConfiguration_description": "選擇側邊欄包含的項目與順序",
-        "sidebarPlaylistList_description": "顯示或隱藏側邊欄歌單列表",
-        "sidePlayQueueStyle": "側邊播放列表樣式",
-        "sidePlayQueueStyle_description": "設置側邊播放列表樣式",
-        "sidePlayQueueStyle_optionAttached": "吸附",
-        "sidePlayQueueStyle_optionDetached": "不吸附",
-        "skipDuration": "跳過時長",
-        "skipDuration_description": "設置每次按下跳過按鈕將會跳過的時長",
-        "skipPlaylistPage": "跳過歌單頁面",
-        "skipPlaylistPage_description": "打開歌單時，直接查看歌曲列表而非查看默認頁面",
-        "theme": "主題",
-        "themeDark": "主題（深色）",
-        "useSystemTheme_description": "使用系統定義的淺色或深色主題",
-        "useSystemTheme": "跟隨系統",
-        "volumeWheelStep": "音量滾輪步長",
-        "volumeWheelStep_description": "在音量滑塊上滾動鼠標滾輪時要更改的音量大小",
-        "windowBarStyle": "窗口頂欄風格",
-        "windowBarStyle_description": "選擇窗口頂欄的風格",
-        "zoom": "縮放率",
-        "zoom_description": "設置應用程序的縮放率",
-        "hotkey_volumeUp": "音量增高",
-        "sampleRate": "采樣率",
-        "showSkipButtons_description": "在播放條顯示/隱藏播放按鈕",
-        "playbackStyle": "播放風格",
-        "exitToTray_description": "退出應用時最小化到系統托盤而非關閉",
-        "floatingQueueArea": "顯示浮動隊列懸停區域",
-        "followLyric_description": "滾動歌詞到當前播放位置",
-        "font": "字體",
-        "globalMediaHotkeys_description": "啓用或禁用系統媒體快捷鍵以控制播放",
-        "hotkey_browserBack": "浏覽器後退",
-        "hotkey_favoriteCurrentSong": "收藏 $t(common.currentSong)",
-        "hotkey_playbackStop": "停止",
-        "hotkey_rate0": "清除評分",
-        "mpvExecutablePath_description": "設置 mpv 二進制文件的路徑。如果留空，則使用默認路徑",
-        "mpvExtraParameters": "mpv 參數",
-        "playbackStyle_description": "選擇播放器的播放風格",
-        "playButtonBehavior_optionPlay": "$t(player.play)",
-        "remotePassword": "遠程控制服務器密碼",
-        "remotePassword_description": "設置遠程控制服務器的密碼。這些憑據默認以不安全的方式傳輸，因此您應該使用壹個您不在意的唯壹密碼",
-        "remotePort_description": "設置遠程服務器端口",
-        "remoteUsername_description": "設置遠程控制服務器的用戶名。如果用戶名和密碼都爲空，則身份驗證將被禁用",
-        "replayGainClipping_description": "自動降低增益以防止{{ReplayGain}}造成削波",
-        "showSkipButtons": "顯示跳過按鈕",
-        "themeDark_description": "應用將使用深色主題",
-        "clearQueryCache_description": "feishin的“軟清除”。這將會刷新播放列表、元數據並重置保存的歌詞。會保留設置、服務器憑據和緩存圖像",
-        "clearCache": "清除浏覽器緩存",
-        "clearCache_description": "feishin的“硬清除”。除了清除feishin的緩存，清空浏覽器緩存（保存的圖像和其他資源）。會保留服務器憑據和設置",
-        "clearQueryCache": "清除feishin緩存",
-        "buttonSize": "播放器欄按鈕大小",
-        "buttonSize_description": "播放器欄按鈕大小"
-    },
-    "table": {
-        "config": {
-            "general": {
-                "displayType": "顯示風格",
-                "gap": "$t(common.gap)",
-                "size": "$t(common.size)",
-                "tableColumns": "列",
-                "autoFitColumns": "列寬自適應"
-            },
-            "label": {
-                "actions": "$t(common.action_other)",
-                "album": "$t(entity.album_one)",
-                "albumArtist": "$t(entity.albumArtist_one)",
-                "artist": "$t(entity.artist_one)",
-                "bpm": "$t(common.bpm)",
-                "biography": "$t(common.biography)",
-                "bitrate": "$t(common.bitrate)",
-                "channels": "$t(common.channel_other)",
-                "dateAdded": "添加日期",
-                "discNumber": "碟片編號",
-                "duration": "$t(common.duration)",
-                "favorite": "$t(common.favorite)",
-                "genre": "$t(entity.genre_one)",
-                "lastPlayed": "最後播放",
-                "note": "$t(common.note)",
-                "owner": "$t(common.owner)",
-                "path": "$t(common.path)",
-                "playCount": "播放數",
-                "releaseDate": "發布日期",
-                "rowIndex": "行號",
-                "size": "$t(common.size)",
-                "title": "$t(common.title)",
-                "titleCombined": "$t(common.title)（合並）",
-                "trackNumber": "音軌編號",
-                "year": "$t(common.year)",
-                "rating": "$t(common.rating)"
-            },
-            "view": {
-                "card": "卡片",
-                "poster": "海報",
-                "table": "表格"
-            }
-        },
-        "column": {
-            "album": "專輯",
-            "albumArtist": "專輯藝術家",
-            "albumCount": "$t(entity.album_other)",
-            "artist": "$t(entity.artist_one)",
-            "biography": "簡介",
-            "bitrate": "比特率",
-            "channels": "$t(common.channel_other)",
-            "comment": "評論",
-            "dateAdded": "添加日期",
-            "discNumber": "盤",
-            "favorite": "收藏",
-            "lastPlayed": "最後播放",
-            "path": "路徑",
-            "playCount": "播放次數",
-            "rating": "評價",
-            "releaseDate": "發布日期",
-            "releaseYear": "年份",
-            "genre": "$t(entity.genre_one)",
-            "bpm": "bpm",
-            "songCount": "$t(entity.track_other)",
-            "title": "標題",
-            "trackNumber": "音軌編號"
-        }
-    },
-    "action": {
-        "addToFavorites": "添加到$t(entity.favorite_other)",
-        "clearQueue": "清空播放隊列",
-        "createPlaylist": "創建$t(entity.playlist_one)",
-        "deletePlaylist": "刪除$t(entity.playlist_one)",
-        "addToPlaylist": "添加到$t(entity.playlist_one)",
-        "deselectAll": "取消全選",
-        "editPlaylist": "編輯 $t(entity.playlist_one)",
-        "goToPage": "轉到頁面",
-        "moveToBottom": "跳至底部",
-        "moveToTop": "跳至頂部",
-        "refresh": "$t(common.refresh)",
-        "removeFromFavorites": "從$t(entity.favorite_other)移除",
-        "removeFromPlaylist": "從$t(entity.playlist_one)移除",
-        "removeFromQueue": "從播放隊列中移除",
-        "setRating": "評分",
-        "toggleSmartPlaylistEditor": "切換$t(entity.smartPlaylist)編輯器",
-        "viewPlaylists": "查看$t(entity.playlist_other)"
-    },
-    "entity": {
-        "album_other": "專輯",
-        "albumArtist_other": "專輯藝術家",
-        "albumArtistCount_other": "{{count}} 位專輯藝術家",
-        "artist_other": "藝術家",
-        "artistWithCount_other": "{{count}} 位藝術家",
-        "favorite_other": "收藏",
-        "folder_other": "文件夾",
-        "folderWithCount_other": "{{count}} 個文件夾",
-        "genre_other": "流派",
-        "genreWithCount_other": "{{count}} 種流派",
-        "playlist_other": "播放列表",
-        "playlistWithCount_other": "{{count}} 個播放列表",
-        "smartPlaylist": "智能$t(entity.playlist_one)",
-        "track_other": "樂曲",
-        "trackWithCount_other": "{{count}} 首樂曲",
-        "albumWithCount_other": "{{count}} 張專輯"
-    },
-    "filter": {
-        "albumCount": "$t(entity.album_other)數",
-        "artist": "$t(entity.artist_one)",
-        "biography": "個人簡介",
-        "bitrate": "比特率",
-        "bpm": "bpm",
-        "channels": "$t(common.channel_other)",
-        "comment": "評論",
-        "communityRating": "社區評分",
-        "criticRating": "評論家評分",
-        "dateAdded": "已添加日期",
-        "disc": "盤",
-        "duration": "時長",
-        "id": "id",
-        "fromYear": "從年份",
-        "genre": "$t(entity.genre_one)",
-        "isCompilation": "爲合輯",
-        "isFavorited": "已收藏",
-        "isPublic": "已公開",
-        "isRated": "已評分",
-        "name": "名稱",
-        "note": "注釋",
-        "isRecentlyPlayed": "最近播放過",
-        "lastPlayed": "上次播放過",
-        "mostPlayed": "播放最多",
-        "owner": "$t(common.owner)",
-        "path": "路徑",
-        "playCount": "播放次數",
-        "random": "隨機",
-        "rating": "評分",
-        "recentlyPlayed": "最近播放",
-        "recentlyUpdated": "最近更新",
-        "releaseDate": "發布日期",
-        "songCount": "曲目數",
-        "album": "$t(entity.album_one)",
-        "albumArtist": "$t(entity.albumArtist_one)",
-        "favorited": "已收藏",
-        "recentlyAdded": "最近添加",
-        "releaseYear": "發布年份",
-        "search": "搜索",
-        "title": "標題",
-        "toYear": "從年份",
-        "trackNumber": "曲目"
-    },
-    "form": {
-        "addServer": {
-            "input_legacyAuthentication": "啓用舊版認證方式",
-            "input_name": "服務器名",
-            "input_password": "密碼",
-            "input_savePassword": "保存密碼",
-            "input_url": "url",
-            "input_username": "用戶名",
-            "success": "服務器添加成功",
-            "title": "添加服務器",
-            "error_savePassword": "保存密碼時出現錯誤",
-            "ignoreCors": "忽略 cors $t(common.restartRequired)",
-            "ignoreSsl": "忽略 ssl $t(common.restartRequired)"
-        },
-        "addToPlaylist": {
-            "input_playlists": "$t(entity.playlist_other)",
-            "input_skipDuplicates": "跳過重複",
-            "success": "添加 $t(entity.trackWithCount, {\"count\": {{message}} }) 到 $t(entity.playlistWithCount, {\"count\": {{numOfPlaylists}} })",
-            "title": "添加到$t(entity.playlist_one)"
-        },
-        "createPlaylist": {
-            "input_description": "$t(common.description)",
-            "input_name": "$t(common.name)",
-            "input_owner": "$t(common.owner)",
-            "input_public": "公開",
-            "success": "已成功創建 $t(entity.playlist_one)",
-            "title": "創建$t(entity.playlist_one)"
-        },
-        "lyricSearch": {
-            "input_name": "$t(common.name)",
-            "title": "搜索歌詞",
-            "input_artist": "$t(entity.artist_one)"
-        },
-        "queryEditor": {
-            "input_optionMatchAll": "匹配全部",
-            "input_optionMatchAny": "匹配任何"
-        },
-        "updateServer": {
-            "success": "服務器已更新成功",
-            "title": "更新服務器"
-        },
-        "deletePlaylist": {
-            "input_confirm": "輸入$t(entity.playlist_one)的名稱進行確認",
-            "title": "刪除$t(entity.playlist_one)",
-            "success": "$t(entity.playlist_one)已成功刪除"
-        },
-        "editPlaylist": {
-            "title": "編輯$t(entity.playlist_one)"
-        }
-    }
-}
+{}

src/logger.ts

@@ -0,0 +1,41 @@
+import dayjs from 'dayjs';
+
+const reset = '\x1b[0m';
+
+const baseLog = (errorType: 'error' | 'info' | 'success' | 'warn') => {
+    let logString = '';
+    switch (errorType) {
+        case 'error':
+            logString = '\x1b[31m[ERROR]   ';
+            break;
+        case 'info':
+            logString = '\x1b[34m[INFO]    ';
+            break;
+        case 'success':
+            logString = '\x1b[32m[SUCCESS] ';
+            break;
+        case 'warn':
+            logString = '\x1b[33m[WARNING] ';
+            break;
+        default:
+            logString = '\x1b[34m[INFO]    ';
+            break;
+    }
+
+    return (text: string, options?: { context?: Record<string, any>; toast?: boolean }): void => {
+        // const { toast } = options || {};
+        const now = dayjs().toISOString();
+        console.log(
+            `${logString}${now}: ${text} | ${
+                options?.context && JSON.stringify(options.context)
+            }${reset}`,
+        );
+    };
+};
+
+export const fsLog = {
+    error: baseLog('error'),
+    info: baseLog('info'),
+    success: baseLog('success'),
+    warn: baseLog('warn'),
+};

src/main/features/core/player/index.ts

@@ -1,11 +1,7 @@
 import console from 'console';
-import { app, ipcMain } from 'electron';
-import uniq from 'lodash/uniq';
-import MpvAPI from 'node-mpv';
-import { getMainWindow, sendToastToRenderer } from '../../../main';
+import { ipcMain } from 'electron';
+import { getMpvInstance } from '../../../main';
 import { PlayerData } from '/@/renderer/store';
-import { createLog, isWindows } from '../../../utils';
-import { store } from '../settings';
 
 declare module 'node-mpv';
 
@@ -17,208 +13,6 @@ declare module 'node-mpv';
 //     });
 // }
 
-let mpvInstance: MpvAPI | null = null;
-
-const NodeMpvErrorCode = {
-    0: 'Unable to load file or stream',
-    1: 'Invalid argument',
-    2: 'Binary not found',
-    3: 'IPC command invalid',
-    4: 'Unable to bind IPC socket',
-    5: 'Connection timeout',
-    6: 'MPV is already running',
-    7: 'Could not send IPC message',
-    8: 'MPV is not running',
-    9: 'Unsupported protocol',
-};
-
-type NodeMpvError = {
-    errcode: number;
-    method: string;
-    stackTrace: string;
-    verbose: string;
-};
-
-const mpvLog = (
-    data: { action: string; toast?: 'info' | 'success' | 'warning' },
-    err?: NodeMpvError,
-) => {
-    const { action, toast } = data;
-
-    if (err) {
-        const message = `[AUDIO PLAYER] ${action} - mpv errorcode ${err.errcode} - ${
-            NodeMpvErrorCode[err.errcode as keyof typeof NodeMpvErrorCode]
-        }`;
-
-        sendToastToRenderer({ message, type: 'error' });
-        createLog({ message, type: 'error' });
-    }
-
-    const message = `[AUDIO PLAYER] ${action}`;
-    createLog({ message, type: 'error' });
-    if (toast) {
-        sendToastToRenderer({ message, type: toast });
-    }
-};
-
-const MPV_BINARY_PATH = store.get('mpv_path') as string | undefined;
-const isDevelopment = process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true';
-
-const prefetchPlaylistParams = [
-    '--prefetch-playlist=no',
-    '--prefetch-playlist=yes',
-    '--prefetch-playlist',
-];
-
-const DEFAULT_MPV_PARAMETERS = (extraParameters?: string[]) => {
-    const parameters = ['--idle=yes', '--no-config', '--load-scripts=no'];
-
-    if (!extraParameters?.some((param) => prefetchPlaylistParams.includes(param))) {
-        parameters.push('--prefetch-playlist=yes');
-    }
-
-    return parameters;
-};
-
-const createMpv = async (data: {
-    binaryPath?: string;
-    extraParameters?: string[];
-    properties?: Record<string, any>;
-}): Promise<MpvAPI> => {
-    const { extraParameters, properties, binaryPath } = data;
-
-    const params = uniq([...DEFAULT_MPV_PARAMETERS(extraParameters), ...(extraParameters || [])]);
-
-    const extra = isDevelopment ? '-dev' : '';
-
-    const mpv = new MpvAPI(
-        {
-            audio_only: true,
-            auto_restart: false,
-            binary: binaryPath || MPV_BINARY_PATH || undefined,
-            socket: isWindows() ? `\\\\.\\pipe\\mpvserver${extra}` : `/tmp/node-mpv${extra}.sock`,
-            time_update: 1,
-        },
-        params,
-    );
-
-    try {
-        await mpv.start();
-    } catch (error: any) {
-        console.log('mpv failed to start', error);
-    } finally {
-        await mpv.setMultipleProperties(properties || {});
-    }
-
-    mpv.on('status', (status) => {
-        if (status.property === 'playlist-pos') {
-            if (status.value === -1) {
-                mpv?.stop();
-            }
-
-            if (status.value !== 0) {
-                getMainWindow()?.webContents.send('renderer-player-auto-next');
-            }
-        }
-    });
-
-    // Automatically updates the play button when the player is playing
-    mpv.on('resumed', () => {
-        getMainWindow()?.webContents.send('renderer-player-play');
-    });
-
-    // Automatically updates the play button when the player is stopped
-    mpv.on('stopped', () => {
-        getMainWindow()?.webContents.send('renderer-player-stop');
-    });
-
-    // Automatically updates the play button when the player is paused
-    mpv.on('paused', () => {
-        getMainWindow()?.webContents.send('renderer-player-pause');
-    });
-
-    // Event output every interval set by time_update, used to update the current time
-    mpv.on('timeposition', (time: number) => {
-        getMainWindow()?.webContents.send('renderer-player-current-time', time);
-    });
-
-    return mpv;
-};
-
-export const getMpvInstance = () => {
-    return mpvInstance;
-};
-
-const setAudioPlayerFallback = (isError: boolean) => {
-    getMainWindow()?.webContents.send('renderer-player-fallback', isError);
-};
-
-ipcMain.on('player-set-properties', async (_event, data: Record<string, any>) => {
-    mpvLog({ action: `Setting properties: ${JSON.stringify(data)}` });
-    if (data.length === 0) {
-        return;
-    }
-
-    try {
-        if (data.length === 1) {
-            getMpvInstance()?.setProperty(Object.keys(data)[0], Object.values(data)[0]);
-        } else {
-            getMpvInstance()?.setMultipleProperties(data);
-        }
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: `Failed to set properties: ${JSON.stringify(data)}` }, err);
-    }
-});
-
-ipcMain.handle(
-    'player-restart',
-    async (_event, data: { extraParameters?: string[]; properties?: Record<string, any> }) => {
-        try {
-            mpvLog({
-                action: `Attempting to initialize mpv with parameters: ${JSON.stringify(data)}`,
-            });
-
-            // Clean up previous mpv instance
-            getMpvInstance()?.stop();
-            getMpvInstance()?.quit();
-            mpvInstance = null;
-
-            mpvInstance = await createMpv(data);
-            mpvLog({ action: 'Restarted mpv', toast: 'success' });
-            setAudioPlayerFallback(false);
-        } catch (err: NodeMpvError | any) {
-            mpvLog({ action: 'Failed to restart mpv, falling back to web player' }, err);
-            setAudioPlayerFallback(true);
-        }
-    },
-);
-
-ipcMain.handle(
-    'player-initialize',
-    async (_event, data: { extraParameters?: string[]; properties?: Record<string, any> }) => {
-        try {
-            mpvLog({
-                action: `Attempting to initialize mpv with parameters: ${JSON.stringify(data)}`,
-            });
-            mpvInstance = await createMpv(data);
-            setAudioPlayerFallback(false);
-        } catch (err: NodeMpvError | any) {
-            mpvLog({ action: 'Failed to initialize mpv, falling back to web player' }, err);
-            setAudioPlayerFallback(true);
-        }
-    },
-);
-
-ipcMain.on('player-quit', async () => {
-    try {
-        getMpvInstance()?.stop();
-        getMpvInstance()?.quit();
-        mpvInstance = null;
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: 'Failed to quit mpv' }, err);
-    }
-});
-
 ipcMain.handle('player-is-running', async () => {
     return getMpvInstance()?.isRunning();
 });
@@ -229,93 +23,99 @@ ipcMain.handle('player-clean-up', async () => {
 });
 
 ipcMain.on('player-start', async () => {
-    try {
-        await getMpvInstance()?.play();
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: 'Failed to start mpv playback' }, err);
-    }
+    await getMpvInstance()
+        ?.play()
+        .catch((err) => {
+            console.log('MPV failed to play', err);
+        });
 });
 
 // Starts the player
 ipcMain.on('player-play', async () => {
-    try {
-        await getMpvInstance()?.play();
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: 'Failed to start mpv playback' }, err);
-    }
+    await getMpvInstance()
+        ?.play()
+        .catch((err) => {
+            console.log('MPV failed to play', err);
+        });
 });
 
 // Pauses the player
 ipcMain.on('player-pause', async () => {
-    try {
-        await getMpvInstance()?.pause();
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: 'Failed to pause mpv playback' }, err);
-    }
+    await getMpvInstance()
+        ?.pause()
+        .catch((err) => {
+            console.log('MPV failed to pause', err);
+        });
 });
 
 // Stops the player
 ipcMain.on('player-stop', async () => {
-    try {
-        await getMpvInstance()?.stop();
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: 'Failed to stop mpv playback' }, err);
-    }
+    await getMpvInstance()
+        ?.stop()
+        .catch((err) => {
+            console.log('MPV failed to stop', err);
+        });
 });
 
 // Goes to the next track in the playlist
 ipcMain.on('player-next', async () => {
-    try {
-        await getMpvInstance()?.next();
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: 'Failed to go to next track' }, err);
-    }
+    await getMpvInstance()
+        ?.next()
+        .catch((err) => {
+            console.log('MPV failed to go to next', err);
+        });
 });
 
 // Goes to the previous track in the playlist
 ipcMain.on('player-previous', async () => {
-    try {
-        await getMpvInstance()?.prev();
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: 'Failed to go to previous track' }, err);
-    }
+    await getMpvInstance()
+        ?.prev()
+        .catch((err) => {
+            console.log('MPV failed to go to previous', err);
+        });
 });
 
 // Seeks forward or backward by the given amount of seconds
 ipcMain.on('player-seek', async (_event, time: number) => {
-    try {
-        await getMpvInstance()?.seek(time);
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: `Failed to seek by ${time} seconds` }, err);
-    }
+    await getMpvInstance()
+        ?.seek(time)
+        .catch((err) => {
+            console.log('MPV failed to seek', err);
+        });
 });
 
 // Seeks to the given time in seconds
 ipcMain.on('player-seek-to', async (_event, time: number) => {
-    try {
-        await getMpvInstance()?.goToPosition(time);
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: `Failed to seek to ${time} seconds` }, err);
-    }
+    await getMpvInstance()
+        ?.goToPosition(time)
+        .catch((err) => {
+            console.log(`MPV failed to seek to ${time}`, err);
+        });
 });
 
 // Sets the queue in position 0 and 1 to the given data. Used when manually starting a song or using the next/prev buttons
 ipcMain.on('player-set-queue', async (_event, data: PlayerData, pause?: boolean) => {
     if (!data.queue.current && !data.queue.next) {
-        try {
-            await getMpvInstance()?.clearPlaylist();
-            await getMpvInstance()?.pause();
-            return;
-        } catch (err: NodeMpvError | any) {
-            mpvLog({ action: `Failed to clear play queue` }, err);
-        }
+        await getMpvInstance()
+            ?.clearPlaylist()
+            .catch((err) => {
+                console.log('MPV failed to clear playlist', err);
+            });
+
+        await getMpvInstance()
+            ?.pause()
+            .catch((err) => {
+                console.log('MPV failed to pause', err);
+            });
+        return;
     }
 
     try {
         if (data.queue.current) {
             await getMpvInstance()
                 ?.load(data.queue.current.streamUrl, 'replace')
-                .catch(() => {
+                .catch((err) => {
+                    console.log('MPV failed to load song', err);
                     getMpvInstance()?.play();
                 });
 
@@ -323,36 +123,41 @@ ipcMain.on('player-set-queue', async (_event, data: PlayerData, pause?: boolean)
                 await getMpvInstance()?.load(data.queue.next.streamUrl, 'append');
             }
         }
+    } catch (err) {
+        console.error(err);
+    }
 
-        if (pause) {
-            await getMpvInstance()?.pause();
-        } else if (pause === false) {
-            // Only force play if pause is explicitly false
-            await getMpvInstance()?.play();
-        }
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: `Failed to set play queue` }, err);
+    if (pause) {
+        getMpvInstance()?.pause();
     }
 });
 
 // Replaces the queue in position 1 to the given data
 ipcMain.on('player-set-queue-next', async (_event, data: PlayerData) => {
-    try {
-        const size = await getMpvInstance()?.getPlaylistSize();
+    const size = await getMpvInstance()
+        ?.getPlaylistSize()
+        .catch((err) => {
+            console.log('MPV failed to get playlist size', err);
+        });
 
-        if (!size) {
-            return;
-        }
+    if (!size) {
+        return;
+    }
 
-        if (size > 1) {
-            await getMpvInstance()?.playlistRemove(1);
-        }
+    if (size > 1) {
+        await getMpvInstance()
+            ?.playlistRemove(1)
+            .catch((err) => {
+                console.log('MPV failed to remove song from playlist', err);
+            });
+    }
 
-        if (data.queue.next) {
-            await getMpvInstance()?.load(data.queue.next.streamUrl, 'append');
-        }
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: `Failed to set play queue` }, err);
+    if (data.queue.next) {
+        await getMpvInstance()
+            ?.load(data.queue.next.streamUrl, 'append')
+            .catch((err) => {
+                console.log('MPV failed to load next song', err);
+            });
     }
 });
 
@@ -361,57 +166,40 @@ ipcMain.on('player-auto-next', async (_event, data: PlayerData) => {
     // Always keep the current song as position 0 in the mpv queue
     // This allows us to easily set update the next song in the queue without
     // disturbing the currently playing song
-    try {
-        await getMpvInstance()
-            ?.playlistRemove(0)
-            .catch(() => {
-                getMpvInstance()?.pause();
-            });
+    await getMpvInstance()
+        ?.playlistRemove(0)
+        .catch((err) => {
+            console.log('MPV failed to remove song from playlist', err);
+            getMpvInstance()?.pause();
+        });
 
-        if (data.queue.next) {
-            await getMpvInstance()?.load(data.queue.next.streamUrl, 'append');
-        }
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: `Failed to load next song` }, err);
+    if (data.queue.next) {
+        await getMpvInstance()
+            ?.load(data.queue.next.streamUrl, 'append')
+            .catch((err) => {
+                console.log('MPV failed to load next song', err);
+            });
     }
 });
 
 // Sets the volume to the given value (0-100)
 ipcMain.on('player-volume', async (_event, value: number) => {
-    try {
-        if (!value || value < 0 || value > 100) {
-            return;
-        }
-
-        await getMpvInstance()?.volume(value);
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: `Failed to set volume to ${value}` }, err);
-    }
+    await getMpvInstance()
+        ?.volume(value)
+        .catch((err) => {
+            console.log('MPV failed to set volume', err);
+        });
 });
 
 // Toggles the mute status
 ipcMain.on('player-mute', async (_event, mute: boolean) => {
-    try {
-        await getMpvInstance()?.mute(mute);
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: `Failed to set mute status` }, err);
-    }
+    await getMpvInstance()
+        ?.mute(mute)
+        .catch((err) => {
+            console.log('MPV failed to toggle mute', err);
+        });
 });
 
 ipcMain.handle('player-get-time', async (): Promise<number | undefined> => {
-    try {
-        return getMpvInstance()?.getTimePosition();
-    } catch (err: NodeMpvError | any) {
-        mpvLog({ action: `Failed to get current time` }, err);
-        return 0;
-    }
-});
-
-app.on('before-quit', () => {
-    getMpvInstance()?.stop();
-    getMpvInstance()?.quit();
-});
-
-app.on('window-all-closed', () => {
-    getMpvInstance()?.quit();
+    return getMpvInstance()?.getTimePosition();
 });

src/main/features/core/player/media-keys.ts

@@ -1,26 +1,7 @@
 /* eslint-disable promise/always-return */
-import { BrowserWindow, globalShortcut, systemPreferences } from 'electron';
-import { isMacOS } from '../../../utils';
-import { store } from '../settings';
+import { BrowserWindow, globalShortcut } from 'electron';
 
 export const enableMediaKeys = (window: BrowserWindow | null) => {
-    if (isMacOS()) {
-        const shouldPrompt = store.get('should_prompt_accessibility', true) as boolean;
-        const trusted = systemPreferences.isTrustedAccessibilityClient(shouldPrompt);
-
-        if (shouldPrompt) {
-            store.set('should_prompt_accessibility', false);
-        }
-
-        if (!trusted) {
-            window?.webContents.send('toast-from-main', {
-                message:
-                    'Feishin is not a trusted accessibility client. Media keys will not work until this setting is changed',
-                type: 'warning',
-            });
-        }
-    }
-
     globalShortcut.register('MediaStop', () => {
         window?.webContents.send('renderer-player-stop');
     });

src/main/features/core/settings/index.ts

@@ -1,6 +1,5 @@
-import { ipcMain, nativeTheme, safeStorage } from 'electron';
+import { ipcMain, safeStorage } from 'electron';
 import Store from 'electron-store';
-import type { TitleTheme } from '/@/renderer/types';
 
 export const store = new Store();
 
@@ -49,8 +48,3 @@ ipcMain.handle('password-set', (_event, password: string, server: string) => {
     }
     return false;
 });
-
-ipcMain.on('theme-set', (_event, theme: TitleTheme) => {
-    store.set('theme', theme);
-    nativeTheme.themeSource = theme;
-});

src/main/features/linux/mpris.ts

@@ -70,8 +70,6 @@ mprisPlayer.on('volume', (vol: number) => {
     getMainWindow()?.webContents.send('request-volume', {
         volume,
     });
-
-    mprisPlayer.volume = volume / 100;
 });
 
 mprisPlayer.on('shuffle', (event: boolean) => {
@@ -156,19 +154,12 @@ ipcMain.on('update-song', (_event, args: SongUpdate) => {
                 ? song.albumArtists.map((artist) => artist.name)
                 : null,
             'xesam:artist': song.artists?.length ? song.artists.map((artist) => artist.name) : null,
-            'xesam:audioBpm': song.bpm,
-            // Comment is a `list of strings` type
-            'xesam:comment': song.comment ? [song.comment] : null,
-            'xesam:contentCreated': song.releaseDate,
             'xesam:discNumber': song.discNumber ? song.discNumber : null,
             'xesam:genre': song.genres?.length ? song.genres.map((genre: any) => genre.name) : null,
-            'xesam:lastUsed': song.lastPlayedAt,
             'xesam:title': song.name || null,
             'xesam:trackNumber': song.trackNumber ? song.trackNumber : null,
             'xesam:useCount':
                 song.playCount !== null && song.playCount !== undefined ? song.playCount : null,
-            // User ratings are only on Navidrome/Subsonic and are on a scale of 1-5
-            'xesam:userRating': song.userRating ? song.userRating / 5 : null,
         };
     } catch (err) {
         console.log(err);

src/main/main.ts

@@ -20,35 +20,27 @@ import {
     Tray,
     Menu,
     nativeImage,
-    nativeTheme,
     BrowserWindowConstructorOptions,
     protocol,
     net,
 } from 'electron';
 import electronLocalShortcut from 'electron-localshortcut';
-import log from 'electron-log/main';
+import log from 'electron-log';
 import { autoUpdater } from 'electron-updater';
+import uniq from 'lodash/uniq';
+import MpvAPI from 'node-mpv';
 import { disableMediaKeys, enableMediaKeys } from './features/core/player/media-keys';
 import { store } from './features/core/settings/index';
 import MenuBuilder from './menu';
-import {
-    hotkeyToElectronAccelerator,
-    isLinux,
-    isMacOS,
-    isWindows,
-    resolveHtmlPath,
-    createLog,
-    autoUpdaterLogInterface,
-} from './utils';
+import { hotkeyToElectronAccelerator, isLinux, isMacOS, isWindows, resolveHtmlPath } from './utils';
 import './features';
-import type { TitleTheme } from '/@/renderer/types';
 
 declare module 'node-mpv';
 
 export default class AppUpdater {
     constructor() {
         log.transports.file.level = 'info';
-        autoUpdater.logger = autoUpdaterLogInterface;
+        autoUpdater.logger = log;
         autoUpdater.checkForUpdatesAndNotify();
     }
 }
@@ -63,12 +55,6 @@ if (store.get('ignore_ssl')) {
     app.commandLine.appendSwitch('ignore-certificate-errors');
 }
 
-// From https://github.com/tutao/tutanota/commit/92c6ed27625fcf367f0fbcc755d83d7ff8fde94b
-if (isLinux() && !process.argv.some((a) => a.startsWith('--password-store='))) {
-    const paswordStore = store.get('password_store', 'gnome-libsecret') as string;
-    app.commandLine.appendSwitch('password-store', paswordStore);
-}
-
 let mainWindow: BrowserWindow | null = null;
 let tray: Tray | null = null;
 let exitFromTray = false;
@@ -110,19 +96,6 @@ export const getMainWindow = () => {
     return mainWindow;
 };
 
-export const sendToastToRenderer = ({
-    message,
-    type,
-}: {
-    message: string;
-    type: 'success' | 'error' | 'warning' | 'info';
-}) => {
-    getMainWindow()?.webContents.send('toast-from-main', {
-        message,
-        type,
-    });
-};
-
 const createWinThumbarButtons = () => {
     if (isWindows()) {
         getMainWindow()?.setThumbarButtons([
@@ -206,7 +179,7 @@ const createTray = () => {
     tray.setContextMenu(contextMenu);
 };
 
-const createWindow = async (first = true) => {
+const createWindow = async () => {
     if (isDevelopment) {
         await installExtensions();
     }
@@ -221,8 +194,8 @@ const createWindow = async (first = true) => {
         },
         macOS: {
             autoHideMenuBar: true,
-            frame: true,
-            titleBarStyle: 'default',
+            frame: false,
+            titleBarStyle: 'hidden',
             trafficLightPosition: { x: 10, y: 10 },
         },
         windows: {
@@ -285,10 +258,6 @@ const createWindow = async (first = true) => {
         app.exit();
     });
 
-    ipcMain.handle('window-clear-cache', async () => {
-        return mainWindow?.webContents.session.clearCache();
-    });
-
     ipcMain.on('app-restart', () => {
         // Fix for .AppImage
         if (process.env.APPIMAGE) {
@@ -335,36 +304,34 @@ const createWindow = async (first = true) => {
                         }
 
                         const queue = JSON.parse(data.toString());
-                        getMainWindow()?.webContents.send('renderer-restore-queue', queue);
+                        getMainWindow()?.webContents.send('renderer-player-restore-queue', queue);
                     });
                 });
             });
         }
     });
 
-    const globalMediaKeysEnabled = store.get('global_media_hotkeys', true) as boolean;
+    const globalMediaKeysEnabled = store.get('global_media_hotkeys') as boolean;
 
-    if (globalMediaKeysEnabled) {
+    if (globalMediaKeysEnabled !== false) {
         enableMediaKeys(mainWindow);
     }
 
     mainWindow.loadURL(resolveHtmlPath('index.html'));
 
-    const startWindowMinimized = store.get('window_start_minimized', false) as boolean;
-
     mainWindow.on('ready-to-show', () => {
         if (!mainWindow) {
             throw new Error('"mainWindow" is not defined');
         }
-
-        if (!first || !startWindowMinimized) {
+        if (process.env.START_MINIMIZED) {
+            mainWindow.minimize();
+        } else {
             mainWindow.show();
             createWinThumbarButtons();
         }
     });
 
     mainWindow.on('closed', () => {
-        ipcMain.removeHandler('window-clear-cache');
         mainWindow = null;
     });
 
@@ -383,7 +350,7 @@ const createWindow = async (first = true) => {
             event.preventDefault();
             saved = true;
 
-            getMainWindow()?.webContents.send('renderer-save-queue');
+            getMainWindow()?.webContents.send('renderer-player-save-queue');
 
             ipcMain.once('player-save-queue', async (_event, data: Record<string, any>) => {
                 const queueLocation = join(app.getPath('userData'), 'queue');
@@ -447,13 +414,140 @@ const createWindow = async (first = true) => {
         // eslint-disable-next-line
         new AppUpdater();
     }
-
-    const theme = store.get('theme') as TitleTheme | undefined;
-    nativeTheme.themeSource = theme || 'dark';
 };
 
 app.commandLine.appendSwitch('disable-features', 'HardwareMediaKeyHandling,MediaSessionService');
 
+const MPV_BINARY_PATH = store.get('mpv_path') as string | undefined;
+
+const prefetchPlaylistParams = [
+    '--prefetch-playlist=no',
+    '--prefetch-playlist=yes',
+    '--prefetch-playlist',
+];
+
+const DEFAULT_MPV_PARAMETERS = (extraParameters?: string[]) => {
+    const parameters = ['--idle=yes', '--no-config', '--load-scripts=no'];
+
+    if (!extraParameters?.some((param) => prefetchPlaylistParams.includes(param))) {
+        parameters.push('--prefetch-playlist=yes');
+    }
+
+    return parameters;
+};
+
+let mpvInstance: MpvAPI | null = null;
+
+const createMpv = (data: { extraParameters?: string[]; properties?: Record<string, any> }) => {
+    const { extraParameters, properties } = data;
+
+    const params = uniq([...DEFAULT_MPV_PARAMETERS(extraParameters), ...(extraParameters || [])]);
+    console.log('Setting mpv params: ', params);
+
+    const extra = isDevelopment ? '-dev' : '';
+
+    const mpv = new MpvAPI(
+        {
+            audio_only: true,
+            auto_restart: false,
+            binary: MPV_BINARY_PATH || '',
+            socket: isWindows() ? `\\\\.\\pipe\\mpvserver${extra}` : `/tmp/node-mpv${extra}.sock`,
+            time_update: 1,
+        },
+        params,
+    );
+
+    // eslint-disable-next-line promise/catch-or-return
+    mpv.start()
+        .catch((error) => {
+            console.log('MPV failed to start', error);
+        })
+        .finally(() => {
+            console.log('Setting MPV properties: ', properties);
+            mpv.setMultipleProperties(properties || {});
+        });
+
+    mpv.on('status', (status, ...rest) => {
+        console.log('MPV Event: status', status.property, status.value, rest);
+        if (status.property === 'playlist-pos') {
+            if (status.value === -1) {
+                mpv?.stop();
+            }
+
+            if (status.value !== 0) {
+                getMainWindow()?.webContents.send('renderer-player-auto-next');
+            }
+        }
+    });
+
+    // Automatically updates the play button when the player is playing
+    mpv.on('resumed', () => {
+        console.log('MPV Event: resumed');
+        getMainWindow()?.webContents.send('renderer-player-play');
+    });
+
+    // Automatically updates the play button when the player is stopped
+    mpv.on('stopped', () => {
+        console.log('MPV Event: stopped');
+        getMainWindow()?.webContents.send('renderer-player-stop');
+    });
+
+    // Automatically updates the play button when the player is paused
+    mpv.on('paused', () => {
+        console.log('MPV Event: paused');
+        getMainWindow()?.webContents.send('renderer-player-pause');
+    });
+
+    // Event output every interval set by time_update, used to update the current time
+    mpv.on('timeposition', (time: number) => {
+        getMainWindow()?.webContents.send('renderer-player-current-time', time);
+    });
+
+    mpv.on('quit', () => {
+        console.log('MPV Event: quit');
+    });
+
+    return mpv;
+};
+
+export const getMpvInstance = () => {
+    return mpvInstance;
+};
+
+ipcMain.on('player-set-properties', async (_event, data: Record<string, any>) => {
+    if (data.length === 0) {
+        return;
+    }
+
+    if (data.length === 1) {
+        getMpvInstance()?.setProperty(Object.keys(data)[0], Object.values(data)[0]);
+    } else {
+        getMpvInstance()?.setMultipleProperties(data);
+    }
+});
+
+ipcMain.on(
+    'player-restart',
+    async (_event, data: { extraParameters?: string[]; properties?: Record<string, any> }) => {
+        mpvInstance?.quit();
+        mpvInstance = createMpv(data);
+    },
+);
+
+ipcMain.on(
+    'player-initialize',
+    async (_event, data: { extraParameters?: string[]; properties?: Record<string, any> }) => {
+        console.log('Initializing MPV with data: ', data);
+        mpvInstance = createMpv(data);
+    },
+);
+
+ipcMain.on('player-quit', async () => {
+    mpvInstance?.stop();
+    mpvInstance?.quit();
+    mpvInstance = null;
+});
+
 // Must duplicate with the one in renderer process settings.store.ts
 enum BindingActions {
     GLOBAL_SEARCH = 'globalSearch',
@@ -528,7 +622,7 @@ ipcMain.on(
             }
         }
 
-        const globalMediaKeysEnabled = store.get('global_media_hotkeys', true) as boolean;
+        const globalMediaKeysEnabled = store.get('global_media_hotkeys') as boolean;
 
         if (globalMediaKeysEnabled) {
             enableMediaKeys(mainWindow);
@@ -536,25 +630,17 @@ ipcMain.on(
     },
 );
 
-ipcMain.on(
-    'logger',
-    (
-        _event,
-        data: {
-            message: string;
-            type: 'debug' | 'verbose' | 'success' | 'error' | 'warning' | 'info';
-        },
-    ) => {
-        createLog(data);
-    },
-);
+app.on('before-quit', () => {
+    getMpvInstance()?.stop();
+    getMpvInstance()?.quit();
+});
 
 app.on('window-all-closed', () => {
     globalShortcut.unregisterAll();
+    getMpvInstance()?.quit();
     // Respect the OSX convention of having the application in memory even
     // after all windows have been closed
     if (isMacOS()) {
-        ipcMain.removeHandler('window-clear-cache');
         mainWindow = null;
     } else {
         app.quit();
@@ -609,11 +695,7 @@ if (!singleInstance) {
             app.on('activate', () => {
                 // On macOS it's common to re-create a window in the app when the
                 // dock icon is clicked and there are no other windows open.
-                if (mainWindow === null) createWindow(false);
-                else if (!mainWindow.isVisible()) {
-                    mainWindow.show();
-                    createWinThumbarButtons();
-                }
+                if (mainWindow === null) createWindow();
             });
         })
         .catch(console.log);

src/main/preload/browser.ts

@@ -24,12 +24,7 @@ const devtools = () => {
     ipcRenderer.send('window-dev-tools');
 };
 
-const clearCache = (): Promise<void> => {
-    return ipcRenderer.invoke('window-clear-cache');
-};
-
 export const browser = {
-    clearCache,
     devtools,
     exit,
     maximize,
@@ -37,5 +32,3 @@ export const browser = {
     quit,
     unmaximize,
 };
-
-export type Browser = typeof browser;

src/main/preload/local-settings.ts

@@ -1,18 +1,9 @@
 import { IpcRendererEvent, ipcRenderer, webFrame } from 'electron';
 import Store from 'electron-store';
-import { toServerType, type TitleTheme } from '/@/renderer/types';
 
 const store = new Store();
 
-const set = (
-    property: string,
-    value: string | Record<string, unknown> | boolean | string[] | undefined,
-) => {
-    if (value === undefined) {
-        store.delete(property);
-        return;
-    }
-
+const set = (property: string, value: string | Record<string, unknown> | boolean | string[]) => {
     store.set(`${property}`, value);
 };
 
@@ -52,24 +43,9 @@ const fontError = (cb: (event: IpcRendererEvent, file: string) => void) => {
     ipcRenderer.on('custom-font-error', cb);
 };
 
-const themeSet = (theme: TitleTheme): void => {
-    ipcRenderer.send('theme-set', theme);
-};
-
-const SERVER_TYPE = toServerType(process.env.SERVER_TYPE);
-
-const env = {
-    SERVER_LOCK:
-        SERVER_TYPE !== null ? process.env.SERVER_LOCK?.toLocaleLowerCase() === 'true' : false,
-    SERVER_NAME: process.env.SERVER_NAME ?? '',
-    SERVER_TYPE,
-    SERVER_URL: process.env.SERVER_URL ?? 'http://',
-};
-
 export const localSettings = {
     disableMediaKeys,
     enableMediaKeys,
-    env,
     fontError,
     get,
     passwordGet,
@@ -78,7 +54,6 @@ export const localSettings = {
     restart,
     set,
     setZoomFactor,
-    themeSet,
 };
 
 export type LocalSettings = typeof localSettings;

src/main/preload/mpv-player.ts

@@ -1,16 +1,12 @@
 import { ipcRenderer, IpcRendererEvent } from 'electron';
-import { PlayerData } from '/@/renderer/store';
+import { PlayerData, PlayerState } from '/@/renderer/store';
 
 const initialize = (data: { extraParameters?: string[]; properties?: Record<string, any> }) => {
-    return ipcRenderer.invoke('player-initialize', data);
+    ipcRenderer.send('player-initialize', data);
 };
 
-const restart = (data: {
-    binaryPath?: string;
-    extraParameters?: string[];
-    properties?: Record<string, any>;
-}) => {
-    return ipcRenderer.invoke('player-restart', data);
+const restart = (data: { extraParameters?: string[]; properties?: Record<string, any> }) => {
+    ipcRenderer.send('player-restart', data);
 };
 
 const isRunning = () => {
@@ -22,6 +18,7 @@ const cleanup = () => {
 };
 
 const setProperties = (data: Record<string, any>) => {
+    console.log('Setting property :>>', data);
     ipcRenderer.send('player-set-properties', data);
 };
 
@@ -53,6 +50,14 @@ const previous = () => {
     ipcRenderer.send('player-previous');
 };
 
+const restoreQueue = () => {
+    ipcRenderer.send('player-restore-queue');
+};
+
+const saveQueue = (data: Record<string, any>) => {
+    ipcRenderer.send('player-save-queue', data);
+};
+
 const seek = (seconds: number) => {
     ipcRenderer.send('player-seek', seconds);
 };
@@ -149,12 +154,18 @@ const rendererQuit = (cb: (event: IpcRendererEvent) => void) => {
     ipcRenderer.on('renderer-player-quit', cb);
 };
 
-const rendererError = (cb: (event: IpcRendererEvent, data: string) => void) => {
-    ipcRenderer.on('renderer-player-error', cb);
+const rendererSaveQueue = (cb: (event: IpcRendererEvent) => void) => {
+    ipcRenderer.on('renderer-player-save-queue', cb);
 };
 
-const rendererPlayerFallback = (cb: (event: IpcRendererEvent, data: boolean) => void) => {
-    ipcRenderer.on('renderer-player-fallback', cb);
+const rendererRestoreQueue = (
+    cb: (event: IpcRendererEvent, data: Partial<PlayerState>) => void,
+) => {
+    ipcRenderer.on('renderer-player-restore-queue', cb);
+};
+
+const rendererError = (cb: (event: IpcRendererEvent, data: string) => void) => {
+    ipcRenderer.on('renderer-player-error', cb);
 };
 
 export const mpvPlayer = {
@@ -171,6 +182,8 @@ export const mpvPlayer = {
     previous,
     quit,
     restart,
+    restoreQueue,
+    saveQueue,
     seek,
     seekTo,
     setProperties,
@@ -188,9 +201,10 @@ export const mpvPlayerListener = {
     rendererPause,
     rendererPlay,
     rendererPlayPause,
-    rendererPlayerFallback,
     rendererPrevious,
     rendererQuit,
+    rendererRestoreQueue,
+    rendererSaveQueue,
     rendererSkipBackward,
     rendererSkipForward,
     rendererStop,

src/main/preload/utils.ts

@@ -1,59 +1,9 @@
-import { IpcRendererEvent, ipcRenderer } from 'electron';
 import { isMacOS, isWindows, isLinux } from '../utils';
-import { PlayerState } from '/@/renderer/store';
-
-const saveQueue = (data: Record<string, any>) => {
-    ipcRenderer.send('player-save-queue', data);
-};
-
-const restoreQueue = () => {
-    ipcRenderer.send('player-restore-queue');
-};
-
-const onSaveQueue = (cb: (event: IpcRendererEvent) => void) => {
-    ipcRenderer.on('renderer-save-queue', cb);
-};
-
-const onRestoreQueue = (cb: (event: IpcRendererEvent, data: Partial<PlayerState>) => void) => {
-    ipcRenderer.on('renderer-restore-queue', cb);
-};
-
-const playerErrorListener = (cb: (event: IpcRendererEvent, data: { code: number }) => void) => {
-    ipcRenderer.on('player-error-listener', cb);
-};
-
-const mainMessageListener = (
-    cb: (
-        event: IpcRendererEvent,
-        data: { message: string; type: 'success' | 'error' | 'warning' | 'info' },
-    ) => void,
-) => {
-    ipcRenderer.on('toast-from-main', cb);
-};
-
-const logger = (
-    cb: (
-        event: IpcRendererEvent,
-        data: {
-            message: string;
-            type: 'debug' | 'verbose' | 'error' | 'warning' | 'info';
-        },
-    ) => void,
-) => {
-    ipcRenderer.send('logger', cb);
-};
 
 export const utils = {
     isLinux,
     isMacOS,
     isWindows,
-    logger,
-    mainMessageListener,
-    onRestoreQueue,
-    onSaveQueue,
-    playerErrorListener,
-    restoreQueue,
-    saveQueue,
 };
 
 export type Utils = typeof utils;

src/main/utils.ts

@@ -2,7 +2,6 @@
 import path from 'path';
 import process from 'process';
 import { URL } from 'url';
-import log from 'electron-log/main';
 
 export let resolveHtmlPath: (htmlFileName: string) => string;
 
@@ -51,46 +50,3 @@ export const hotkeyToElectronAccelerator = (hotkey: string) => {
 
     return accelerator;
 };
-
-const logMethod = {
-    debug: log.debug,
-    error: log.error,
-    info: log.info,
-    success: log.info,
-    verbose: log.verbose,
-    warning: log.warn,
-};
-
-const logColor = {
-    debug: 'blue',
-    error: 'red',
-    info: 'blue',
-    success: 'green',
-    verbose: 'blue',
-    warning: 'yellow',
-};
-
-export const createLog = (data: {
-    message: string;
-    type: 'debug' | 'verbose' | 'success' | 'error' | 'warning' | 'info';
-}) => {
-    logMethod[data.type](`%c${data.message}`, `color: ${logColor[data.type]}`);
-};
-
-export const autoUpdaterLogInterface = {
-    debug: (message: string) => {
-        createLog({ message: `[SYSTEM] ${message}`, type: 'debug' });
-    },
-
-    error: (message: string) => {
-        createLog({ message: `[SYSTEM] ${message}`, type: 'error' });
-    },
-
-    info: (message: string) => {
-        createLog({ message: `[SYSTEM] ${message}`, type: 'info' });
-    },
-
-    warn: (message: string) => {
-        createLog({ message: `[SYSTEM] ${message}`, type: 'warning' });
-    },
-};

src/renderer/api/controller.ts

@@ -1,109 +1,38 @@
-import { useAuthStore } from '/@/renderer/store';
-import { toast } from '/@/renderer/components/toast/index';
+import { RandomSongListArgs } from './types';
+import i18n from '/@/i18n/i18n';
+import { JellyfinController } from '/@/renderer/api/jellyfin/jellyfin-controller';
+import { NavidromeController } from '/@/renderer/api/navidrome/navidrome-controller';
+import { SubsonicController } from '/@/renderer/api/subsonic/subsonic-controller';
 import type {
-    AlbumDetailArgs,
-    AlbumListArgs,
-    SongListArgs,
-    SongDetailArgs,
+    AddToPlaylistArgs,
     AlbumArtistDetailArgs,
     AlbumArtistListArgs,
-    SetRatingArgs,
-    GenreListArgs,
+    AlbumDetailArgs,
+    AlbumListArgs,
+    ArtistListArgs,
+    ControllerEndpoint,
     CreatePlaylistArgs,
     DeletePlaylistArgs,
+    FavoriteArgs,
+    GenreListArgs,
+    LyricsArgs,
+    MusicFolderListArgs,
     PlaylistDetailArgs,
     PlaylistListArgs,
-    MusicFolderListArgs,
     PlaylistSongListArgs,
-    ArtistListArgs,
+    RemoveFromPlaylistArgs,
+    ScrobbleArgs,
+    SearchArgs,
+    SetRatingArgs,
+    SongDetailArgs,
+    SongListArgs,
+    TopSongListArgs,
     UpdatePlaylistArgs,
     UserListArgs,
-    FavoriteArgs,
-    TopSongListArgs,
-    AddToPlaylistArgs,
-    AddToPlaylistResponse,
-    RemoveFromPlaylistArgs,
-    RemoveFromPlaylistResponse,
-    ScrobbleArgs,
-    ScrobbleResponse,
-    AlbumArtistDetailResponse,
-    FavoriteResponse,
-    CreatePlaylistResponse,
-    AlbumArtistListResponse,
-    AlbumDetailResponse,
-    AlbumListResponse,
-    ArtistListResponse,
-    GenreListResponse,
-    MusicFolderListResponse,
-    PlaylistDetailResponse,
-    PlaylistListResponse,
-    RatingResponse,
-    SongDetailResponse,
-    SongListResponse,
-    TopSongListResponse,
-    UpdatePlaylistResponse,
-    UserListResponse,
-    AuthenticationResponse,
-    SearchArgs,
-    SearchResponse,
-    LyricsArgs,
-    LyricsResponse,
-    ServerInfo,
-    ServerInfoArgs,
-    StructuredLyricsArgs,
-    StructuredLyric,
-    SimilarSongsArgs,
-    Song,
-    ServerType,
 } from '/@/renderer/api/types';
-import { DeletePlaylistResponse, RandomSongListArgs } from './types';
-import { ndController } from '/@/renderer/api/navidrome/navidrome-controller';
-import { ssController } from '/@/renderer/api/subsonic/subsonic-controller';
-import { jfController } from '/@/renderer/api/jellyfin/jellyfin-controller';
-import i18n from '/@/i18n/i18n';
-
-export type ControllerEndpoint = Partial<{
-    addToPlaylist: (args: AddToPlaylistArgs) => Promise<AddToPlaylistResponse>;
-    authenticate: (
-        url: string,
-        body: { password: string; username: string },
-    ) => Promise<AuthenticationResponse>;
-    clearPlaylist: () => void;
-    createFavorite: (args: FavoriteArgs) => Promise<FavoriteResponse>;
-    createPlaylist: (args: CreatePlaylistArgs) => Promise<CreatePlaylistResponse>;
-    deleteFavorite: (args: FavoriteArgs) => Promise<FavoriteResponse>;
-    deletePlaylist: (args: DeletePlaylistArgs) => Promise<DeletePlaylistResponse>;
-    getAlbumArtistDetail: (args: AlbumArtistDetailArgs) => Promise<AlbumArtistDetailResponse>;
-    getAlbumArtistList: (args: AlbumArtistListArgs) => Promise<AlbumArtistListResponse>;
-    getAlbumDetail: (args: AlbumDetailArgs) => Promise<AlbumDetailResponse>;
-    getAlbumList: (args: AlbumListArgs) => Promise<AlbumListResponse>;
-    getArtistDetail: () => void;
-    getArtistInfo: (args: any) => void;
-    getArtistList: (args: ArtistListArgs) => Promise<ArtistListResponse>;
-    getFavoritesList: () => void;
-    getFolderItemList: () => void;
-    getFolderList: () => void;
-    getFolderSongs: () => void;
-    getGenreList: (args: GenreListArgs) => Promise<GenreListResponse>;
-    getLyrics: (args: LyricsArgs) => Promise<LyricsResponse>;
-    getMusicFolderList: (args: MusicFolderListArgs) => Promise<MusicFolderListResponse>;
-    getPlaylistDetail: (args: PlaylistDetailArgs) => Promise<PlaylistDetailResponse>;
-    getPlaylistList: (args: PlaylistListArgs) => Promise<PlaylistListResponse>;
-    getPlaylistSongList: (args: PlaylistSongListArgs) => Promise<SongListResponse>;
-    getRandomSongList: (args: RandomSongListArgs) => Promise<SongListResponse>;
-    getServerInfo: (args: ServerInfoArgs) => Promise<ServerInfo>;
-    getSimilarSongs: (args: SimilarSongsArgs) => Promise<Song[]>;
-    getSongDetail: (args: SongDetailArgs) => Promise<SongDetailResponse>;
-    getSongList: (args: SongListArgs) => Promise<SongListResponse>;
-    getStructuredLyrics: (args: StructuredLyricsArgs) => Promise<StructuredLyric[]>;
-    getTopSongs: (args: TopSongListArgs) => Promise<TopSongListResponse>;
-    getUserList: (args: UserListArgs) => Promise<UserListResponse>;
-    removeFromPlaylist: (args: RemoveFromPlaylistArgs) => Promise<RemoveFromPlaylistResponse>;
-    scrobble: (args: ScrobbleArgs) => Promise<ScrobbleResponse>;
-    search: (args: SearchArgs) => Promise<SearchResponse>;
-    setRating: (args: SetRatingArgs) => Promise<RatingResponse>;
-    updatePlaylist: (args: UpdatePlaylistArgs) => Promise<UpdatePlaylistResponse>;
-}>;
+import { toast } from '/@/renderer/components/toast/index';
+import { useAuthStore } from '/@/renderer/store';
+import { ServerType } from '/@/renderer/types';
 
 type ApiController = {
     jellyfin: ControllerEndpoint;
@@ -112,119 +41,9 @@ type ApiController = {
 };
 
 const endpoints: ApiController = {
-    jellyfin: {
-        addToPlaylist: jfController.addToPlaylist,
-        authenticate: jfController.authenticate,
-        clearPlaylist: undefined,
-        createFavorite: jfController.createFavorite,
-        createPlaylist: jfController.createPlaylist,
-        deleteFavorite: jfController.deleteFavorite,
-        deletePlaylist: jfController.deletePlaylist,
-        getAlbumArtistDetail: jfController.getAlbumArtistDetail,
-        getAlbumArtistList: jfController.getAlbumArtistList,
-        getAlbumDetail: jfController.getAlbumDetail,
-        getAlbumList: jfController.getAlbumList,
-        getArtistDetail: undefined,
-        getArtistInfo: undefined,
-        getArtistList: undefined,
-        getFavoritesList: undefined,
-        getFolderItemList: undefined,
-        getFolderList: undefined,
-        getFolderSongs: undefined,
-        getGenreList: jfController.getGenreList,
-        getLyrics: jfController.getLyrics,
-        getMusicFolderList: jfController.getMusicFolderList,
-        getPlaylistDetail: jfController.getPlaylistDetail,
-        getPlaylistList: jfController.getPlaylistList,
-        getPlaylistSongList: jfController.getPlaylistSongList,
-        getRandomSongList: jfController.getRandomSongList,
-        getServerInfo: jfController.getServerInfo,
-        getSimilarSongs: jfController.getSimilarSongs,
-        getSongDetail: jfController.getSongDetail,
-        getSongList: jfController.getSongList,
-        getStructuredLyrics: undefined,
-        getTopSongs: jfController.getTopSongList,
-        getUserList: undefined,
-        removeFromPlaylist: jfController.removeFromPlaylist,
-        scrobble: jfController.scrobble,
-        search: jfController.search,
-        setRating: undefined,
-        updatePlaylist: jfController.updatePlaylist,
-    },
-    navidrome: {
-        addToPlaylist: ndController.addToPlaylist,
-        authenticate: ndController.authenticate,
-        clearPlaylist: undefined,
-        createFavorite: ssController.createFavorite,
-        createPlaylist: ndController.createPlaylist,
-        deleteFavorite: ssController.removeFavorite,
-        deletePlaylist: ndController.deletePlaylist,
-        getAlbumArtistDetail: ndController.getAlbumArtistDetail,
-        getAlbumArtistList: ndController.getAlbumArtistList,
-        getAlbumDetail: ndController.getAlbumDetail,
-        getAlbumList: ndController.getAlbumList,
-        getArtistDetail: undefined,
-        getArtistInfo: undefined,
-        getArtistList: undefined,
-        getFavoritesList: undefined,
-        getFolderItemList: undefined,
-        getFolderList: undefined,
-        getFolderSongs: undefined,
-        getGenreList: ndController.getGenreList,
-        getLyrics: undefined,
-        getMusicFolderList: ssController.getMusicFolderList,
-        getPlaylistDetail: ndController.getPlaylistDetail,
-        getPlaylistList: ndController.getPlaylistList,
-        getPlaylistSongList: ndController.getPlaylistSongList,
-        getRandomSongList: ssController.getRandomSongList,
-        getServerInfo: ndController.getServerInfo,
-        getSimilarSongs: ssController.getSimilarSongs,
-        getSongDetail: ndController.getSongDetail,
-        getSongList: ndController.getSongList,
-        getStructuredLyrics: ssController.getStructuredLyrics,
-        getTopSongs: ssController.getTopSongList,
-        getUserList: ndController.getUserList,
-        removeFromPlaylist: ndController.removeFromPlaylist,
-        scrobble: ssController.scrobble,
-        search: ssController.search3,
-        setRating: ssController.setRating,
-        updatePlaylist: ndController.updatePlaylist,
-    },
-    subsonic: {
-        authenticate: ssController.authenticate,
-        clearPlaylist: undefined,
-        createFavorite: ssController.createFavorite,
-        createPlaylist: undefined,
-        deleteFavorite: ssController.removeFavorite,
-        deletePlaylist: undefined,
-        getAlbumArtistDetail: undefined,
-        getAlbumArtistList: undefined,
-        getAlbumDetail: undefined,
-        getAlbumList: undefined,
-        getArtistDetail: undefined,
-        getArtistInfo: undefined,
-        getArtistList: undefined,
-        getFavoritesList: undefined,
-        getFolderItemList: undefined,
-        getFolderList: undefined,
-        getFolderSongs: undefined,
-        getGenreList: undefined,
-        getLyrics: undefined,
-        getMusicFolderList: ssController.getMusicFolderList,
-        getPlaylistDetail: undefined,
-        getPlaylistList: undefined,
-        getServerInfo: ssController.getServerInfo,
-        getSimilarSongs: ssController.getSimilarSongs,
-        getSongDetail: undefined,
-        getSongList: undefined,
-        getStructuredLyrics: ssController.getStructuredLyrics,
-        getTopSongs: ssController.getTopSongList,
-        getUserList: undefined,
-        scrobble: ssController.scrobble,
-        search: ssController.search3,
-        setRating: undefined,
-        updatePlaylist: undefined,
-    },
+    jellyfin: JellyfinController,
+    navidrome: NavidromeController,
+    subsonic: SubsonicController,
 };
 
 const apiController = (endpoint: keyof ControllerEndpoint, type?: ServerType) => {
@@ -277,6 +96,15 @@ const getAlbumList = async (args: AlbumListArgs) => {
     )?.(args);
 };
 
+const getAlbumListCount = async (args: AlbumListArgs) => {
+    return (
+        apiController(
+            'getAlbumListCount',
+            args.apiClientProps.server?.type,
+        ) as ControllerEndpoint['getAlbumListCount']
+    )?.(args);
+};
+
 const getAlbumDetail = async (args: AlbumDetailArgs) => {
     return (
         apiController(
@@ -295,6 +123,15 @@ const getSongList = async (args: SongListArgs) => {
     )?.(args);
 };
 
+const getSongListCount = async (args: SongListArgs) => {
+    return (
+        apiController(
+            'getSongListCount',
+            args.apiClientProps.server?.type,
+        ) as ControllerEndpoint['getSongListCount']
+    )?.(args);
+};
+
 const getSongDetail = async (args: SongDetailArgs) => {
     return (
         apiController(
@@ -340,6 +177,15 @@ const getAlbumArtistList = async (args: AlbumArtistListArgs) => {
     )?.(args);
 };
 
+const getAlbumArtistListCount = async (args: AlbumArtistListArgs) => {
+    return (
+        apiController(
+            'getAlbumArtistListCount',
+            args.apiClientProps.server?.type,
+        ) as ControllerEndpoint['getAlbumArtistListCount']
+    )?.(args);
+};
+
 const getArtistList = async (args: ArtistListArgs) => {
     return (
         apiController(
@@ -358,6 +204,15 @@ const getPlaylistList = async (args: PlaylistListArgs) => {
     )?.(args);
 };
 
+const getPlaylistListCount = async (args: PlaylistListArgs) => {
+    return (
+        apiController(
+            'getPlaylistListCount',
+            args.apiClientProps.server?.type,
+        ) as ControllerEndpoint['getPlaylistListCount']
+    )?.(args);
+};
+
 const createPlaylist = async (args: CreatePlaylistArgs) => {
     return (
         apiController(
@@ -499,33 +354,6 @@ const getLyrics = async (args: LyricsArgs) => {
     )?.(args);
 };
 
-const getServerInfo = async (args: ServerInfoArgs) => {
-    return (
-        apiController(
-            'getServerInfo',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getServerInfo']
-    )?.(args);
-};
-
-const getStructuredLyrics = async (args: StructuredLyricsArgs) => {
-    return (
-        apiController(
-            'getStructuredLyrics',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getStructuredLyrics']
-    )?.(args);
-};
-
-const getSimilarSongs = async (args: SimilarSongsArgs) => {
-    return (
-        apiController(
-            'getSimilarSongs',
-            args.apiClientProps.server?.type,
-        ) as ControllerEndpoint['getSimilarSongs']
-    )?.(args);
-};
-
 export const controller = {
     addToPlaylist,
     authenticate,
@@ -535,21 +363,22 @@ export const controller = {
     deletePlaylist,
     getAlbumArtistDetail,
     getAlbumArtistList,
+    getAlbumArtistListCount,
     getAlbumDetail,
     getAlbumList,
+    getAlbumListCount,
     getArtistList,
     getGenreList,
     getLyrics,
     getMusicFolderList,
     getPlaylistDetail,
     getPlaylistList,
+    getPlaylistListCount,
     getPlaylistSongList,
     getRandomSongList,
-    getServerInfo,
-    getSimilarSongs,
     getSongDetail,
     getSongList,
-    getStructuredLyrics,
+    getSongListCount,
     getTopSongList,
     getUserList,
     removeFromPlaylist,

src/renderer/api/features-types.ts

@@ -1,9 +0,0 @@
-// Should follow a strict naming convention: "<FEATURE GROUP>_<FEATURE NAME>"
-// For example: <FEATURE GROUP>: "Playlists", <FEATURE NAME>: "Smart" = "PLAYLISTS_SMART"
-export enum ServerFeature {
-    LYRICS_MULTIPLE_STRUCTURED = 'lyricsMultipleStructured',
-    LYRICS_SINGLE_STRUCTURED = 'lyricsSingleStructured',
-    PLAYLISTS_SMART = 'playlistsSmart',
-}
-
-export type ServerFeatures = Partial<Record<ServerFeature, boolean>>;

src/renderer/api/jellyfin/jellyfin-api.ts

@@ -3,7 +3,7 @@ import { jfType } from '/@/renderer/api/jellyfin/jellyfin-types';
 import { initClient, initContract } from '@ts-rest/core';
 import axios, { AxiosError, AxiosResponse, isAxiosError, Method } from 'axios';
 import qs from 'qs';
-import { ServerListItem } from '/@/renderer/api/types';
+import { ServerListItem } from '/@/renderer/types';
 import omitBy from 'lodash/omitBy';
 import { z } from 'zod';
 import { authenticationFailure } from '/@/renderer/api/utils';
@@ -150,14 +150,6 @@ export const contract = c.router({
             400: jfType._response.error,
         },
     },
-    getServerInfo: {
-        method: 'GET',
-        path: 'system/info',
-        responses: {
-            200: jfType._response.serverInfo,
-            400: jfType._response.error,
-        },
-    },
     getSimilarArtistList: {
         method: 'GET',
         path: 'artists/:id/similar',
@@ -167,15 +159,6 @@ export const contract = c.router({
             400: jfType._response.error,
         },
     },
-    getSimilarSongs: {
-        method: 'GET',
-        path: 'items/:itemId/similar',
-        query: jfType._parameters.similarSongs,
-        responses: {
-            200: jfType._response.similarSongs,
-            400: jfType._response.error,
-        },
-    },
     getSongDetail: {
         method: 'GET',
         path: 'users/:userId/items/:id',

src/renderer/api/jellyfin/jellyfin-controller.ts

@@ -1,67 +1,64 @@
+import isElectron from 'is-electron';
+import { z } from 'zod';
+import packageJson from '../../../../package.json';
+import { jfNormalize } from './jellyfin-normalize';
+import { JFSongListSort, JFSortOrder } from '/@/renderer/api/jellyfin.types';
+import { jfApiClient } from '/@/renderer/api/jellyfin/jellyfin-api';
+import { jfType } from '/@/renderer/api/jellyfin/jellyfin-types';
 import {
-    AuthenticationResponse,
-    MusicFolderListArgs,
-    MusicFolderListResponse,
-    GenreListArgs,
-    AlbumArtistDetailArgs,
-    AlbumArtistListArgs,
-    albumArtistListSortMap,
-    sortOrderMap,
-    ArtistListArgs,
-    artistListSortMap,
-    AlbumDetailArgs,
-    AlbumListArgs,
-    albumListSortMap,
-    TopSongListArgs,
-    SongListArgs,
-    songListSortMap,
     AddToPlaylistArgs,
-    RemoveFromPlaylistArgs,
-    PlaylistDetailArgs,
-    PlaylistSongListArgs,
-    PlaylistListArgs,
-    playlistListSortMap,
+    AddToPlaylistResponse,
+    AlbumArtistDetailArgs,
+    AlbumArtistDetailResponse,
+    AlbumArtistListArgs,
+    AlbumArtistListResponse,
+    AlbumDetailArgs,
+    AlbumDetailResponse,
+    AlbumListArgs,
+    AlbumListResponse,
+    AuthenticationResponse,
+    ControllerEndpoint,
     CreatePlaylistArgs,
     CreatePlaylistResponse,
-    UpdatePlaylistArgs,
-    UpdatePlaylistResponse,
     DeletePlaylistArgs,
     FavoriteArgs,
     FavoriteResponse,
-    ScrobbleArgs,
-    ScrobbleResponse,
+    GenreListArgs,
     GenreListResponse,
-    AlbumArtistDetailResponse,
-    AlbumArtistListResponse,
-    AlbumDetailResponse,
-    AlbumListResponse,
-    SongListResponse,
-    AddToPlaylistResponse,
-    RemoveFromPlaylistResponse,
-    PlaylistDetailResponse,
-    PlaylistListResponse,
-    SearchArgs,
-    SearchResponse,
-    RandomSongListResponse,
-    RandomSongListArgs,
     LyricsArgs,
     LyricsResponse,
-    genreListSortMap,
+    MusicFolderListArgs,
+    MusicFolderListResponse,
+    PlaylistDetailArgs,
+    PlaylistDetailResponse,
+    PlaylistListArgs,
+    PlaylistListResponse,
+    PlaylistSongListArgs,
+    RandomSongListArgs,
+    RandomSongListResponse,
+    RemoveFromPlaylistArgs,
+    RemoveFromPlaylistResponse,
+    ScrobbleArgs,
+    ScrobbleResponse,
+    SearchArgs,
+    SearchResponse,
     SongDetailArgs,
     SongDetailResponse,
-    ServerInfo,
-    ServerInfoArgs,
-    SimilarSongsArgs,
-    Song,
+    SongListArgs,
+    SongListResponse,
+    SongListSort,
+    SortOrder,
+    TopSongListArgs,
+    UpdatePlaylistArgs,
+    UpdatePlaylistResponse,
+    albumArtistListSortMap,
+    albumListSortMap,
+    genreListSortMap,
+    playlistListSortMap,
+    songListSortMap,
+    sortOrderMap,
 } from '/@/renderer/api/types';
-import { jfApiClient } from '/@/renderer/api/jellyfin/jellyfin-api';
-import { jfNormalize } from './jellyfin-normalize';
-import { jfType } from '/@/renderer/api/jellyfin/jellyfin-types';
-import packageJson from '../../../../package.json';
-import { z } from 'zod';
-import { JFSongListSort, JFSortOrder } from '/@/renderer/api/jellyfin.types';
-import isElectron from 'is-electron';
-import { ServerFeatures } from '/@/renderer/api/features-types';
+import { sortSongList } from '/@/renderer/api/utils';
 
 const formatCommaDelimitedString = (value: string[]) => {
     return value.join(',');
@@ -107,9 +104,9 @@ const authenticate = async (
             Username: body.username,
         },
         headers: {
-            'x-emby-authorization': `MediaBrowser Client="Feishin", Device="${getHostname()}", DeviceId="Feishin-${getHostname()}-${encodeURIComponent(
-                body.username,
-            )}", Version="${packageJson.version}"`,
+            'x-emby-authorization': `MediaBrowser Client="Feishin", Device="${getHostname()}", DeviceId="Feishin-${getHostname()}-${
+                body.username
+            }", Version="${packageJson.version}"`,
         },
     });
 
@@ -249,31 +246,56 @@ const getAlbumArtistList = async (args: AlbumArtistListArgs): Promise<AlbumArtis
     };
 };
 
-const getArtistList = async (args: ArtistListArgs): Promise<AlbumArtistListResponse> => {
+const getAlbumArtistListCount = async (args: AlbumArtistListArgs): Promise<number> => {
     const { query, apiClientProps } = args;
 
     const res = await jfApiClient(apiClientProps).getAlbumArtistList({
         query: {
-            Limit: query.limit,
+            Fields: 'Genres, DateCreated, ExternalUrls, Overview',
+            ImageTypeLimit: 1,
+            Limit: 1,
             ParentId: query.musicFolderId,
             Recursive: true,
-            SortBy: artistListSortMap.jellyfin[query.sortBy] || 'Name,SortName',
+            SearchTerm: query.searchTerm,
+            SortBy: albumArtistListSortMap.jellyfin[query.sortBy] || 'Name,SortName',
             SortOrder: sortOrderMap.jellyfin[query.sortOrder],
-            StartIndex: query.startIndex,
+            StartIndex: 0,
+            UserId: apiClientProps.server?.userId || undefined,
         },
     });
 
     if (res.status !== 200) {
-        throw new Error('Failed to get artist list');
+        throw new Error('Failed to get album artist list count');
     }
 
-    return {
-        items: res.body.Items.map((item) => jfNormalize.albumArtist(item, apiClientProps.server)),
-        startIndex: query.startIndex,
-        totalRecordCount: res.body.TotalRecordCount,
-    };
+    return res.body.TotalRecordCount;
 };
 
+// const getArtistList = async (args: ArtistListArgs): Promise<ArtistListResponse> => {
+//     const { query, apiClientProps } = args;
+
+//     const res = await jfApiClient(apiClientProps).getAlbumArtistList({
+//         query: {
+//             Limit: query.limit,
+//             ParentId: query.musicFolderId,
+//             Recursive: true,
+//             SortBy: artistListSortMap.jellyfin[query.sortBy] || 'Name,SortName',
+//             SortOrder: sortOrderMap.jellyfin[query.sortOrder],
+//             StartIndex: query.startIndex,
+//         },
+//     });
+
+//     if (res.status !== 200) {
+//         throw new Error('Failed to get artist list');
+//     }
+
+//     return {
+//         items: res.body.Items.map((item) => jfNormalize.albumArtist(item, apiClientProps.server)),
+//         startIndex: query.startIndex,
+//         totalRecordCount: res.body.TotalRecordCount,
+//     };
+// };
+
 const getAlbumDetail = async (args: AlbumDetailArgs): Promise<AlbumDetailResponse> => {
     const { query, apiClientProps } = args;
 
@@ -338,6 +360,7 @@ const getAlbumList = async (args: AlbumListArgs): Promise<AlbumListResponse> =>
             AlbumArtistIds: query.artistIds
                 ? formatCommaDelimitedString(query.artistIds)
                 : undefined,
+            ContributingArtistIds: query.isCompilation ? query.artistIds?.[0] : undefined,
             IncludeItemTypes: 'MusicAlbum',
             Limit: query.limit,
             ParentId: query.musicFolderId,
@@ -362,6 +385,55 @@ const getAlbumList = async (args: AlbumListArgs): Promise<AlbumListResponse> =>
     };
 };
 
+const getAlbumListCount = async (args: AlbumListArgs): Promise<number> => {
+    const { query, apiClientProps } = args;
+
+    if (!apiClientProps.server?.userId) {
+        throw new Error('No userId found');
+    }
+
+    const yearsGroup = [];
+    if (query._custom?.jellyfin?.minYear && query._custom?.jellyfin?.maxYear) {
+        for (
+            let i = Number(query._custom?.jellyfin?.minYear);
+            i <= Number(query._custom?.jellyfin?.maxYear);
+            i += 1
+        ) {
+            yearsGroup.push(String(i));
+        }
+    }
+
+    const yearsFilter = yearsGroup.length ? yearsGroup.join(',') : undefined;
+
+    const res = await jfApiClient(apiClientProps).getAlbumList({
+        params: {
+            userId: apiClientProps.server?.userId,
+        },
+        query: {
+            AlbumArtistIds: query.artistIds
+                ? formatCommaDelimitedString(query.artistIds)
+                : undefined,
+            ContributingArtistIds: query.isCompilation ? query.artistIds?.[0] : undefined,
+            IncludeItemTypes: 'MusicAlbum',
+            Limit: 1,
+            ParentId: query.musicFolderId,
+            Recursive: true,
+            SearchTerm: query.searchTerm,
+            SortBy: albumListSortMap.jellyfin[query.sortBy] || 'SortName',
+            SortOrder: sortOrderMap.jellyfin[query.sortOrder],
+            StartIndex: 0,
+            ...query._custom?.jellyfin,
+            Years: yearsFilter,
+        },
+    });
+
+    if (res.status !== 200) {
+        throw new Error('Failed to get album list count');
+    }
+
+    return res.body.TotalRecordCount;
+};
+
 const getTopSongList = async (args: TopSongListArgs): Promise<SongListResponse> => {
     const { apiClientProps, query } = args;
 
@@ -379,7 +451,7 @@ const getTopSongList = async (args: TopSongListArgs): Promise<SongListResponse>
             IncludeItemTypes: 'Audio',
             Limit: query.limit,
             Recursive: true,
-            SortBy: 'PlayCount,SortName',
+            SortBy: 'CommunityRating,SortName',
             SortOrder: 'Descending',
             UserId: apiClientProps.server?.userId,
         },
@@ -389,8 +461,11 @@ const getTopSongList = async (args: TopSongListArgs): Promise<SongListResponse>
         throw new Error('Failed to get top song list');
     }
 
+    const songs = res.body.Items.map((item) => jfNormalize.song(item, apiClientProps.server, ''));
+    const songsByPlayCount = sortSongList(songs, SongListSort.PLAY_COUNT, SortOrder.DESC);
+
     return {
-        items: res.body.Items.map((item) => jfNormalize.song(item, apiClientProps.server, '')),
+        items: songsByPlayCount,
         startIndex: 0,
         totalRecordCount: res.body.TotalRecordCount,
     };
@@ -454,6 +529,58 @@ const getSongList = async (args: SongListArgs): Promise<SongListResponse> => {
     };
 };
 
+const getSongListCount = async (args: SongListArgs): Promise<number> => {
+    const { query, apiClientProps } = args;
+
+    if (!apiClientProps.server?.userId) {
+        throw new Error('No userId found');
+    }
+
+    const yearsGroup = [];
+    if (query._custom?.jellyfin?.minYear && query._custom?.jellyfin?.maxYear) {
+        for (
+            let i = Number(query._custom?.jellyfin?.minYear);
+            i <= Number(query._custom?.jellyfin?.maxYear);
+            i += 1
+        ) {
+            yearsGroup.push(String(i));
+        }
+    }
+
+    const yearsFilter = yearsGroup.length ? formatCommaDelimitedString(yearsGroup) : undefined;
+    const albumIdsFilter = query.albumIds ? formatCommaDelimitedString(query.albumIds) : undefined;
+    const artistIdsFilter = query.artistIds
+        ? formatCommaDelimitedString(query.artistIds)
+        : undefined;
+
+    const res = await jfApiClient(apiClientProps).getSongList({
+        params: {
+            userId: apiClientProps.server?.userId,
+        },
+        query: {
+            AlbumIds: albumIdsFilter,
+            ArtistIds: artistIdsFilter,
+            Fields: 'Genres, DateCreated, MediaSources, ParentId',
+            IncludeItemTypes: 'Audio',
+            Limit: 1,
+            ParentId: query.musicFolderId,
+            Recursive: true,
+            SearchTerm: query.searchTerm,
+            SortBy: songListSortMap.jellyfin[query.sortBy] || 'Album,SortName',
+            SortOrder: sortOrderMap.jellyfin[query.sortOrder],
+            StartIndex: 0,
+            ...query._custom?.jellyfin,
+            Years: yearsFilter,
+        },
+    });
+
+    if (res.status !== 200) {
+        throw new Error('Failed to get song list count');
+    }
+
+    return res.body.TotalRecordCount;
+};
+
 const addToPlaylist = async (args: AddToPlaylistArgs): Promise<AddToPlaylistResponse> => {
     const { query, body, apiClientProps } = args;
 
@@ -540,10 +667,9 @@ const getPlaylistSongList = async (args: PlaylistSongListArgs): Promise<SongList
         query: {
             Fields: 'Genres, DateCreated, MediaSources, UserData, ParentId',
             IncludeItemTypes: 'Audio',
-            Limit: query.limit,
             SortBy: query.sortBy ? songListSortMap.jellyfin[query.sortBy] : undefined,
             SortOrder: query.sortOrder ? sortOrderMap.jellyfin[query.sortOrder] : undefined,
-            StartIndex: query.startIndex,
+            StartIndex: 0,
             UserId: apiClientProps.server?.userId,
         },
     });
@@ -554,7 +680,7 @@ const getPlaylistSongList = async (args: PlaylistSongListArgs): Promise<SongList
 
     return {
         items: res.body.Items.map((item) => jfNormalize.song(item, apiClientProps.server, '')),
-        startIndex: query.startIndex,
+        startIndex: 0,
         totalRecordCount: res.body.TotalRecordCount,
     };
 };
@@ -594,6 +720,37 @@ const getPlaylistList = async (args: PlaylistListArgs): Promise<PlaylistListResp
     };
 };
 
+const getPlaylistListCount = async (args: PlaylistListArgs): Promise<number> => {
+    const { query, apiClientProps } = args;
+
+    if (!apiClientProps.server?.userId) {
+        throw new Error('No userId found');
+    }
+
+    const res = await jfApiClient(apiClientProps).getPlaylistList({
+        params: {
+            userId: apiClientProps.server?.userId,
+        },
+        query: {
+            Fields: 'ChildCount, Genres, DateCreated, ParentId, Overview',
+            IncludeItemTypes: 'Playlist',
+            Limit: 1,
+            MediaTypes: 'Audio',
+            Recursive: true,
+            SearchTerm: query.searchTerm,
+            SortBy: playlistListSortMap.jellyfin[query.sortBy],
+            SortOrder: sortOrderMap.jellyfin[query.sortOrder],
+            StartIndex: 0,
+        },
+    });
+
+    if (res.status !== 200) {
+        throw new Error('Failed to get playlist list count');
+    }
+
+    return res.body.TotalRecordCount;
+};
+
 const createPlaylist = async (args: CreatePlaylistArgs): Promise<CreatePlaylistResponse> => {
     const { body, apiClientProps } = args;
 
@@ -951,54 +1108,7 @@ const getSongDetail = async (args: SongDetailArgs): Promise<SongDetailResponse>
     return jfNormalize.song(res.body, apiClientProps.server, '');
 };
 
-const getServerInfo = async (args: ServerInfoArgs): Promise<ServerInfo> => {
-    const { apiClientProps } = args;
-
-    const res = await jfApiClient(apiClientProps).getServerInfo();
-
-    if (res.status !== 200) {
-        throw new Error('Failed to get server info');
-    }
-
-    const features: ServerFeatures = {
-        lyricsSingleStructured: true,
-    };
-
-    return {
-        features,
-        id: apiClientProps.server?.id,
-        version: res.body.Version,
-    };
-};
-
-const getSimilarSongs = async (args: SimilarSongsArgs): Promise<Song[]> => {
-    const { apiClientProps, query } = args;
-
-    const res = await jfApiClient(apiClientProps).getSimilarSongs({
-        params: {
-            itemId: query.songId,
-        },
-        query: {
-            Fields: 'Genres, DateCreated, MediaSources, ParentId',
-            Limit: query.count,
-            UserId: apiClientProps.server?.userId || undefined,
-        },
-    });
-
-    if (res.status !== 200) {
-        throw new Error('Failed to get similar songs');
-    }
-
-    return res.body.Items.reduce<Song[]>((acc, song) => {
-        if (song.Id !== query.songId) {
-            acc.push(jfNormalize.song(song, apiClientProps.server, ''));
-        }
-
-        return acc;
-    }, []);
-};
-
-export const jfController = {
+export const JellyfinController: ControllerEndpoint = {
     addToPlaylist,
     authenticate,
     createFavorite,
@@ -1007,21 +1117,22 @@ export const jfController = {
     deletePlaylist,
     getAlbumArtistDetail,
     getAlbumArtistList,
+    getAlbumArtistListCount,
     getAlbumDetail,
     getAlbumList,
-    getArtistList,
+    getAlbumListCount,
     getGenreList,
     getLyrics,
     getMusicFolderList,
     getPlaylistDetail,
     getPlaylistList,
+    getPlaylistListCount,
     getPlaylistSongList,
     getRandomSongList,
-    getServerInfo,
-    getSimilarSongs,
     getSongDetail,
     getSongList,
-    getTopSongList,
+    getSongListCount,
+    getTopSongs: getTopSongList,
     removeFromPlaylist,
     scrobble,
     search,

src/renderer/api/jellyfin/jellyfin-normalize.ts

@@ -10,9 +10,8 @@ import {
     Playlist,
     MusicFolder,
     Genre,
-    ServerListItem,
-    ServerType,
 } from '/@/renderer/api/types';
+import { ServerListItem, ServerType } from '/@/renderer/types';
 
 const getStreamUrl = (args: {
     container?: string;
@@ -203,7 +202,6 @@ const normalizeAlbum = (
     imageSize?: number,
 ): Album => {
     return {
-        albumArtist: item.AlbumArtist,
         albumArtists:
             item.AlbumArtists.map((entry) => ({
                 id: entry.Id,
@@ -216,7 +214,6 @@ const normalizeAlbum = (
             name: entry.Name,
         })),
         backdropImageUrl: null,
-        comment: null,
         createdAt: item.DateCreated,
         duration: item.RunTimeTicks / 10000,
         genres: item.GenreItems?.map((entry) => ({
@@ -235,7 +232,6 @@ const normalizeAlbum = (
         isCompilation: null,
         itemType: LibraryItem.ALBUM,
         lastPlayedAt: null,
-        mbzId: item.ProviderIds?.MusicBrainzAlbum || null,
         name: item.Name,
         playCount: item.UserData?.PlayCount || 0,
         releaseDate: item.PremiereDate?.split('T')[0] || null,
@@ -291,7 +287,6 @@ const normalizeAlbumArtist = (
         }),
         itemType: LibraryItem.ALBUM_ARTIST,
         lastPlayedAt: null,
-        mbz: item.ProviderIds?.MusicBrainzArtist || null,
         name: item.Name,
         playCount: item.UserData?.PlayCount || 0,
         serverId: server?.id || '',

src/renderer/api/jellyfin/jellyfin-types.ts

@@ -422,11 +422,6 @@ const song = z.object({
     UserData: userData.optional(),
 });
 
-const providerIds = z.object({
-    MusicBrainzAlbum: z.string().optional(),
-    MusicBrainzArtist: z.string().optional(),
-});
-
 const albumArtist = z.object({
     BackdropImageTags: z.array(z.string()),
     ChannelId: z.null(),
@@ -440,7 +435,6 @@ const albumArtist = z.object({
     LocationType: z.string(),
     Name: z.string(),
     Overview: z.string(),
-    ProviderIds: providerIds.optional(),
     RunTimeTicks: z.number(),
     ServerId: z.string(),
     Type: z.string(),
@@ -472,7 +466,6 @@ const album = z.object({
     ParentLogoItemId: z.string(),
     PremiereDate: z.string().optional(),
     ProductionYear: z.number(),
-    ProviderIds: providerIds.optional(),
     RunTimeTicks: z.number(),
     ServerId: z.string(),
     Songs: z.array(song).optional(), // This is not a native Jellyfin property -- this is used for combined album detail
@@ -661,24 +654,6 @@ const lyrics = z.object({
     Lyrics: z.array(lyricText),
 });
 
-const serverInfo = z.object({
-    Version: z.string(),
-});
-
-const similarSongsParameters = z.object({
-    Fields: z.string().optional(),
-    Limit: z.number().optional(),
-    UserId: z.string().optional(),
-});
-
-const similarSongs = pagination.extend({
-    Items: z.array(song),
-});
-
-export enum JellyfinExtensions {
-    SONG_LYRICS = 'songLyrics',
-}
-
 export const jfType = {
     _enum: {
         albumArtistList: albumArtistListSort,
@@ -708,7 +683,6 @@ export const jfType = {
         scrobble: scrobbleParameters,
         search: searchParameters,
         similarArtistList: similarArtistListParameters,
-        similarSongs: similarSongsParameters,
         songList: songListParameters,
         updatePlaylist: updatePlaylistParameters,
     },
@@ -733,8 +707,6 @@ export const jfType = {
         removeFromPlaylist,
         scrobble,
         search,
-        serverInfo,
-        similarSongs,
         song,
         songList,
         topSongsList,

src/renderer/api/navidrome/navidrome-api.ts

@@ -7,7 +7,7 @@ import qs from 'qs';
 import { ndType } from './navidrome-types';
 import { authenticationFailure, resultWithHeaders } from '/@/renderer/api/utils';
 import { useAuthStore } from '/@/renderer/store';
-import { ServerListItem } from '/@/renderer/api/types';
+import { ServerListItem } from '/@/renderer/types';
 import { toast } from '/@/renderer/components';
 import i18n from '/@/i18n/i18n';
 
@@ -286,10 +286,9 @@ axiosClient.interceptors.response.use(
                             });
 
                             const serverId = currentServer.id;
-                            useAuthStore.getState().actions.updateServer(serverId, {
-                                credential: undefined,
-                                ndCredential: undefined,
-                            });
+                            useAuthStore
+                                .getState()
+                                .actions.updateServer(serverId, { ndCredential: undefined });
                             useAuthStore.getState().actions.setCurrentServer(null);
 
                             // special error to prevent sending a second message, and stop other messages that could be enqueued

src/renderer/api/navidrome/navidrome-controller.ts

@@ -1,9 +1,3 @@
-import { ndApiClient } from '/@/renderer/api/navidrome/navidrome-api';
-import { ndNormalize } from '/@/renderer/api/navidrome/navidrome-normalize';
-import { NavidromeExtensions, ndType } from '/@/renderer/api/navidrome/navidrome-types';
-import { ssApiClient } from '/@/renderer/api/subsonic/subsonic-api';
-import semverCoerce from 'semver/functions/coerce';
-import semverGte from 'semver/functions/gte';
 import {
     AlbumArtistDetailArgs,
     AlbumArtistDetailResponse,
@@ -45,12 +39,13 @@ import {
     RemoveFromPlaylistResponse,
     RemoveFromPlaylistArgs,
     genreListSortMap,
-    ServerInfo,
-    ServerInfoArgs,
+    ControllerEndpoint,
 } from '../types';
-import { hasFeature } from '/@/renderer/api/utils';
-import { ServerFeature, ServerFeatures } from '/@/renderer/api/features-types';
-import { SubsonicExtensions } from '/@/renderer/api/subsonic/subsonic-types';
+import { ndApiClient } from '/@/renderer/api/navidrome/navidrome-api';
+import { ndNormalize } from '/@/renderer/api/navidrome/navidrome-normalize';
+import { ndType } from '/@/renderer/api/navidrome/navidrome-types';
+import { subsonicApiClient } from '/@/renderer/api/subsonic/subsonic-api';
+import { SubsonicController } from '/@/renderer/api/subsonic/subsonic-controller';
 
 const authenticate = async (
     url: string,
@@ -136,7 +131,7 @@ const getAlbumArtistDetail = async (
         },
     });
 
-    const artistInfoRes = await ssApiClient(apiClientProps).getArtistInfo({
+    const artistInfoRes = await subsonicApiClient(apiClientProps).getArtistInfo({
         query: {
             count: 10,
             id: query.id,
@@ -155,15 +150,16 @@ const getAlbumArtistDetail = async (
         {
             ...res.body.data,
             ...(artistInfoRes.status === 200 && {
-                similarArtists: artistInfoRes.body.artistInfo.similarArtist,
+                similarArtists: artistInfoRes.body['subsonic-response'].artistInfo.similarArtist,
                 ...(!res.body.data.largeImageUrl && {
-                    largeImageUrl: artistInfoRes.body.artistInfo.largeImageUrl,
+                    largeImageUrl: artistInfoRes.body['subsonic-response'].artistInfo.largeImageUrl,
                 }),
                 ...(!res.body.data.mediumImageUrl && {
-                    largeImageUrl: artistInfoRes.body.artistInfo.mediumImageUrl,
+                    largeImageUrl:
+                        artistInfoRes.body['subsonic-response'].artistInfo.mediumImageUrl,
                 }),
                 ...(!res.body.data.smallImageUrl && {
-                    largeImageUrl: artistInfoRes.body.artistInfo.smallImageUrl,
+                    largeImageUrl: artistInfoRes.body['subsonic-response'].artistInfo.smallImageUrl,
                 }),
             }),
         },
@@ -198,6 +194,27 @@ const getAlbumArtistList = async (args: AlbumArtistListArgs): Promise<AlbumArtis
     };
 };
 
+const getAlbumArtistListCount = async (args: AlbumArtistListArgs): Promise<number> => {
+    const { query, apiClientProps } = args;
+
+    const res = await ndApiClient(apiClientProps).getAlbumArtistList({
+        query: {
+            _end: 1,
+            _order: sortOrderMap.navidrome[query.sortOrder],
+            _sort: albumArtistListSortMap.navidrome[query.sortBy],
+            _start: 0,
+            name: query.searchTerm,
+            ...query._custom?.navidrome,
+        },
+    });
+
+    if (res.status !== 200) {
+        throw new Error('Failed to get album artist list count');
+    }
+
+    return Number(res.body.headers.get('x-total-count') || 0);
+};
+
 const getAlbumDetail = async (args: AlbumDetailArgs): Promise<AlbumDetailResponse> => {
     const { query, apiClientProps } = args;
 
@@ -237,6 +254,8 @@ const getAlbumList = async (args: AlbumListArgs): Promise<AlbumListResponse> =>
             _sort: albumListSortMap.navidrome[query.sortBy],
             _start: query.startIndex,
             artist_id: query.artistIds?.[0],
+            compilation: query.isCompilation,
+            genre_id: query.genre,
             name: query.searchTerm,
             ...query._custom?.navidrome,
         },
@@ -253,6 +272,30 @@ const getAlbumList = async (args: AlbumListArgs): Promise<AlbumListResponse> =>
     };
 };
 
+const getAlbumListCount = async (args: AlbumListArgs): Promise<number> => {
+    const { query, apiClientProps } = args;
+
+    const res = await ndApiClient(apiClientProps).getAlbumList({
+        query: {
+            _end: 1,
+            _order: sortOrderMap.navidrome[query.sortOrder],
+            _sort: albumListSortMap.navidrome[query.sortBy],
+            _start: 0,
+            artist_id: query.artistIds?.[0],
+            compilation: query.isCompilation,
+            genre_id: query.genre,
+            name: query.searchTerm,
+            ...query._custom?.navidrome,
+        },
+    });
+
+    if (res.status !== 200) {
+        throw new Error('Failed to get album list');
+    }
+
+    return Number(res.body.headers.get('x-total-count') || 0);
+};
+
 const getSongList = async (args: SongListArgs): Promise<SongListResponse> => {
     const { query, apiClientProps } = args;
 
@@ -282,6 +325,29 @@ const getSongList = async (args: SongListArgs): Promise<SongListResponse> => {
     };
 };
 
+const getSongListCount = async (args: SongListArgs): Promise<number> => {
+    const { query, apiClientProps } = args;
+
+    const res = await ndApiClient(apiClientProps).getSongList({
+        query: {
+            _end: 1,
+            _order: sortOrderMap.navidrome[query.sortOrder],
+            _sort: songListSortMap.navidrome[query.sortBy],
+            _start: 0,
+            album_artist_id: query.artistIds,
+            album_id: query.albumIds,
+            title: query.searchTerm,
+            ...query._custom?.navidrome,
+        },
+    });
+
+    if (res.status !== 200) {
+        throw new Error('Failed to get song list count');
+    }
+
+    return Number(res.body.headers.get('x-total-count') || 0);
+};
+
 const getSongDetail = async (args: SongDetailArgs): Promise<SongDetailResponse> => {
     const { query, apiClientProps } = args;
 
@@ -305,7 +371,7 @@ const createPlaylist = async (args: CreatePlaylistArgs): Promise<CreatePlaylistR
         body: {
             comment: body.comment,
             name: body.name,
-            public: body._custom?.navidrome?.public,
+            public: body.public,
             rules: body._custom?.navidrome?.rules,
             sync: body._custom?.navidrome?.sync,
         },
@@ -329,7 +395,7 @@ const updatePlaylist = async (args: UpdatePlaylistArgs): Promise<UpdatePlaylistR
             name: body.name,
             public: body._custom?.navidrome?.public || false,
             rules: body._custom?.navidrome?.rules ? body._custom.navidrome.rules : undefined,
-            sync: body._custom?.navidrome?.sync || undefined,
+            sync: body._custom?.navidrome?.sync,
         },
         params: {
             id: query.id,
@@ -362,25 +428,17 @@ const deletePlaylist = async (args: DeletePlaylistArgs): Promise<DeletePlaylistR
 
 const getPlaylistList = async (args: PlaylistListArgs): Promise<PlaylistListResponse> => {
     const { query, apiClientProps } = args;
-    const customQuery = query._custom?.navidrome;
-
-    // Smart playlists only became available in 0.48.0. Do not filter for previous versions
-    if (
-        customQuery &&
-        customQuery.smart !== undefined &&
-        !hasFeature(apiClientProps.server, ServerFeature.PLAYLISTS_SMART)
-    ) {
-        customQuery.smart = undefined;
-    }
 
     const res = await ndApiClient(apiClientProps).getPlaylistList({
         query: {
             _end: query.startIndex + (query.limit || 0),
             _order: sortOrderMap.navidrome[query.sortOrder],
-            _sort: query.sortBy ? playlistListSortMap.navidrome[query.sortBy] : undefined,
+            _sort: query.sortBy
+                ? playlistListSortMap.navidrome[query.sortBy]
+                : playlistListSortMap.navidrome.name,
             _start: query.startIndex,
             q: query.searchTerm,
-            ...customQuery,
+            ...query._custom?.navidrome,
         },
     });
 
@@ -395,6 +453,29 @@ const getPlaylistList = async (args: PlaylistListArgs): Promise<PlaylistListResp
     };
 };
 
+const getPlaylistListCount = async (args: PlaylistListArgs): Promise<number> => {
+    const { query, apiClientProps } = args;
+
+    const res = await ndApiClient(apiClientProps).getPlaylistList({
+        query: {
+            _end: 1,
+            _order: sortOrderMap.navidrome[query.sortOrder],
+            _sort: query.sortBy
+                ? playlistListSortMap.navidrome[query.sortBy]
+                : playlistListSortMap.navidrome.name,
+            _start: 0,
+            q: query.searchTerm,
+            ...query._custom?.navidrome,
+        },
+    });
+
+    if (res.status !== 200) {
+        throw new Error('Failed to get playlist list count');
+    }
+
+    return Number(res.body.headers.get('x-total-count') || 0);
+};
+
 const getPlaylistDetail = async (args: PlaylistDetailArgs): Promise<PlaylistDetailResponse> => {
     const { query, apiClientProps } = args;
 
@@ -421,12 +502,11 @@ const getPlaylistSongList = async (
             id: query.id,
         },
         query: {
-            _end: query.startIndex + (query.limit || 0),
             _order: query.sortOrder ? sortOrderMap.navidrome[query.sortOrder] : 'ASC',
             _sort: query.sortBy
                 ? songListSortMap.navidrome[query.sortBy]
                 : ndType._enum.songList.ID,
-            _start: query.startIndex,
+            _start: 0,
         },
     });
 
@@ -436,7 +516,7 @@ const getPlaylistSongList = async (
 
     return {
         items: res.body.data.map((item) => ndNormalize.song(item, apiClientProps.server, '')),
-        startIndex: query?.startIndex || 0,
+        startIndex: 0,
         totalRecordCount: Number(res.body.headers.get('x-total-count') || 0),
     };
 };
@@ -482,88 +562,41 @@ const removeFromPlaylist = async (
     return null;
 };
 
-const VERSION_INFO: Array<[string, Record<string, number[]>]> = [
-    ['0.48.0', { [ServerFeature.PLAYLISTS_SMART]: [1] }],
-];
-
-const getFeatures = (version: string): Record<string, number[]> => {
-    const cleanVersion = semverCoerce(version);
-    const features: Record<string, number[]> = {};
-    let matched = cleanVersion === null;
-
-    for (const [version, supportedFeatures] of VERSION_INFO) {
-        if (!matched) {
-            matched = semverGte(cleanVersion!, version);
-        }
-
-        if (matched) {
-            for (const [feature, feat] of Object.entries(supportedFeatures)) {
-                if (feature in features) {
-                    features[feature].push(...feat);
-                } else {
-                    features[feature] = feat;
-                }
-            }
-        }
-    }
-
-    return features;
-};
-
-const getServerInfo = async (args: ServerInfoArgs): Promise<ServerInfo> => {
-    const { apiClientProps } = args;
-
-    // Navidrome will always populate serverVersion
-    const ping = await ssApiClient(apiClientProps).ping();
-
-    if (ping.status !== 200) {
-        throw new Error('Failed to ping server');
-    }
-
-    const navidromeFeatures: Record<string, number[]> = getFeatures(ping.body.serverVersion!);
-
-    if (ping.body.openSubsonic) {
-        const res = await ssApiClient(apiClientProps).getServerInfo();
-
-        if (res.status !== 200) {
-            throw new Error('Failed to get server extensions');
-        }
-
-        // The type here isn't necessarily an array (even though it's supposed to be). This is
-        // an implementation detail of Navidrome 0.50. Do a type check to make sure it's actually
-        // an array, and not an empty object.
-        if (Array.isArray(res.body.openSubsonicExtensions)) {
-            for (const extension of res.body.openSubsonicExtensions) {
-                navidromeFeatures[extension.name] = extension.versions;
-            }
-        }
-    }
-
-    const features: ServerFeatures = {
-        lyricsMultipleStructured: !!navidromeFeatures[SubsonicExtensions.SONG_LYRICS],
-        playlistsSmart: !!navidromeFeatures[NavidromeExtensions.SMART_PLAYLISTS],
-    };
-
-    return { features, id: apiClientProps.server?.id, version: ping.body.serverVersion! };
-};
-
-export const ndController = {
+export const NavidromeController: ControllerEndpoint = {
     addToPlaylist,
     authenticate,
+    clearPlaylist: undefined,
+    createFavorite: SubsonicController.createFavorite,
     createPlaylist,
+    deleteFavorite: SubsonicController.deleteFavorite,
     deletePlaylist,
     getAlbumArtistDetail,
     getAlbumArtistList,
+    getAlbumArtistListCount,
     getAlbumDetail,
     getAlbumList,
+    getAlbumListCount,
+    getArtistDetail: undefined,
+    getArtistInfo: undefined,
+    getFavoritesList: undefined,
+    getFolderItemList: undefined,
+    getFolderList: undefined,
+    getFolderSongs: undefined,
     getGenreList,
+    getMusicFolderList: SubsonicController.getMusicFolderList,
     getPlaylistDetail,
     getPlaylistList,
+    getPlaylistListCount,
     getPlaylistSongList,
-    getServerInfo,
+    getRandomSongList: SubsonicController.getRandomSongList,
     getSongDetail,
     getSongList,
+    getSongListCount,
+    getTopSongs: SubsonicController.getTopSongs,
     getUserList,
     removeFromPlaylist,
+    scrobble: SubsonicController.scrobble,
+    search: SubsonicController.search,
+    setRating: SubsonicController.setRating,
     updatePlaylist,
 };

src/renderer/api/navidrome/navidrome-normalize.ts

@@ -7,13 +7,12 @@ import {
     User,
     AlbumArtist,
     Genre,
-    ServerListItem,
-    ServerType,
 } from '/@/renderer/api/types';
+import { ServerListItem, ServerType } from '/@/renderer/types';
 import z from 'zod';
 import { ndType } from './navidrome-types';
-import { ssType } from '/@/renderer/api/subsonic/subsonic-types';
 import { NDGenre } from '/@/renderer/api/navidrome.types';
+import { SubsonicApi } from '/@/renderer/api/subsonic/subsonic-types';
 
 const getImageUrl = (args: { url: string | null }) => {
     const { url } = args;
@@ -152,11 +151,9 @@ const normalizeAlbum = (
     const imageBackdropUrl = imageUrl?.replace(/size=\d+/, 'size=1000') || null;
 
     return {
-        albumArtist: item.albumArtist,
         albumArtists: [{ id: item.albumArtistId, imageUrl: null, name: item.albumArtist }],
         artists: [{ id: item.artistId, imageUrl: null, name: item.artist }],
         backdropImageUrl: imageBackdropUrl,
-        comment: item.comment || null,
         createdAt: item.createdAt.split('T')[0],
         duration: item.duration * 1000 || null,
         genres: item.genres?.map((genre) => ({
@@ -171,7 +168,6 @@ const normalizeAlbum = (
         isCompilation: item.compilation,
         itemType: LibraryItem.ALBUM,
         lastPlayedAt: normalizePlayDate(item),
-        mbzId: item.mbzAlbumId || null,
         name: item.name,
         playCount: item.playCount,
         releaseDate: new Date(item.minYear, 0, 1).toISOString(),
@@ -190,7 +186,9 @@ const normalizeAlbum = (
 
 const normalizeAlbumArtist = (
     item: z.infer<typeof ndType._response.albumArtist> & {
-        similarArtists?: z.infer<typeof ssType._response.artistInfo>['artistInfo']['similarArtist'];
+        similarArtists?: z.infer<
+            typeof SubsonicApi.getArtistInfo2.response
+        >['subsonic-response']['artistInfo2']['similarArtist'];
     },
     server: ServerListItem | null,
 ): AlbumArtist => {
@@ -201,7 +199,7 @@ const normalizeAlbumArtist = (
             baseUrl: server?.url,
             coverArtId: `ar-${item.id}`,
             credential: server?.credential,
-            size: 300,
+            size: 100,
         });
     }
 
@@ -220,7 +218,6 @@ const normalizeAlbumArtist = (
         imageUrl: imageUrl || null,
         itemType: LibraryItem.ALBUM_ARTIST,
         lastPlayedAt: normalizePlayDate(item),
-        mbz: item.mbzArtistId || null,
         name: item.name,
         playCount: item.playCount,
         serverId: server?.id || 'unknown',

src/renderer/api/navidrome/navidrome-types.ts

@@ -111,7 +111,6 @@ const album = z.object({
     allArtistIds: z.string(),
     artist: z.string(),
     artistId: z.string(),
-    comment: z.string().optional(),
     compilation: z.boolean(),
     coverArtId: z.string().optional(), // Removed after v0.48.0
     coverArtPath: z.string().optional(), // Removed after v0.48.0
@@ -343,10 +342,6 @@ const removeFromPlaylistParameters = z.object({
     id: z.array(z.string()),
 });
 
-export enum NavidromeExtensions {
-    SMART_PLAYLISTS = 'smartPlaylists',
-}
-
 export const ndType = {
     _enum: {
         albumArtistList: ndAlbumArtistListSort,

src/renderer/api/query-keys.ts

@@ -18,7 +18,6 @@ import type {
     LyricsQuery,
     LyricSearchQuery,
     GenreListQuery,
-    SimilarSongsQuery,
 } from './types';
 
 export const splitPaginatedQuery = (key: any) => {
@@ -50,6 +49,19 @@ export const queryKeys: Record<
     Record<string, (...props: any) => QueryFunctionContext['queryKey']>
 > = {
     albumArtists: {
+        count: (serverId: string, query?: AlbumArtistListQuery) => {
+            const { pagination, filter } = splitPaginatedQuery(query);
+
+            if (query && pagination) {
+                return [serverId, 'albumArtists', 'count', filter, pagination] as const;
+            }
+
+            if (query) {
+                return [serverId, 'albumArtists', 'count', filter] as const;
+            }
+
+            return [serverId, 'albumArtists', 'count'] as const;
+        },
         detail: (serverId: string, query?: AlbumArtistDetailQuery) => {
             if (query) return [serverId, 'albumArtists', 'detail', query] as const;
             return [serverId, 'albumArtists', 'detail'] as const;
@@ -73,23 +85,40 @@ export const queryKeys: Record<
         },
     },
     albums: {
-        detail: (serverId: string, query?: AlbumDetailQuery) =>
-            [serverId, 'albums', 'detail', query] as const,
-        list: (serverId: string, query?: AlbumListQuery, artistId?: string) => {
+        count: (serverId: string, query?: AlbumListQuery, artistId?: string) => {
             const { pagination, filter } = splitPaginatedQuery(query);
 
             if (query && pagination && artistId) {
-                return [serverId, 'albums', 'list', artistId, filter, pagination] as const;
+                return [serverId, 'albums', 'count', artistId, filter, pagination] as const;
             }
 
             if (query && pagination) {
-                return [serverId, 'albums', 'list', filter, pagination] as const;
+                return [serverId, 'albums', 'count', filter, pagination] as const;
             }
 
             if (query && artistId) {
-                return [serverId, 'albums', 'list', artistId, filter] as const;
+                return [serverId, 'albums', 'count', artistId, filter] as const;
             }
 
+            if (query) {
+                return [serverId, 'albums', 'count', filter] as const;
+            }
+
+            return [serverId, 'albums', 'count'] as const;
+        },
+        detail: (serverId: string, query?: AlbumDetailQuery) =>
+            [serverId, 'albums', 'detail', query] as const,
+        list: (
+            serverId: string,
+            query?: {
+                artistIds?: string[];
+                maxYear?: number;
+                minYear?: number;
+                searchTerm?: string;
+            },
+        ) => {
+            const { filter } = splitPaginatedQuery(query);
+
             if (query) {
                 return [serverId, 'albums', 'list', filter] as const;
             }
@@ -208,6 +237,19 @@ export const queryKeys: Record<
         root: (serverId: string) => [serverId] as const,
     },
     songs: {
+        count: (serverId: string, query?: AlbumArtistListQuery) => {
+            const { pagination, filter } = splitPaginatedQuery(query);
+
+            if (query && pagination) {
+                return [serverId, 'songs', 'count', filter, pagination] as const;
+            }
+
+            if (query) {
+                return [serverId, 'songs', 'count', filter] as const;
+            }
+
+            return [serverId, 'songs', 'count'] as const;
+        },
         detail: (serverId: string, query?: SongDetailQuery) => {
             if (query) return [serverId, 'songs', 'detail', query] as const;
             return [serverId, 'songs', 'detail'] as const;
@@ -240,10 +282,6 @@ export const queryKeys: Record<
             return [serverId, 'songs', 'randomSongList'] as const;
         },
         root: (serverId: string) => [serverId, 'songs'] as const,
-        similar: (serverId: string, query?: SimilarSongsQuery) => {
-            if (query) return [serverId, 'song', 'similar', query] as const;
-            return [serverId, 'song', 'similar'] as const;
-        },
     },
     users: {
         list: (serverId: string, query?: UserListQuery) => {

src/renderer/api/subsonic/subsonic-api.ts

@@ -1,123 +1,426 @@
 import { initClient, initContract } from '@ts-rest/core';
-import axios, { Method, AxiosError, isAxiosError, AxiosResponse } from 'axios';
+import axios, { AxiosError, AxiosResponse, Method, isAxiosError } from 'axios';
 import omitBy from 'lodash/omitBy';
 import qs from 'qs';
-import { z } from 'zod';
-import { ssType } from '/@/renderer/api/subsonic/subsonic-types';
+import i18n from '/@/i18n/i18n';
+import { SubsonicApi } from '/@/renderer/api/subsonic/subsonic-types';
 import { ServerListItem } from '/@/renderer/api/types';
 import { toast } from '/@/renderer/components/toast/index';
-import i18n from '/@/i18n/i18n';
 
 const c = initContract();
 
 export const contract = c.router({
-    authenticate: {
+    changePassword: {
         method: 'GET',
-        path: 'ping.view',
-        query: ssType._parameters.authenticate,
+        path: 'changePassword.view',
+        query: SubsonicApi.changePassword.parameters,
         responses: {
-            200: ssType._response.authenticate,
+            200: SubsonicApi.changePassword.response,
         },
     },
-    createFavorite: {
+    createInternetRadioStation: {
         method: 'GET',
-        path: 'star.view',
-        query: ssType._parameters.createFavorite,
+        path: 'createInternetRadioStation.view',
+        query: SubsonicApi.createInternetRadioStation.parameters,
         responses: {
-            200: ssType._response.createFavorite,
+            200: SubsonicApi.createInternetRadioStation.response,
+        },
+    },
+    createPlaylist: {
+        method: 'GET',
+        path: 'createPlaylist.view',
+        query: SubsonicApi.createPlaylist.parameters,
+        responses: {
+            200: SubsonicApi.createPlaylist.response,
+        },
+    },
+    createShare: {
+        method: 'GET',
+        path: 'createShare.view',
+        query: SubsonicApi.createShare.parameters,
+        responses: {
+            200: SubsonicApi.createShare.response,
+        },
+    },
+    createUser: {
+        method: 'GET',
+        path: 'createUser.view',
+        query: SubsonicApi.createUser.parameters,
+        responses: {
+            200: SubsonicApi.createUser.response,
+        },
+    },
+    deleteInternetRadioStation: {
+        method: 'GET',
+        path: 'deleteInternetRadioStation.view',
+        query: SubsonicApi.deleteInternetRadioStation.parameters,
+        responses: {
+            200: SubsonicApi.deleteInternetRadioStation.response,
+        },
+    },
+    deletePlaylist: {
+        method: 'GET',
+        path: 'deletePlaylist.view',
+        query: SubsonicApi.deletePlaylist.parameters,
+        responses: {
+            200: SubsonicApi.deletePlaylist.response,
+        },
+    },
+    deleteShare: {
+        method: 'GET',
+        path: 'deleteShare.view',
+        query: SubsonicApi.deleteShare.parameters,
+        responses: {
+            200: SubsonicApi.deleteShare.response,
+        },
+    },
+    deleteUser: {
+        method: 'GET',
+        path: 'deleteUser.view',
+        query: SubsonicApi.deleteUser.parameters,
+        responses: {
+            200: SubsonicApi.deleteUser.response,
+        },
+    },
+    getAlbum: {
+        method: 'GET',
+        path: 'getAlbum.view',
+        query: SubsonicApi.getAlbum.parameters,
+        responses: {
+            200: SubsonicApi.getAlbum.response,
+        },
+    },
+    getAlbumInfo: {
+        method: 'GET',
+        path: 'getAlbumInfo.view',
+        query: SubsonicApi.getAlbumInfo.parameters,
+        responses: {
+            200: SubsonicApi.getAlbumInfo.response,
+        },
+    },
+    getAlbumInfo2: {
+        method: 'GET',
+        path: 'getAlbumInfo2.view',
+        query: SubsonicApi.getAlbumInfo2.parameters,
+        responses: {
+            200: SubsonicApi.getAlbumInfo2.response,
+        },
+    },
+    getAlbumList: {
+        method: 'GET',
+        path: 'getAlbumList.view',
+        query: SubsonicApi.getAlbumList.parameters,
+        responses: {
+            200: SubsonicApi.getAlbumList.response,
+        },
+    },
+    getAlbumList2: {
+        method: 'GET',
+        path: 'getAlbumList2.view',
+        query: SubsonicApi.getAlbumList2.parameters,
+        responses: {
+            200: SubsonicApi.getAlbumList2.response,
+        },
+    },
+    getArtist: {
+        method: 'GET',
+        path: 'getArtist.view',
+        query: SubsonicApi.getArtist.parameters,
+        responses: {
+            200: SubsonicApi.getArtist.response,
         },
     },
     getArtistInfo: {
         method: 'GET',
         path: 'getArtistInfo.view',
-        query: ssType._parameters.artistInfo,
+        query: SubsonicApi.getArtistInfo.parameters,
         responses: {
-            200: ssType._response.artistInfo,
+            200: SubsonicApi.getArtistInfo.response,
         },
     },
-    getMusicFolderList: {
+    getArtistInfo2: {
+        method: 'GET',
+        path: 'getArtistInfo2.view',
+        query: SubsonicApi.getArtistInfo2.parameters,
+        responses: {
+            200: SubsonicApi.getArtistInfo2.response,
+        },
+    },
+    getArtists: {
+        method: 'GET',
+        path: 'getArtists.view',
+        query: SubsonicApi.getArtists.parameters,
+        responses: {
+            200: SubsonicApi.getArtists.response,
+        },
+    },
+    getGenres: {
+        method: 'GET',
+        path: 'getGenres.view',
+        query: SubsonicApi.getGenres.parameters,
+        responses: {
+            200: SubsonicApi.getGenres.response,
+        },
+    },
+    getIndexes: {
+        method: 'GET',
+        path: 'getIndexes.view',
+        query: SubsonicApi.getIndexes.parameters,
+        responses: {
+            200: SubsonicApi.getIndexes.response,
+        },
+    },
+    getInternetRadioStations: {
+        method: 'GET',
+        path: 'getInternetRadioStations.view',
+        query: SubsonicApi.getInternetRadioStations.parameters,
+        responses: {
+            200: SubsonicApi.getInternetRadioStations.response,
+        },
+    },
+    getLicense: {
+        method: 'GET',
+        path: 'getLicense.view',
+        query: SubsonicApi.getLicense.parameters,
+        responses: {
+            200: SubsonicApi.getLicense.response,
+        },
+    },
+    getLyrics: {
+        method: 'GET',
+        path: 'getLyrics.view',
+        query: SubsonicApi.getLyrics.parameters,
+        responses: {
+            200: SubsonicApi.getLyrics.response,
+        },
+    },
+    getMusicDirectory: {
+        method: 'GET',
+        path: 'getMusicDirectory.view',
+        query: SubsonicApi.getMusicDirectory.parameters,
+        responses: {
+            200: SubsonicApi.getMusicDirectory.response,
+        },
+    },
+    getMusicFolders: {
         method: 'GET',
         path: 'getMusicFolders.view',
         responses: {
-            200: ssType._response.musicFolderList,
+            200: SubsonicApi.getMusicFolders.response,
         },
     },
-    getRandomSongList: {
+    getNowPlaying: {
         method: 'GET',
-        path: 'getRandomSongs.view',
-        query: ssType._parameters.randomSongList,
+        path: 'getNowPlaying.view',
+        query: SubsonicApi.getNowPlaying.parameters,
         responses: {
-            200: ssType._response.randomSongList,
+            200: SubsonicApi.getNowPlaying.response,
         },
     },
-    getServerInfo: {
+    getOpenSubsonicExtensions: {
         method: 'GET',
         path: 'getOpenSubsonicExtensions.view',
+        query: SubsonicApi.getOpenSubsonicExtensions.parameters,
         responses: {
-            200: ssType._response.serverInfo,
+            200: SubsonicApi.getOpenSubsonicExtensions.response,
+        },
+    },
+    getPlaylist: {
+        method: 'GET',
+        path: 'getPlaylist.view',
+        query: SubsonicApi.getPlaylist.parameters,
+        responses: {
+            200: SubsonicApi.getPlaylist.response,
+        },
+    },
+    getPlaylists: {
+        method: 'GET',
+        path: 'getPlaylists.view',
+        query: SubsonicApi.getPlaylists.parameters,
+        responses: {
+            200: SubsonicApi.getPlaylists.response,
+        },
+    },
+    getRandomSongs: {
+        method: 'GET',
+        path: 'getRandomSongs.view',
+        query: SubsonicApi.getRandomSongs.parameters,
+        responses: {
+            200: SubsonicApi.getRandomSongs.response,
+        },
+    },
+    getScanStatus: {
+        method: 'GET',
+        path: 'getScanStatus.view',
+        responses: {
+            200: SubsonicApi.getScanStatus.response,
+        },
+    },
+    getShares: {
+        method: 'GET',
+        path: 'getShares.view',
+        query: SubsonicApi.getShares.parameters,
+        responses: {
+            200: SubsonicApi.getShares.response,
         },
     },
     getSimilarSongs: {
         method: 'GET',
-        path: 'getSimilarSongs',
-        query: ssType._parameters.similarSongs,
+        path: 'getSimilarSongs.view',
+        query: SubsonicApi.getSimilarSongs.parameters,
         responses: {
-            200: ssType._response.similarSongs,
+            200: SubsonicApi.getSimilarSongs.response,
         },
     },
-    getStructuredLyrics: {
+    getSimilarSongs2: {
         method: 'GET',
-        path: 'getLyricsBySongId.view',
-        query: ssType._parameters.structuredLyrics,
+        path: 'getSimilarSongs2.view',
+        query: SubsonicApi.getSimilarSongs2.parameters,
         responses: {
-            200: ssType._response.structuredLyrics,
+            200: SubsonicApi.getSimilarSongs2.response,
         },
     },
-    getTopSongsList: {
+    getSong: {
+        method: 'GET',
+        path: 'getSong.view',
+        query: SubsonicApi.getSong.parameters,
+        responses: {
+            200: SubsonicApi.getSong.response,
+        },
+    },
+    getSongsByGenre: {
+        method: 'GET',
+        path: 'getSongsByGenre.view',
+        query: SubsonicApi.getSongsByGenre.parameters,
+        responses: {
+            200: SubsonicApi.getSongsByGenre.response,
+        },
+    },
+    getStarred: {
+        method: 'GET',
+        path: 'getStarred.view',
+        query: SubsonicApi.getStarred.parameters,
+        responses: {
+            200: SubsonicApi.getStarred.response,
+        },
+    },
+    getStarred2: {
+        method: 'GET',
+        path: 'getStarred2.view',
+        query: SubsonicApi.getStarred2.parameters,
+        responses: {
+            200: SubsonicApi.getStarred2.response,
+        },
+    },
+    getTopSongs: {
         method: 'GET',
         path: 'getTopSongs.view',
-        query: ssType._parameters.topSongsList,
+        query: SubsonicApi.getTopSongs.parameters,
         responses: {
-            200: ssType._response.topSongsList,
+            200: SubsonicApi.getTopSongs.response,
+        },
+    },
+    getUser: {
+        method: 'GET',
+        path: 'getUser.view',
+        query: SubsonicApi.getUser.parameters,
+        responses: {
+            200: SubsonicApi.getUser.response,
+        },
+    },
+    getUsers: {
+        method: 'GET',
+        path: 'getUsers.view',
+        query: SubsonicApi.getUsers.parameters,
+        responses: {
+            200: SubsonicApi.getUsers.response,
         },
     },
     ping: {
         method: 'GET',
         path: 'ping.view',
+        query: SubsonicApi.ping.parameters,
         responses: {
-            200: ssType._response.ping,
-        },
-    },
-    removeFavorite: {
-        method: 'GET',
-        path: 'unstar.view',
-        query: ssType._parameters.removeFavorite,
-        responses: {
-            200: ssType._response.removeFavorite,
+            200: SubsonicApi.ping.response,
         },
     },
     scrobble: {
         method: 'GET',
         path: 'scrobble.view',
-        query: ssType._parameters.scrobble,
+        query: SubsonicApi.scrobble.parameters,
         responses: {
-            200: ssType._response.scrobble,
+            200: SubsonicApi.scrobble.response,
         },
     },
     search3: {
         method: 'GET',
         path: 'search3.view',
-        query: ssType._parameters.search3,
+        query: SubsonicApi.search3.parameters,
         responses: {
-            200: ssType._response.search3,
+            200: SubsonicApi.search3.response,
         },
     },
     setRating: {
         method: 'GET',
         path: 'setRating.view',
-        query: ssType._parameters.setRating,
+        query: SubsonicApi.setRating.parameters,
         responses: {
-            200: ssType._response.setRating,
+            200: SubsonicApi.setRating.response,
+        },
+    },
+    star: {
+        method: 'GET',
+        path: 'star.view',
+        query: SubsonicApi.star.parameters,
+        responses: {
+            200: SubsonicApi.star.response,
+        },
+    },
+    startScan: {
+        method: 'GET',
+        path: 'startScan.view',
+        responses: {
+            200: SubsonicApi.startScan.response,
+        },
+    },
+    unstar: {
+        method: 'GET',
+        path: 'unstar.view',
+        query: SubsonicApi.unstar.parameters,
+        responses: {
+            200: SubsonicApi.unstar.response,
+        },
+    },
+    updateInternetRadioStation: {
+        method: 'GET',
+        path: 'updateInternetRadioStation.view',
+        query: SubsonicApi.updateInternetRadioStation.parameters,
+        responses: {
+            200: SubsonicApi.updateInternetRadioStation.response,
+        },
+    },
+    updatePlaylist: {
+        method: 'GET',
+        path: 'updatePlaylist.view',
+        query: SubsonicApi.updatePlaylist.parameters,
+        responses: {
+            200: SubsonicApi.updatePlaylist.response,
+        },
+    },
+    updateShare: {
+        method: 'GET',
+        path: 'updateShare.view',
+        query: SubsonicApi.updateShare.parameters,
+        responses: {
+            200: SubsonicApi.updateShare.response,
+        },
+    },
+    updateUser: {
+        method: 'GET',
+        path: 'updateUser.view',
+        query: SubsonicApi.updateUser.parameters,
+        responses: {
+            200: SubsonicApi.updateUser.response,
         },
     },
 });
@@ -132,14 +435,21 @@ axiosClient.interceptors.response.use(
     (response) => {
         const data = response.data;
 
-        if (data['subsonic-response'].status !== 'ok') {
+        // Ping endpoint returns a string
+        if (typeof data === 'string') {
+            return response;
+        }
+
+        if (data['subsonic-response']?.status !== 'ok') {
             // Suppress code related to non-linked lastfm or spotify from Navidrome
-            if (data['subsonic-response'].error.code !== 0) {
+            if (data['subsonic-response']?.error.code !== 0) {
                 toast.error({
-                    message: data['subsonic-response'].error.message,
+                    message: data['subsonic-response']?.error.message,
                     title: i18n.t('error.genericError', { postProcess: 'sentenceCase' }) as string,
                 });
             }
+
+            return Promise.reject(data['subsonic-response']?.error);
         }
 
         return response;
@@ -161,7 +471,7 @@ const parsePath = (fullPath: string) => {
     };
 };
 
-export const ssApiClient = (args: {
+export const subsonicApiClient = (args: {
     server: ServerListItem | null;
     signal?: AbortSignal;
     url?: string;
@@ -192,9 +502,7 @@ export const ssApiClient = (args: {
             }
 
             try {
-                const result = await axiosClient.request<
-                    z.infer<typeof ssType._response.baseResponse>
-                >({
+                const result = await axiosClient.request({
                     data: body,
                     headers,
                     method: method as Method,
@@ -210,9 +518,9 @@ export const ssApiClient = (args: {
                 });
 
                 return {
-                    body: result.data['subsonic-response'],
-                    headers: result.headers as any,
-                    status: result.status,
+                    body: result?.data,
+                    headers: result?.headers as any,
+                    status: result?.status,
                 };
             } catch (e: Error | AxiosError | any) {
                 if (isAxiosError(e)) {

src/renderer/api/subsonic/subsonic-normalize.ts

@@ -1,14 +1,16 @@
 import { nanoid } from 'nanoid';
 import { z } from 'zod';
-import { ssType } from '/@/renderer/api/subsonic/subsonic-types';
+import { SubsonicApi } from '/@/renderer/api/subsonic/subsonic-types';
 import {
     QueueSong,
     LibraryItem,
     AlbumArtist,
     Album,
-    ServerListItem,
-    ServerType,
+    Genre,
+    MusicFolder,
+    Playlist,
 } from '/@/renderer/api/types';
+import { ServerListItem, ServerType } from '/@/renderer/types';
 
 const getCoverArtUrl = (args: {
     baseUrl: string | undefined;
@@ -33,16 +35,17 @@ const getCoverArtUrl = (args: {
 };
 
 const normalizeSong = (
-    item: z.infer<typeof ssType._response.song>,
+    item: z.infer<typeof SubsonicApi._baseTypes.song>,
     server: ServerListItem | null,
     deviceId: string,
+    size?: number,
 ): QueueSong => {
     const imageUrl =
         getCoverArtUrl({
             baseUrl: server?.url,
             coverArtId: item.coverArt,
             credential: server?.credential,
-            size: 100,
+            size: size || 300,
         }) || null;
 
     const streamUrl = `${server?.url}/rest/stream.view?id=${item.id}&v=1.13.0&c=feishin_${deviceId}&${server?.credential}`;
@@ -111,15 +114,18 @@ const normalizeSong = (
 };
 
 const normalizeAlbumArtist = (
-    item: z.infer<typeof ssType._response.albumArtist>,
+    item:
+        | z.infer<typeof SubsonicApi._baseTypes.artist>
+        | z.infer<typeof SubsonicApi._baseTypes.artistListEntry>,
     server: ServerListItem | null,
+    imageSize?: number,
 ): AlbumArtist => {
     const imageUrl =
         getCoverArtUrl({
             baseUrl: server?.url,
             coverArtId: item.coverArt,
             credential: server?.credential,
-            size: 100,
+            size: imageSize || 100,
         }) || null;
 
     return {
@@ -132,7 +138,6 @@ const normalizeAlbumArtist = (
         imageUrl,
         itemType: LibraryItem.ALBUM_ARTIST,
         lastPlayedAt: null,
-        mbz: null,
         name: item.name,
         playCount: null,
         serverId: server?.id || 'unknown',
@@ -145,27 +150,28 @@ const normalizeAlbumArtist = (
 };
 
 const normalizeAlbum = (
-    item: z.infer<typeof ssType._response.album>,
+    item:
+        | z.infer<typeof SubsonicApi._baseTypes.album>
+        | z.infer<typeof SubsonicApi._baseTypes.albumListEntry>,
     server: ServerListItem | null,
+    size?: number,
 ): Album => {
     const imageUrl =
         getCoverArtUrl({
             baseUrl: server?.url,
             coverArtId: item.coverArt,
             credential: server?.credential,
-            size: 300,
+            size: size || 300,
         }) || null;
 
     return {
-        albumArtist: item.artist,
         albumArtists: item.artistId
             ? [{ id: item.artistId, imageUrl: null, name: item.artist }]
             : [],
         artists: item.artistId ? [{ id: item.artistId, imageUrl: null, name: item.artist }] : [],
         backdropImageUrl: null,
-        comment: null,
         createdAt: item.created,
-        duration: item.duration,
+        duration: item.duration * 1000,
         genres: item.genre
             ? [
                   {
@@ -182,7 +188,6 @@ const normalizeAlbum = (
         isCompilation: null,
         itemType: LibraryItem.ALBUM,
         lastPlayedAt: null,
-        mbzId: null,
         name: item.name,
         playCount: null,
         releaseDate: item.year ? new Date(item.year, 0, 1).toISOString() : null,
@@ -191,7 +196,10 @@ const normalizeAlbum = (
         serverType: ServerType.SUBSONIC,
         size: null,
         songCount: item.songCount,
-        songs: [],
+        songs:
+            (item as z.infer<typeof SubsonicApi._baseTypes.album>).song?.map((song) =>
+                normalizeSong(song, server, ''),
+            ) || [],
         uniqueId: nanoid(),
         updatedAt: item.created,
         userFavorite: item.starred || false,
@@ -199,8 +207,61 @@ const normalizeAlbum = (
     };
 };
 
-export const ssNormalize = {
+const normalizeGenre = (item: z.infer<typeof SubsonicApi._baseTypes.genre>): Genre => {
+    return {
+        albumCount: item.albumCount,
+        id: item.value,
+        imageUrl: null,
+        itemType: LibraryItem.GENRE,
+        name: item.value,
+        songCount: item.songCount,
+    };
+};
+
+const normalizeMusicFolder = (
+    item: z.infer<typeof SubsonicApi._baseTypes.musicFolder>,
+): MusicFolder => {
+    return {
+        id: item.id,
+        name: item.name,
+    };
+};
+
+const normalizePlaylist = (
+    item:
+        | z.infer<typeof SubsonicApi._baseTypes.playlist>
+        | z.infer<typeof SubsonicApi._baseTypes.playlistListEntry>,
+    server: ServerListItem | null,
+): Playlist => {
+    return {
+        description: item.comment || null,
+        duration: item.duration,
+        genres: [],
+        id: item.id,
+        imagePlaceholderUrl: null,
+        imageUrl: getCoverArtUrl({
+            baseUrl: server?.url,
+            coverArtId: item.coverArt,
+            credential: server?.credential,
+            size: 300,
+        }),
+        itemType: LibraryItem.PLAYLIST,
+        name: item.name,
+        owner: item.owner,
+        ownerId: item.owner,
+        public: item.public,
+        serverId: server?.id || 'unknown',
+        serverType: ServerType.SUBSONIC,
+        size: null,
+        songCount: item.songCount,
+    };
+};
+
+export const subsonicNormalize = {
     album: normalizeAlbum,
     albumArtist: normalizeAlbumArtist,
+    genre: normalizeGenre,
+    musicFolder: normalizeMusicFolder,
+    playlist: normalizePlaylist,
     song: normalizeSong,
 };

src/renderer/api/types.ts

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import { ServerFeatures } from './features-types';
 import { jfType } from './jellyfin/jellyfin-types';
 import {
     JFSortOrder,
@@ -58,16 +57,13 @@ export type User = {
 
 export type ServerListItem = {
     credential: string;
-    features?: ServerFeatures;
     id: string;
     name: string;
     ndCredential?: string;
-    savePassword?: boolean;
     type: ServerType;
     url: string;
     userId: string | null;
     username: string;
-    version?: string;
 };
 
 export enum ServerType {
@@ -128,7 +124,7 @@ export interface BasePaginatedResponse<T> {
     error?: string | any;
     items: T;
     startIndex: number;
-    totalRecordCount: number;
+    totalRecordCount: number | null;
 }
 
 export type AuthenticationResponse = {
@@ -148,11 +144,9 @@ export type Genre = {
 };
 
 export type Album = {
-    albumArtist: string;
     albumArtists: RelatedArtist[];
     artists: RelatedArtist[];
     backdropImageUrl: string | null;
-    comment: string | null;
     createdAt: string;
     duration: number | null;
     genres: Genre[];
@@ -162,7 +156,6 @@ export type Album = {
     isCompilation: boolean | null;
     itemType: LibraryItem.ALBUM;
     lastPlayedAt: string | null;
-    mbzId: string | null;
     name: string;
     playCount: number | null;
     releaseDate: string | null;
@@ -235,7 +228,6 @@ export type AlbumArtist = {
     imageUrl: string | null;
     itemType: LibraryItem.ALBUM_ARTIST;
     lastPlayedAt: string | null;
-    mbz: string | null;
     name: string;
     playCount: number | null;
     serverId: string;
@@ -314,7 +306,9 @@ export type GenreListResponse = BasePaginatedResponse<Genre[]> | null | undefine
 export type GenreListArgs = { query: GenreListQuery } & BaseEndpointArgs;
 
 export enum GenreListSort {
+    ALBUM_COUNT = 'albumCount',
     NAME = 'name',
+    SONG_COUNT = 'songCount',
 }
 
 export type GenreListQuery = {
@@ -338,10 +332,14 @@ type GenreListSortMap = {
 
 export const genreListSortMap: GenreListSortMap = {
     jellyfin: {
+        albumCount: undefined,
         name: JFGenreListSort.NAME,
+        songCount: undefined,
     },
     navidrome: {
+        albumCount: undefined,
         name: NDGenreListSort.NAME,
+        songCount: undefined,
     },
     subsonic: {
         name: undefined,
@@ -378,7 +376,12 @@ export type AlbumListQuery = {
         navidrome?: Partial<z.infer<typeof ndType._parameters.albumList>>;
     };
     artistIds?: string[];
+    genre?: string;
+    isCompilation?: boolean;
+    isFavorite?: boolean;
     limit?: number;
+    maxYear?: number;
+    minYear?: number;
     musicFolderId?: string;
     searchTerm?: string;
     sortBy: AlbumListSort;
@@ -425,8 +428,7 @@ export const albumListSortMap: AlbumListSortMap = {
         rating: NDAlbumListSort.RATING,
         recentlyAdded: NDAlbumListSort.RECENTLY_ADDED,
         recentlyPlayed: NDAlbumListSort.PLAY_DATE,
-        // Recent versions of Navidrome support release date, but fallback to year for now
-        releaseDate: NDAlbumListSort.YEAR,
+        releaseDate: undefined,
         songCount: NDAlbumListSort.SONG_COUNT,
         year: NDAlbumListSort.YEAR,
     },
@@ -490,8 +492,13 @@ export type SongListQuery = {
     };
     albumIds?: string[];
     artistIds?: string[];
+    genre?: string;
+    genreId?: string;
     imageSize?: number;
+    isFavorite?: boolean;
     limit?: number;
+    maxYear?: number;
+    minYear?: number;
     musicFolderId?: string;
     searchTerm?: string;
     sortBy: SongListSort;
@@ -811,6 +818,7 @@ export type CreatePlaylistBody = {
     };
     comment?: string;
     name: string;
+    public?: boolean;
 };
 
 export type CreatePlaylistArgs = { body: CreatePlaylistBody; serverId?: string } & BaseEndpointArgs;
@@ -835,6 +843,11 @@ export type UpdatePlaylistBody = {
     comment?: string;
     genres?: Genre[];
     name: string;
+    owner?: string;
+    ownerId?: string;
+    public?: boolean;
+    rules?: Record<string, any>;
+    sync?: boolean;
 };
 
 export type UpdatePlaylistArgs = {
@@ -926,10 +939,9 @@ export type PlaylistSongListResponse = BasePaginatedResponse<Song[]> | null | un
 
 export type PlaylistSongListQuery = {
     id: string;
-    limit?: number;
-    sortBy?: SongListSort;
-    sortOrder?: SortOrder;
-    startIndex: number;
+    searchTerm?: string;
+    sortBy: SongListSort;
+    sortOrder: SortOrder;
 };
 
 export type PlaylistSongListArgs = { query: PlaylistSongListQuery } & BaseEndpointArgs;
@@ -1023,7 +1035,7 @@ export type SearchQuery = {
     albumLimit?: number;
     albumStartIndex?: number;
     musicFolderId?: string;
-    query?: string;
+    query: string;
     songLimit?: number;
     songStartIndex?: number;
 };
@@ -1101,11 +1113,17 @@ export type InternetProviderLyricSearchResponse = {
     source: LyricSource;
 };
 
-export type FullLyricsMetadata = {
-    lyrics: LyricsResponse;
+export type SynchronizedLyricMetadata = {
+    lyrics: SynchronizedLyricsArray;
     remote: boolean;
-    source: string;
-} & Omit<InternetProviderLyricResponse, 'id' | 'lyrics' | 'source'>;
+} & Omit<InternetProviderLyricResponse, 'lyrics'>;
+
+export type UnsynchronizedLyricMetadata = {
+    lyrics: string;
+    remote: boolean;
+} & Omit<InternetProviderLyricResponse, 'lyrics'>;
+
+export type FullLyricsMetadata = SynchronizedLyricMetadata | UnsynchronizedLyricMetadata;
 
 export type LyricOverride = Omit<InternetProviderLyricResponse, 'lyrics'>;
 
@@ -1143,37 +1161,47 @@ export type FontData = {
     style: string;
 };
 
-export type ServerInfoArgs = BaseEndpointArgs;
-
-export type ServerInfo = {
-    features: ServerFeatures;
-    id?: string;
-    version: string;
-};
-
-export type StructuredLyricsArgs = {
-    query: LyricsQuery;
-} & BaseEndpointArgs;
-
-export type StructuredUnsyncedLyric = {
-    lyrics: string;
-    synced: false;
-} & Omit<FullLyricsMetadata, 'lyrics'>;
-
-export type StructuredSyncedLyric = {
-    lyrics: SynchronizedLyricsArray;
-    synced: true;
-} & Omit<FullLyricsMetadata, 'lyrics'>;
-
-export type StructuredLyric = {
-    lang: string;
-} & (StructuredUnsyncedLyric | StructuredSyncedLyric);
-
-export type SimilarSongsQuery = {
-    count?: number;
-    songId: string;
-};
-
-export type SimilarSongsArgs = {
-    query: SimilarSongsQuery;
-} & BaseEndpointArgs;
+export type ControllerEndpoint = Partial<{
+    addToPlaylist: (args: AddToPlaylistArgs) => Promise<AddToPlaylistResponse>;
+    authenticate: (
+        url: string,
+        body: { password: string; username: string },
+    ) => Promise<AuthenticationResponse>;
+    clearPlaylist: () => void;
+    createFavorite: (args: FavoriteArgs) => Promise<FavoriteResponse>;
+    createPlaylist: (args: CreatePlaylistArgs) => Promise<CreatePlaylistResponse>;
+    deleteFavorite: (args: FavoriteArgs) => Promise<FavoriteResponse>;
+    deletePlaylist: (args: DeletePlaylistArgs) => Promise<DeletePlaylistResponse>;
+    getAlbumArtistDetail: (args: AlbumArtistDetailArgs) => Promise<AlbumArtistDetailResponse>;
+    getAlbumArtistList: (args: AlbumArtistListArgs) => Promise<AlbumArtistListResponse>;
+    getAlbumArtistListCount: (args: AlbumArtistListArgs) => Promise<number>;
+    getAlbumDetail: (args: AlbumDetailArgs) => Promise<AlbumDetailResponse>;
+    getAlbumList: (args: AlbumListArgs) => Promise<AlbumListResponse>;
+    getAlbumListCount: (args: AlbumListArgs) => Promise<number>;
+    getAlbumSongList: (args: AlbumDetailArgs) => Promise<SongListResponse>; // TODO
+    getArtistDetail: () => void;
+    getArtistInfo: (args: any) => void;
+    getArtistList: (args: ArtistListArgs) => Promise<ArtistListResponse>;
+    getFavoritesList: () => void;
+    getFolderItemList: () => void;
+    getFolderList: () => void;
+    getFolderSongs: () => void;
+    getGenreList: (args: GenreListArgs) => Promise<GenreListResponse>;
+    getLyrics: (args: LyricsArgs) => Promise<LyricsResponse>;
+    getMusicFolderList: (args: MusicFolderListArgs) => Promise<MusicFolderListResponse>;
+    getPlaylistDetail: (args: PlaylistDetailArgs) => Promise<PlaylistDetailResponse>;
+    getPlaylistList: (args: PlaylistListArgs) => Promise<PlaylistListResponse>;
+    getPlaylistListCount: (args: PlaylistListArgs) => Promise<number>;
+    getPlaylistSongList: (args: PlaylistSongListArgs) => Promise<SongListResponse>;
+    getRandomSongList: (args: RandomSongListArgs) => Promise<SongListResponse>;
+    getSongDetail: (args: SongDetailArgs) => Promise<SongDetailResponse>;
+    getSongList: (args: SongListArgs) => Promise<SongListResponse>;
+    getSongListCount: (args: SongListArgs) => Promise<number>;
+    getTopSongs: (args: TopSongListArgs) => Promise<TopSongListResponse>;
+    getUserList: (args: UserListArgs) => Promise<UserListResponse>;
+    removeFromPlaylist: (args: RemoveFromPlaylistArgs) => Promise<RemoveFromPlaylistResponse>;
+    scrobble: (args: ScrobbleArgs) => Promise<ScrobbleResponse>;
+    search: (args: SearchArgs) => Promise<SearchResponse>;
+    setRating: (args: SetRatingArgs) => Promise<RatingResponse>;
+    updatePlaylist: (args: UpdatePlaylistArgs) => Promise<UpdatePlaylistResponse>;
+}>;

src/renderer/api/utils.ts

@@ -1,9 +1,20 @@
 import { AxiosHeaders } from 'axios';
-import { z } from 'zod';
 import { toast } from '/@/renderer/components';
 import { useAuthStore } from '/@/renderer/store';
-import { ServerListItem } from '/@/renderer/api/types';
-import { ServerFeature } from '/@/renderer/api/features-types';
+import { ServerListItem } from '/@/renderer/types';
+import {
+    Album,
+    AlbumArtist,
+    AlbumArtistListSort,
+    AlbumListSort,
+    QueueSong,
+    SongListSort,
+    SortOrder,
+} from '/@/renderer/api/types';
+import orderBy from 'lodash/orderBy';
+import reverse from 'lodash/reverse';
+import shuffle from 'lodash/shuffle';
+import { z } from 'zod';
 
 // Since ts-rest client returns a strict response type, we need to add the headers to the body object
 export const resultWithHeaders = <ItemType extends z.ZodTypeAny>(itemSchema: ItemType) => {
@@ -40,10 +51,177 @@ export const authenticationFailure = (currentServer: ServerListItem | null) => {
     }
 };
 
-export const hasFeature = (server: ServerListItem | null, feature: ServerFeature): boolean => {
-    if (!server || !server.features) {
-        return false;
+export const sortAlbumList = (albums: Album[], sortBy: AlbumListSort, sortOrder: SortOrder) => {
+    let results = albums;
+
+    const order = sortOrder === SortOrder.ASC ? 'asc' : 'desc';
+
+    switch (sortBy) {
+        case AlbumListSort.ALBUM_ARTIST:
+            results = orderBy(
+                results,
+                ['albumArtist', (v) => v.name.toLowerCase()],
+                [order, 'asc'],
+            );
+            break;
+        case AlbumListSort.DURATION:
+            results = orderBy(results, ['duration'], [order]);
+            break;
+        case AlbumListSort.FAVORITED:
+            results = orderBy(results, ['starred'], [order]);
+            break;
+        case AlbumListSort.NAME:
+            results = orderBy(results, [(v) => v.name.toLowerCase()], [order]);
+            break;
+        case AlbumListSort.PLAY_COUNT:
+            results = orderBy(results, ['playCount'], [order]);
+            break;
+        case AlbumListSort.RANDOM:
+            results = shuffle(results);
+            break;
+        case AlbumListSort.RECENTLY_ADDED:
+            results = orderBy(results, ['createdAt'], [order]);
+            break;
+        case AlbumListSort.RECENTLY_PLAYED:
+            results = orderBy(results, ['lastPlayedAt'], [order]);
+            break;
+        case AlbumListSort.RATING:
+            results = orderBy(results, ['userRating'], [order]);
+            break;
+        case AlbumListSort.YEAR:
+            results = orderBy(results, ['releaseYear'], [order]);
+            break;
+        case AlbumListSort.SONG_COUNT:
+            results = orderBy(results, ['songCount'], [order]);
+            break;
+        default:
+            break;
     }
 
-    return server.features[feature] ?? false;
+    return results;
+};
+
+export const sortSongList = (songs: QueueSong[], sortBy: SongListSort, sortOrder: SortOrder) => {
+    let results = songs;
+
+    const order = sortOrder === SortOrder.ASC ? 'asc' : 'desc';
+
+    switch (sortBy) {
+        case SongListSort.ALBUM:
+            results = orderBy(
+                results,
+                [(v) => v.album?.toLowerCase(), 'discNumber', 'trackNumber'],
+                [order, 'asc', 'asc'],
+            );
+            break;
+
+        case SongListSort.ALBUM_ARTIST:
+            results = orderBy(
+                results,
+                ['albumArtist', (v) => v.album?.toLowerCase(), 'discNumber', 'trackNumber'],
+                [order, order, 'asc', 'asc'],
+            );
+            break;
+
+        case SongListSort.ARTIST:
+            results = orderBy(
+                results,
+                ['artist', (v) => v.album?.toLowerCase(), 'discNumber', 'trackNumber'],
+                [order, order, 'asc', 'asc'],
+            );
+            break;
+
+        case SongListSort.DURATION:
+            results = orderBy(results, ['duration'], [order]);
+            break;
+
+        case SongListSort.FAVORITED:
+            results = orderBy(results, ['userFavorite', (v) => v.name.toLowerCase()], [order]);
+            break;
+
+        case SongListSort.GENRE:
+            results = orderBy(
+                results,
+                [
+                    (v) => v.genres?.[0].name.toLowerCase(),
+                    (v) => v.album?.toLowerCase(),
+                    'discNumber',
+                    'trackNumber',
+                ],
+                [order, order, 'asc', 'asc'],
+            );
+            break;
+
+        case SongListSort.ID:
+            if (order === 'desc') {
+                results = reverse(results);
+            }
+            break;
+
+        case SongListSort.NAME:
+            results = orderBy(results, [(v) => v.name.toLowerCase()], [order]);
+            break;
+
+        case SongListSort.PLAY_COUNT:
+            results = orderBy(results, ['playCount'], [order]);
+            break;
+
+        case SongListSort.RANDOM:
+            results = shuffle(results);
+            break;
+
+        case SongListSort.RATING:
+            results = orderBy(results, ['userRating', (v) => v.name.toLowerCase()], [order]);
+            break;
+
+        case SongListSort.RECENTLY_ADDED:
+            results = orderBy(results, ['created'], [order]);
+            break;
+
+        case SongListSort.YEAR:
+            results = orderBy(
+                results,
+                ['year', (v) => v.album?.toLowerCase(), 'discNumber', 'track'],
+                [order, 'asc', 'asc', 'asc'],
+            );
+            break;
+
+        default:
+            break;
+    }
+
+    return results;
+};
+
+export const sortAlbumArtistList = (
+    artists: AlbumArtist[],
+    sortBy: AlbumArtistListSort,
+    sortOrder: SortOrder,
+) => {
+    const order = sortOrder === SortOrder.ASC ? 'asc' : 'desc';
+
+    let results = artists;
+
+    switch (sortBy) {
+        case AlbumArtistListSort.ALBUM_COUNT:
+            results = orderBy(artists, ['albumCount', (v) => v.name.toLowerCase()], [order, 'asc']);
+            break;
+
+        case AlbumArtistListSort.NAME:
+            results = orderBy(artists, [(v) => v.name.toLowerCase()], [order]);
+            break;
+
+        case AlbumArtistListSort.FAVORITED:
+            results = orderBy(artists, ['starred'], [order]);
+            break;
+
+        case AlbumArtistListSort.RATING:
+            results = orderBy(artists, ['userRating'], [order]);
+            break;
+
+        default:
+            break;
+    }
+
+    return results;
 };

src/renderer/app.tsx

@@ -27,16 +27,15 @@ import { FontType, PlaybackType, PlayerStatus } from '/@/renderer/types';
 import '@ag-grid-community/styles/ag-grid.css';
 import { useDiscordRpc } from '/@/renderer/features/discord-rpc/use-discord-rpc';
 import i18n from '/@/i18n/i18n';
-import { useServerVersion } from '/@/renderer/hooks/use-server-version';
 
 ModuleRegistry.registerModules([ClientSideRowModelModule, InfiniteRowModelModule]);
 
 initSimpleImg({ threshold: 0.05 }, true);
 
 const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
+const mpvPlayerListener = isElectron() ? window.electron.mpvPlayerListener : null;
 const ipc = isElectron() ? window.electron.ipc : null;
 const remote = isElectron() ? window.electron.remote : null;
-const utils = isElectron() ? window.electron.utils : null;
 
 export const App = () => {
     const theme = useTheme();
@@ -50,7 +49,6 @@ export const App = () => {
     const remoteSettings = useRemoteSettings();
     const textStyleRef = useRef<HTMLStyleElement>();
     useDiscordRpc();
-    useServerVersion();
 
     useEffect(() => {
         if (type === FontType.SYSTEM && system) {
@@ -99,31 +97,28 @@ export const App = () => {
     // Start the mpv instance on startup
     useEffect(() => {
         const initializeMpv = async () => {
-            if (playbackType === PlaybackType.LOCAL) {
-                const isRunning: boolean | undefined = await mpvPlayer?.isRunning();
+            const isRunning: boolean | undefined = await mpvPlayer?.isRunning();
 
-                mpvPlayer?.stop();
+            mpvPlayer?.stop();
 
-                if (!isRunning) {
-                    const extraParameters = useSettingsStore.getState().playback.mpvExtraParameters;
-                    const properties: Record<string, any> = {
-                        speed: usePlayerStore.getState().current.speed,
-                        ...getMpvProperties(useSettingsStore.getState().playback.mpvProperties),
-                    };
+            if (!isRunning) {
+                const extraParameters = useSettingsStore.getState().playback.mpvExtraParameters;
+                const properties: Record<string, any> = {
+                    speed: usePlayerStore.getState().current.speed,
+                    ...getMpvProperties(useSettingsStore.getState().playback.mpvProperties),
+                };
 
-                    await mpvPlayer?.initialize({
-                        extraParameters,
-                        properties,
-                    });
+                mpvPlayer?.initialize({
+                    extraParameters,
+                    properties,
+                });
 
-                    mpvPlayer?.volume(properties.volume);
-                }
+                mpvPlayer?.volume(properties.volume);
             }
-
-            utils?.restoreQueue();
+            mpvPlayer?.restoreQueue();
         };
 
-        if (isElectron()) {
+        if (isElectron() && playbackType === PlaybackType.LOCAL) {
             initializeMpv();
         }
 
@@ -141,8 +136,8 @@ export const App = () => {
     }, [bindings]);
 
     useEffect(() => {
-        if (utils) {
-            utils.onSaveQueue(() => {
+        if (isElectron()) {
+            mpvPlayerListener!.rendererSaveQueue(() => {
                 const { current, queue } = usePlayerStore.getState();
                 const stateToSave: Partial<Pick<PlayerState, 'current' | 'queue'>> = {
                     current: {
@@ -151,10 +146,10 @@ export const App = () => {
                     },
                     queue,
                 };
-                utils.saveQueue(stateToSave);
+                mpvPlayer!.saveQueue(stateToSave);
             });
 
-            utils.onRestoreQueue((_event: any, data) => {
+            mpvPlayerListener!.rendererRestoreQueue((_event: any, data) => {
                 const playerData = restoreQueue(data);
                 if (playbackType === PlaybackType.LOCAL) {
                     mpvPlayer!.setQueue(playerData, true);
@@ -163,8 +158,8 @@ export const App = () => {
         }
 
         return () => {
-            ipc?.removeAllListeners('renderer-restore-queue');
-            ipc?.removeAllListeners('renderer-save-queue');
+            ipc?.removeAllListeners('renderer-player-restore-queue');
+            ipc?.removeAllListeners('renderer-player-save-queue');
         };
     }, [playbackType, restoreQueue]);
 

src/renderer/components/audio-player/index.tsx

@@ -7,11 +7,10 @@ import {
     crossfadeHandler,
     gaplessHandler,
 } from '/@/renderer/components/audio-player/utils/list-handlers';
-import { useSettingsStore, useSettingsStoreActions } from '/@/renderer/store/settings.store';
+import { useSettingsStore } from '/@/renderer/store/settings.store';
 import type { CrossfadeStyle } from '/@/renderer/types';
 import { PlaybackStyle, PlayerStatus } from '/@/renderer/types';
 import { useSpeed } from '/@/renderer/store';
-import { toast } from '/@/renderer/components/toast';
 
 interface AudioPlayerProps extends ReactPlayerProps {
     crossfadeDuration: number;
@@ -40,14 +39,6 @@ type WebAudio = {
     gain: GainNode;
 };
 
-// Credits: http://stackoverflow.com/questions/12150729/ddg
-// This is used so that the player will always have an <audio> element. This means that
-// player1Source and player2Source are connected BEFORE the user presses play for
-// the first time. This workaround is important for Safari, which seems to require the
-// source to be connected PRIOR to resuming audio context
-const EMPTY_SOURCE =
-    'data:audio/wav;base64,UklGRjIAAABXQVZFZm10IBIAAAABAAEAQB8AAEAfAAABAAgAAABmYWN0BAAAAAAAAABkYXRhAAAAAA==';
-
 export const AudioPlayer = forwardRef(
     (
         {
@@ -69,7 +60,6 @@ export const AudioPlayer = forwardRef(
         const [isTransitioning, setIsTransitioning] = useState(false);
         const audioDeviceId = useSettingsStore((state) => state.playback.audioDeviceId);
         const playback = useSettingsStore((state) => state.playback.mpvProperties);
-        const { resetSampleRate } = useSettingsStoreActions();
         const playbackSpeed = useSpeed();
 
         const [webAudio, setWebAudio] = useState<WebAudio | null>(null);
@@ -79,7 +69,6 @@ export const AudioPlayer = forwardRef(
         const [player2Source, setPlayer2Source] = useState<MediaElementAudioSourceNode | null>(
             null,
         );
-
         const calculateReplayGain = useCallback(
             (song: Song): number => {
                 if (playback.replayGainMode === 'no') {
@@ -130,21 +119,10 @@ export const AudioPlayer = forwardRef(
 
         useEffect(() => {
             if ('AudioContext' in window) {
-                let context: AudioContext;
-
-                try {
-                    context = new AudioContext({
-                        latencyHint: 'playback',
-                        sampleRate: playback.audioSampleRateHz || undefined,
-                    });
-                } catch (error) {
-                    // In practice, this should never be hit because the UI should validate
-                    // the range. However, the actual supported range is not guaranteed
-                    toast.error({ message: (error as Error).message });
-                    context = new AudioContext({ latencyHint: 'playback' });
-                    resetSampleRate();
-                }
-
+                const context = new AudioContext({
+                    latencyHint: 'playback',
+                    sampleRate: playback.audioSampleRateHz || undefined,
+                });
                 const gain = context.createGain();
                 gain.connect(context.destination);
 
@@ -176,18 +154,9 @@ export const AudioPlayer = forwardRef(
         useEffect(() => {
             if (status === PlayerStatus.PLAYING) {
                 if (currentPlayer === 1) {
-                    // calling play() is not necessarily a safe option (https://developer.chrome.com/blog/play-request-was-interrupted)
-                    // In practice, this failure is only likely to happen when using the 0-second wav:
-                    // play() + play() in rapid succession will cause problems as the frist one ends the track.
-                    player1Ref.current
-                        ?.getInternalPlayer()
-                        ?.play()
-                        .catch(() => {});
+                    player1Ref.current?.getInternalPlayer()?.play();
                 } else {
-                    player2Ref.current
-                        ?.getInternalPlayer()
-                        ?.play()
-                        .catch(() => {});
+                    player2Ref.current?.getInternalPlayer()?.play();
                 }
             } else {
                 player1Ref.current?.getInternalPlayer()?.pause();
@@ -274,29 +243,32 @@ export const AudioPlayer = forwardRef(
         }, [audioDeviceId]);
 
         useEffect(() => {
-            if (webAudio && player1Source && player1 && currentPlayer === 1) {
-                const newVolume = calculateReplayGain(player1) * volume;
-                webAudio.gain.gain.setValueAtTime(newVolume, 0);
+            if (webAudio && player1Source) {
+                if (player1 === undefined) {
+                    player1Source.disconnect();
+                    setPlayer1Source(null);
+                } else if (currentPlayer === 1) {
+                    webAudio.gain.gain.setValueAtTime(calculateReplayGain(player1), 0);
+                }
             }
-        }, [calculateReplayGain, currentPlayer, player1, player1Source, volume, webAudio]);
+        }, [calculateReplayGain, currentPlayer, player1, player1Source, webAudio]);
 
         useEffect(() => {
-            if (webAudio && player2Source && player2 && currentPlayer === 2) {
-                const newVolume = calculateReplayGain(player2) * volume;
-                webAudio.gain.gain.setValueAtTime(newVolume, 0);
+            if (webAudio && player2Source) {
+                if (player2 === undefined) {
+                    player2Source.disconnect();
+                    setPlayer2Source(null);
+                } else if (currentPlayer === 2) {
+                    webAudio.gain.gain.setValueAtTime(calculateReplayGain(player2), 0);
+                }
             }
-        }, [calculateReplayGain, currentPlayer, player2, player2Source, volume, webAudio]);
+        }, [calculateReplayGain, currentPlayer, player2, player2Source, webAudio]);
 
         const handlePlayer1Start = useCallback(
             async (player: ReactPlayer) => {
-                if (!webAudio) return;
-                if (player1Source) {
-                    // This should fire once, only if the source is real (meaning we
-                    // saw the dummy source) and the context is not ready
-                    if (webAudio.context.state !== 'running') {
-                        await webAudio.context.resume();
-                    }
-                    return;
+                if (!webAudio || player1Source) return;
+                if (webAudio.context.state !== 'running') {
+                    await webAudio.context.resume();
                 }
 
                 const internal = player.getInternalPlayer() as HTMLMediaElement | undefined;
@@ -312,12 +284,9 @@ export const AudioPlayer = forwardRef(
 
         const handlePlayer2Start = useCallback(
             async (player: ReactPlayer) => {
-                if (!webAudio) return;
-                if (player2Source) {
-                    if (webAudio.context.state !== 'running') {
-                        await webAudio.context.resume();
-                    }
-                    return;
+                if (!webAudio || player2Source) return;
+                if (webAudio.context.state !== 'running') {
+                    await webAudio.context.resume();
                 }
 
                 const internal = player.getInternalPlayer() as HTMLMediaElement | undefined;
@@ -331,9 +300,6 @@ export const AudioPlayer = forwardRef(
             [player2Source, webAudio],
         );
 
-        // Bugfix for Safari: rather than use the `<audio>` volume (which doesn't work),
-        // use the GainNode to scale the volume. In this case, for compatibility with
-        // other browsers, set the `<audio>` volume to 1
         return (
             <>
                 <ReactPlayer
@@ -346,11 +312,10 @@ export const AudioPlayer = forwardRef(
                     playbackRate={playbackSpeed}
                     playing={currentPlayer === 1 && status === PlayerStatus.PLAYING}
                     progressInterval={isTransitioning ? 10 : 250}
-                    url={player1?.streamUrl || EMPTY_SOURCE}
-                    volume={webAudio ? 1 : volume}
+                    url={player1?.streamUrl}
+                    volume={volume}
                     width={0}
-                    // If there is no stream url, we do not need to handle when the audio finishes
-                    onEnded={player1?.streamUrl ? handleOnEnded : undefined}
+                    onEnded={handleOnEnded}
                     onProgress={
                         playbackStyle === PlaybackStyle.GAPLESS ? handleGapless1 : handleCrossfade1
                     }
@@ -366,10 +331,10 @@ export const AudioPlayer = forwardRef(
                     playbackRate={playbackSpeed}
                     playing={currentPlayer === 2 && status === PlayerStatus.PLAYING}
                     progressInterval={isTransitioning ? 10 : 250}
-                    url={player2?.streamUrl || EMPTY_SOURCE}
-                    volume={webAudio ? 1 : volume}
+                    url={player2?.streamUrl}
+                    volume={volume}
                     width={0}
-                    onEnded={player2?.streamUrl ? handleOnEnded : undefined}
+                    onEnded={handleOnEnded}
                     onProgress={
                         playbackStyle === PlaybackStyle.GAPLESS ? handleGapless2 : handleCrossfade2
                     }

src/renderer/components/audio-player/utils/list-handlers.ts

@@ -23,10 +23,7 @@ export const gaplessHandler = (args: {
 
     const durationPadding = isFlac ? 0.065 : 0.116;
     if (currentTime + durationPadding >= duration) {
-        return nextPlayerRef.current
-            .getInternalPlayer()
-            ?.play()
-            .catch(() => {});
+        return nextPlayerRef.current.getInternalPlayer()?.play();
     }
 
     return null;
@@ -64,10 +61,7 @@ export const crossfadeHandler = (args: {
 
         if (shouldBeginTransition) {
             setIsTransitioning(true);
-            return nextPlayerRef.current
-                .getInternalPlayer()
-                ?.play()
-                .catch(() => {});
+            return nextPlayerRef.current.getInternalPlayer().play();
         }
         return null;
     }

src/renderer/components/card/card-rows.tsx

@@ -275,7 +275,7 @@ export const PLAYLIST_CARD_ROWS: { [key: string]: CardRow<Playlist> } = {
     name: {
         property: 'name',
         route: {
-            route: AppRoute.PLAYLISTS_DETAIL,
+            route: AppRoute.PLAYLISTS_DETAIL_SONGS,
             slugs: [{ idProperty: 'id', slugProperty: 'playlistId' }],
         },
     },

src/renderer/components/grid-carousel/index.tsx

@@ -4,7 +4,6 @@ import {
     ReactNode,
     useCallback,
     useEffect,
-    useLayoutEffect,
     useMemo,
     useRef,
     useState,
@@ -115,11 +114,9 @@ export const SwiperGridCarousel = ({
     isLoading,
     uniqueId,
 }: SwiperGridCarouselProps) => {
-    const containerRef = useRef<HTMLDivElement>(null);
     const swiperRef = useRef<SwiperCore | any>(null);
     const playButtonBehavior = usePlayButtonBehavior();
     const handlePlayQueueAdd = usePlayQueueAdd();
-    const [slideCount, setSlideCount] = useState(4);
 
     useEffect(() => {
         swiperRef.current?.slideTo(0, 0);
@@ -194,24 +191,23 @@ export const SwiperGridCarousel = ({
 
     const handleNext = useCallback(() => {
         const activeIndex = swiperRef?.current?.activeIndex || 0;
-        const slidesPerView = Math.round(Number(swiperProps?.slidesPerView || slideCount));
+        const slidesPerView = Math.round(Number(swiperProps?.slidesPerView || 4));
         swiperRef?.current?.slideTo(activeIndex + slidesPerView);
-    }, [slideCount, swiperProps?.slidesPerView]);
+    }, [swiperProps?.slidesPerView]);
 
     const handlePrev = useCallback(() => {
         const activeIndex = swiperRef?.current?.activeIndex || 0;
-        const slidesPerView = Math.round(Number(swiperProps?.slidesPerView || slideCount));
+        const slidesPerView = Math.round(Number(swiperProps?.slidesPerView || 4));
         swiperRef?.current?.slideTo(activeIndex - slidesPerView);
-    }, [slideCount, swiperProps?.slidesPerView]);
+    }, [swiperProps?.slidesPerView]);
 
     const handleOnSlideChange = useCallback((e: SwiperCore) => {
         const { slides, isEnd, isBeginning, params } = e;
         if (isEnd || isBeginning) return;
 
-        const slideCount = (params.slidesPerView as number | undefined) || 4;
         setPagination({
-            hasNextPage: slideCount < slides.length,
-            hasPreviousPage: slideCount < slides.length,
+            hasNextPage: (params?.slidesPerView || 4) < slides.length,
+            hasPreviousPage: (params?.slidesPerView || 4) < slides.length,
         });
     }, []);
 
@@ -219,67 +215,42 @@ export const SwiperGridCarousel = ({
         const { slides, isEnd, isBeginning, params } = e;
         if (isEnd || isBeginning) return;
 
-        const slideCount = (params.slidesPerView as number | undefined) || 4;
         setPagination({
-            hasNextPage: slideCount < slides.length,
-            hasPreviousPage: slideCount < slides.length,
+            hasNextPage: (params.slidesPerView || 4) < slides.length,
+            hasPreviousPage: (params.slidesPerView || 4) < slides.length,
         });
     }, []);
 
     const handleOnReachEnd = useCallback((e: SwiperCore) => {
         const { slides, params } = e;
 
-        const slideCount = (params.slidesPerView as number | undefined) || 4;
         setPagination({
             hasNextPage: false,
-            hasPreviousPage: slideCount < slides.length,
+            hasPreviousPage: (params.slidesPerView || 4) < slides.length,
         });
     }, []);
 
     const handleOnReachBeginning = useCallback((e: SwiperCore) => {
         const { slides, params } = e;
 
-        const slideCount = (params.slidesPerView as number | undefined) || 4;
         setPagination({
-            hasNextPage: slideCount < slides.length,
+            hasNextPage: (params.slidesPerView || 4) < slides.length,
             hasPreviousPage: false,
         });
     }, []);
 
-    useLayoutEffect(() => {
-        const handleResize = () => {
-            // Use the container div ref and not swiper width, as this value is more accurate
-            const width = containerRef.current?.clientWidth;
-            const { activeIndex, params, slides } =
-                (swiperRef.current as SwiperCore | undefined) ?? {};
-
-            if (width) {
-                const slidesPerView = getSlidesPerView(width);
-                setSlideCount(slidesPerView);
-            }
-
-            if (activeIndex !== undefined && slides && params?.slidesPerView) {
-                const slideCount = (params.slidesPerView as number | undefined) || 4;
-                setPagination({
-                    hasNextPage: activeIndex + slideCount < slides.length,
-                    hasPreviousPage: activeIndex > 0,
-                });
-            }
-        };
-
-        handleResize();
-
-        const throttledResize = throttle(handleResize, 200);
-        window.addEventListener('resize', throttledResize);
-
-        return () => {
-            window.removeEventListener('resize', throttledResize);
-        };
+    const handleOnResize = useCallback((e: SwiperCore) => {
+        if (!e) return;
+        const { width } = e;
+        const slidesPerView = getSlidesPerView(width);
+        if (!e.params) return;
+        e.params.slidesPerView = slidesPerView;
     }, []);
 
+    const throttledOnResize = throttle(handleOnResize, 200);
+
     return (
         <CarouselContainer
-            ref={containerRef}
             className="grid-carousel"
             spacing="md"
         >
@@ -295,14 +266,16 @@ export const SwiperGridCarousel = ({
                 ref={swiperRef}
                 resizeObserver
                 modules={[Virtual]}
-                slidesPerView={slideCount}
+                slidesPerView={4}
                 spaceBetween={20}
                 style={{ height: '100%', width: '100%' }}
                 onBeforeInit={(swiper) => {
                     swiperRef.current = swiper;
                 }}
+                onBeforeResize={handleOnResize}
                 onReachBeginning={handleOnReachBeginning}
                 onReachEnd={handleOnReachEnd}
+                onResize={throttledOnResize}
                 onSlideChange={handleOnSlideChange}
                 onZoomChange={handleOnZoomChange}
                 {...swiperProps}

src/renderer/components/index.ts

@@ -27,7 +27,6 @@ export * from './select';
 export * from './skeleton';
 export * from './slider';
 export * from './spinner';
-export * from './spoiler';
 export * from './switch';
 export * from './tabs';
 export * from './text';

src/renderer/components/spoiler/index.tsx

@@ -1,39 +0,0 @@
-import clsx from 'clsx';
-import { HTMLAttributes, ReactNode, useRef, useState } from 'react';
-import styles from './spoiler.module.scss';
-import { useIsOverflow } from '/@/renderer/hooks';
-
-interface SpoilerProps extends HTMLAttributes<HTMLDivElement> {
-    children?: ReactNode;
-    defaultOpened?: boolean;
-    maxHeight?: number;
-}
-
-export const Spoiler = ({ maxHeight, defaultOpened, children, ...props }: SpoilerProps) => {
-    const ref = useRef(null);
-    const isOverflow = useIsOverflow(ref);
-    const [isExpanded, setIsExpanded] = useState(!!defaultOpened);
-
-    const spoilerClassNames = clsx(styles.spoiler, {
-        [styles.canExpand]: isOverflow,
-        [styles.isExpanded]: isExpanded,
-    });
-
-    const handleToggleExpand = () => {
-        setIsExpanded((val) => !val);
-    };
-
-    return (
-        <div
-            ref={ref}
-            className={spoilerClassNames}
-            role="button"
-            style={{ maxHeight: maxHeight ?? '100px' }}
-            tabIndex={-1}
-            onClick={handleToggleExpand}
-            {...props}
-        >
-            {children}
-        </div>
-    );
-};

src/renderer/components/spoiler/spoiler.module.scss

@@ -1,31 +0,0 @@
-.control:hover {
-    color: var(--btn-subtle-fg-hover);
-    text-decoration: none;
-}
-
-.spoiler {
-    position: relative;
-    text-align: justify;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-}
-
-.spoiler:not(.is-expanded).can-expand:after {
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    height: 100%;
-    content: '';
-    background: linear-gradient(to top, var(--main-bg) 10%, transparent 60%);
-    pointer-events: none;
-}
-
-.spoiler.can-expand {
-    cursor: pointer;
-}
-
-.spoiler.is-expanded {
-    max-height: 2500px !important;
-}

src/renderer/components/toast/index.tsx

@@ -30,7 +30,7 @@ const showToast = ({ type, ...props }: NotificationProps) => {
             ? 'Error'
             : 'Info';
 
-    const defaultDuration = type === 'error' ? 5000 : 2000;
+    const defaultDuration = type === 'error' ? 2000 : 1000;
 
     return showNotification({
         autoClose: defaultDuration,

src/renderer/components/virtual-grid/virtual-infinite-grid.tsx

@@ -72,7 +72,7 @@ export const VirtualInfiniteGrid = forwardRef(
         const [itemData, setItemData] = useState<any[]>(fetchInitialData?.() || []);
 
         const { itemHeight, rowCount, columnCount } = useMemo(() => {
-            const itemsPerRow = width ? Math.floor(width / (itemSize + itemGap * 2)) : 5;
+            const itemsPerRow = width ? Math.floor(width / itemSize) : 5;
             const widthPerItem = Number(width) / itemsPerRow;
             const itemHeight = widthPerItem + cardRows.length * 26;
 
@@ -81,7 +81,7 @@ export const VirtualInfiniteGrid = forwardRef(
                 itemHeight,
                 rowCount: Math.ceil(itemCount / itemsPerRow),
             };
-        }, [cardRows.length, itemCount, itemGap, itemSize, width]);
+        }, [cardRows.length, itemCount, itemSize, width]);
 
         const isItemLoaded = useCallback(
             (index: number) => {

src/renderer/components/virtual-table/cells/combined-title-cell.tsx

@@ -10,7 +10,7 @@ import styled from 'styled-components';
 import type { AlbumArtist, Artist } from '/@/renderer/api/types';
 import { Text } from '/@/renderer/components/text';
 import { AppRoute } from '/@/renderer/router/routes';
-import { ServerType } from '/@/renderer/api/types';
+import { ServerType } from '/@/renderer/types';
 import { Skeleton } from '/@/renderer/components/skeleton';
 
 const CellContainer = styled(motion.div)<{ height: number }>`

src/renderer/components/virtual-table/cells/note-cell.tsx

@@ -3,7 +3,17 @@ import { Skeleton } from '/@/renderer/components/skeleton';
 import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell';
 import { useMemo } from 'react';
 import { Text } from '/@/renderer/components/text';
-import { replaceURLWithHTMLLinks } from '/@/renderer/utils/linkify';
+
+const URL_REGEX =
+    /((?:https?:\/\/)?(?:[\w-]{1,32}(?:\.[\w-]{1,32})+)(?:\/[\w\-./?%&=][^.|^\s]*)?)/g;
+
+const replaceURLWithHTMLLinks = (text: string) => {
+    const urlRegex = new RegExp(URL_REGEX, 'g');
+    return text.replaceAll(
+        urlRegex,
+        (url) => `<a href="${url}" target="_blank" rel="noreferrer">${url}</a>`,
+    );
+};
 
 export const NoteCell = ({ value }: ICellRendererParams) => {
     const formattedValue = useMemo(() => {
@@ -29,10 +39,9 @@ export const NoteCell = ({ value }: ICellRendererParams) => {
         <CellContainer $position="left">
             <Text
                 $secondary
+                dangerouslySetInnerHTML={{ __html: formattedValue }}
                 overflow="hidden"
-            >
-                {formattedValue}
-            </Text>
+            />
         </CellContainer>
     );
 };

src/renderer/components/virtual-table/hooks/use-rating.ts

@@ -11,9 +11,9 @@ import {
     LibraryItem,
     AnyLibraryItems,
     RatingResponse,
-    ServerType,
 } from '/@/renderer/api/types';
 import { useSetAlbumListItemDataById, useSetQueueRating, getServerById } from '/@/renderer/store';
+import { ServerType } from '/@/renderer/types';
 
 export const useUpdateRating = () => {
     const queryClient = useQueryClient();

src/renderer/components/virtual-table/hooks/use-virtual-table.ts

@@ -16,12 +16,12 @@ import orderBy from 'lodash/orderBy';
 import { generatePath, useNavigate } from 'react-router';
 import { api } from '/@/renderer/api';
 import { QueryPagination, queryKeys } from '/@/renderer/api/query-keys';
-import { BasePaginatedResponse, LibraryItem, ServerListItem } from '/@/renderer/api/types';
+import { BasePaginatedResponse, LibraryItem } from '/@/renderer/api/types';
 import { getColumnDefs, VirtualTableProps } from '/@/renderer/components/virtual-table';
 import { SetContextMenuItems, useHandleTableContextMenu } from '/@/renderer/features/context-menu';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useListStoreActions } from '/@/renderer/store';
-import { ListDisplayType, TablePagination } from '/@/renderer/types';
+import { ListDisplayType, ServerListItem, TablePagination } from '/@/renderer/types';
 import { useSearchParams } from 'react-router-dom';
 import { ListKey, useListStoreByKey } from '../../../store/list.store';
 
@@ -34,6 +34,7 @@ interface UseAgGridProps<TFilter> {
     columnType?: 'albumDetail' | 'generic';
     contextMenu: SetContextMenuItems;
     customFilters?: Partial<TFilter>;
+    isClientSide?: boolean;
     isClientSideSort?: boolean;
     isSearchParams?: boolean;
     itemCount?: number;
@@ -43,6 +44,8 @@ interface UseAgGridProps<TFilter> {
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
+const BLOCK_SIZE = 500;
+
 export const useVirtualTable = <TFilter>({
     server,
     tableRef,
@@ -52,6 +55,7 @@ export const useVirtualTable = <TFilter>({
     itemCount,
     customFilters,
     isSearchParams,
+    isClientSide,
     isClientSideSort,
     columnType,
 }: UseAgGridProps<TFilter>) => {
@@ -182,6 +186,19 @@ export const useVirtualTable = <TFilter>({
                         return;
                     }
 
+                    if (results.totalRecordCount === null) {
+                        const hasMoreRows = results?.items?.length === BLOCK_SIZE;
+                        const lastRowIndex = hasMoreRows
+                            ? undefined
+                            : (properties.filter.offset || 0) + results.items.length;
+
+                        params.successCallback(
+                            results?.items || [],
+                            hasMoreRows ? undefined : lastRowIndex,
+                        );
+                        return;
+                    }
+
                     params.successCallback(results?.items || [], results?.totalRecordCount || 0);
                 },
                 rowCount: undefined,
@@ -321,6 +338,7 @@ export const useVirtualTable = <TFilter>({
             alwaysShowHorizontalScroll: true,
             autoFitColumns: properties.table.autoFit,
             blockLoadDebounceMillis: 200,
+            cacheBlockSize: 500,
             getRowId: (data: GetRowIdParams<any>) => data.data.id,
             infiniteInitialRowCount: itemCount || 100,
             pagination: isPaginationEnabled,
@@ -335,10 +353,11 @@ export const useVirtualTable = <TFilter>({
                 : undefined,
             rowBuffer: 20,
             rowHeight: properties.table.rowHeight || 40,
-            rowModelType: 'infinite' as RowModelType,
+            rowModelType: isClientSide ? 'clientSide' : ('infinite' as RowModelType),
             suppressRowDrag: true,
         };
     }, [
+        isClientSide,
         isPaginationEnabled,
         isSearchParams,
         itemCount,
@@ -370,7 +389,9 @@ export const useVirtualTable = <TFilter>({
                     );
                     break;
                 case LibraryItem.PLAYLIST:
-                    navigate(generatePath(AppRoute.PLAYLISTS_DETAIL, { playlistId: e.data.id }));
+                    navigate(
+                        generatePath(AppRoute.PLAYLISTS_DETAIL_SONGS, { playlistId: e.data.id }),
+                    );
                     break;
                 default:
                     break;

src/renderer/components/virtual-table/index.tsx

@@ -158,14 +158,6 @@ const tableColumns: { [key: string]: ColDef } = {
             params.data ? params.data.channels : undefined,
         width: 100,
     },
-    codec: {
-        cellRenderer: (params: ICellRendererParams) => GenericCell(params, { position: 'center' }),
-        colId: TableColumn.CODEC,
-        headerName: i18n.t('table.column.codec'),
-        valueGetter: (params: ValueGetterParams) =>
-            params.data ? params.data.container : undefined,
-        width: 60,
-    },
     comment: {
         cellRenderer: NoteCell,
         colId: TableColumn.COMMENT,

src/renderer/components/virtual-table/table-config-dropdown.tsx

@@ -60,10 +60,6 @@ export const SONG_TABLE_COLUMNS = [
         label: i18n.t('table.config.label.bitrate', { postProcess: 'titleCase' }),
         value: TableColumn.BIT_RATE,
     },
-    {
-        label: i18n.t('table.config.label.codec', { postProcess: 'titleCase' }),
-        value: TableColumn.CODEC,
-    },
     {
         label: i18n.t('table.config.label.lastPlayed', { postProcess: 'titleCase' }),
         value: TableColumn.LAST_PLAYED,

src/renderer/features/action-required/components/mpv-required.tsx

@@ -1,36 +1,23 @@
 import { useEffect, useState } from 'react';
 import isElectron from 'is-electron';
-import { FileInput, Text, Button, Checkbox } from '/@/renderer/components';
-import { usePlaybackSettings, useSettingsStoreActions } from '/@/renderer/store';
-import { PlaybackType } from '/@/renderer/types';
-import { useTranslation } from 'react-i18next';
+import { FileInput, Text, Button } from '/@/renderer/components';
 
 const localSettings = isElectron() ? window.electron.localSettings : null;
 
 export const MpvRequired = () => {
     const [mpvPath, setMpvPath] = useState('');
-    const settings = usePlaybackSettings();
-    const { setSettings } = useSettingsStoreActions();
-    const [disabled, setDisabled] = useState(false);
-    const { t } = useTranslation();
-
     const handleSetMpvPath = (e: File) => {
         localSettings?.set('mpv_path', e.path);
     };
 
-    const handleSetDisableMpv = (disabled: boolean) => {
-        setDisabled(disabled);
-        localSettings?.set('disable_mpv', disabled);
-
-        setSettings({
-            playback: { ...settings, type: disabled ? PlaybackType.WEB : PlaybackType.LOCAL },
-        });
-    };
-
     useEffect(() => {
-        if (!localSettings) return setMpvPath('');
-        const mpvPath = localSettings.get('mpv_path') as string;
-        return setMpvPath(mpvPath);
+        const getMpvPath = async () => {
+            if (!localSettings) return setMpvPath('');
+            const mpvPath = localSettings.get('mpv_path') as string;
+            return setMpvPath(mpvPath);
+        };
+
+        getMpvPath();
     }, []);
 
     return (
@@ -47,15 +34,9 @@ export const MpvRequired = () => {
                 </a>
             </Text>
             <FileInput
-                disabled={disabled}
                 placeholder={mpvPath}
                 onChange={handleSetMpvPath}
             />
-            <Text>{t('setting.disable_mpv', { context: 'description' })}</Text>
-            <Checkbox
-                label={t('setting.disableMpv')}
-                onChange={(e) => handleSetDisableMpv(e.currentTarget.checked)}
-            />
             <Button onClick={() => localSettings?.restart()}>Restart</Button>
         </>
     );

src/renderer/features/action-required/routes/action-required-route.tsx

@@ -1,22 +1,48 @@
+import { useState, useEffect } from 'react';
 import { Center, Group, Stack } from '@mantine/core';
+import isElectron from 'is-electron';
 import { useTranslation } from 'react-i18next';
 import { RiCheckFill } from 'react-icons/ri';
-import { Link } from 'react-router-dom';
+import { Link, Navigate } from 'react-router-dom';
 import { Button, PageHeader, Text } from '/@/renderer/components';
 import { ActionRequiredContainer } from '/@/renderer/features/action-required/components/action-required-container';
+import { MpvRequired } from '/@/renderer/features/action-required/components/mpv-required';
 import { ServerCredentialRequired } from '/@/renderer/features/action-required/components/server-credential-required';
 import { ServerRequired } from '/@/renderer/features/action-required/components/server-required';
 import { AnimatedPage } from '/@/renderer/features/shared';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer } from '/@/renderer/store';
 
+const localSettings = isElectron() ? window.electron.localSettings : null;
+
 const ActionRequiredRoute = () => {
     const { t } = useTranslation();
     const currentServer = useCurrentServer();
+    const [isMpvRequired, setIsMpvRequired] = useState(false);
     const isServerRequired = !currentServer;
-    const isCredentialRequired = currentServer && !currentServer.credential;
+    const isCredentialRequired = false;
+
+    useEffect(() => {
+        const getMpvPath = async () => {
+            if (!localSettings) return setIsMpvRequired(false);
+            const mpvPath = await localSettings.get('mpv_path');
+
+            if (mpvPath) {
+                return setIsMpvRequired(false);
+            }
+
+            return setIsMpvRequired(true);
+        };
+
+        getMpvPath();
+    }, []);
 
     const checks = [
+        {
+            component: <MpvRequired />,
+            title: t('error.mpvRequired', { postProcess: 'sentenceCase' }),
+            valid: !isMpvRequired,
+        },
         {
             component: <ServerCredentialRequired />,
             title: t('error.credentialsRequired', { postProcess: 'sentenceCase' }),
@@ -50,6 +76,7 @@ const ActionRequiredRoute = () => {
                     <Stack mt="2rem">
                         {canReturnHome && (
                             <>
+                                <Navigate to={AppRoute.HOME} />
                                 <Group
                                     noWrap
                                     position="center"

src/renderer/features/albums/components/album-detail-content.tsx

@@ -4,15 +4,13 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li
 import { Box, Group, Stack } from '@mantine/core';
 import { useSetState } from '@mantine/hooks';
 import { useTranslation } from 'react-i18next';
-import { FaLastfmSquare } from 'react-icons/fa';
 import { RiHeartFill, RiHeartLine, RiMoreFill, RiSettings2Fill } from 'react-icons/ri';
-import { SiMusicbrainz } from 'react-icons/si';
 import { generatePath, useParams } from 'react-router';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { AlbumListSort, LibraryItem, QueueSong, SortOrder } from '/@/renderer/api/types';
-import { Button, Popover, Spoiler } from '/@/renderer/components';
+import { Button, Popover } from '/@/renderer/components';
 import { MemoizedSwiperGridCarousel } from '/@/renderer/components/grid-carousel';
 import {
     TableConfigDropdown,
@@ -38,13 +36,11 @@ import { useAppFocus, useContainerQuery } from '/@/renderer/hooks';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer, useCurrentSong, useCurrentStatus } from '/@/renderer/store';
 import {
-    useGeneralSettings,
     usePlayButtonBehavior,
     useSettingsStoreActions,
     useTableSettings,
 } from '/@/renderer/store/settings.store';
 import { Play } from '/@/renderer/types';
-import { replaceURLWithHTMLLinks } from '/@/renderer/utils/linkify';
 
 const isFullWidthRow = (node: RowNode) => {
     return node.id?.startsWith('disc-');
@@ -58,7 +54,6 @@ const ContentContainer = styled.div`
 const DetailContainer = styled.div`
     display: flex;
     flex-direction: column;
-    gap: 2rem;
     padding: 1rem 2rem 5rem;
     overflow: hidden;
 `;
@@ -80,7 +75,6 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
     const status = useCurrentStatus();
     const isFocused = useAppFocus();
     const currentSong = useCurrentSong();
-    const { externalLinks } = useGeneralSettings();
 
     const columnDefs = useMemo(
         () => getColumnDefs(tableConfig.columns, false, 'albumDetail'),
@@ -285,7 +279,6 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
     };
 
     const showGenres = detailQuery?.data?.genres ? detailQuery?.data?.genres.length !== 0 : false;
-    const comment = detailQuery?.data?.comment;
 
     const handleGeneralContextMenu = useHandleGeneralContextMenu(
         LibraryItem.ALBUM,
@@ -320,8 +313,6 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
 
     const { rowClassRules } = useCurrentSongRowStyles({ tableRef });
 
-    const mbzId = detailQuery?.data?.mbzId;
-
     return (
         <ContentContainer>
             <LibraryBackgroundOverlay $backgroundColor={background} />
@@ -329,6 +320,7 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                 <Box component="section">
                     <Group
                         position="apart"
+                        py="1rem"
                         spacing="sm"
                     >
                         <Group>
@@ -380,7 +372,10 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                     </Group>
                 </Box>
                 {showGenres && (
-                    <Box component="section">
+                    <Box
+                        component="section"
+                        py="1rem"
+                    >
                         <Group spacing="sm">
                             {detailQuery?.data?.genres?.map((genre) => (
                                 <Button
@@ -400,51 +395,6 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                         </Group>
                     </Box>
                 )}
-                {externalLinks ? (
-                    <Box component="section">
-                        <Group spacing="sm">
-                            <Button
-                                compact
-                                component="a"
-                                href={`https://www.last.fm/music/${encodeURIComponent(
-                                    detailQuery?.data?.albumArtist || '',
-                                )}/${encodeURIComponent(detailQuery.data?.name || '')}`}
-                                radius="md"
-                                rel="noopener noreferrer"
-                                size="md"
-                                target="_blank"
-                                tooltip={{
-                                    label: t('action.openIn.lastfm'),
-                                }}
-                                variant="subtle"
-                            >
-                                <FaLastfmSquare size={25} />
-                            </Button>
-                            {mbzId ? (
-                                <Button
-                                    compact
-                                    component="a"
-                                    href={`https://musicbrainz.org/release/${mbzId}`}
-                                    radius="md"
-                                    rel="noopener noreferrer"
-                                    size="md"
-                                    target="_blank"
-                                    tooltip={{
-                                        label: t('action.openIn.musicbrainz'),
-                                    }}
-                                    variant="subtle"
-                                >
-                                    <SiMusicbrainz size={25} />
-                                </Button>
-                            ) : null}
-                        </Group>
-                    </Box>
-                ) : null}
-                {comment && (
-                    <Box component="section">
-                        <Spoiler maxHeight={75}>{replaceURLWithHTMLLinks(comment)}</Spoiler>
-                    </Box>
-                )}
                 <Box style={{ minHeight: '300px' }}>
                     <VirtualTable
                         key={`table-${tableConfig.rowHeight}`}

src/renderer/features/albums/components/album-list-header-filters.tsx

@@ -15,13 +15,14 @@ import {
     RiSettings3Fill,
 } from 'react-icons/ri';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { AlbumListSort, LibraryItem, ServerType, SortOrder } from '/@/renderer/api/types';
+import { AlbumListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
 import { Button, DropdownMenu, MultiSelect, Slider, Switch, Text } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ALBUM_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
 import { useListContext } from '/@/renderer/context/list-context';
 import { JellyfinAlbumFilters } from '/@/renderer/features/albums/components/jellyfin-album-filters';
 import { NavidromeAlbumFilters } from '/@/renderer/features/albums/components/navidrome-album-filters';
+import { SubsonicAlbumFilters } from '/@/renderer/features/albums/components/subsonic-album-filters';
 import { OrderToggleButton, useMusicFolders } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
 import { useListFilterRefresh } from '/@/renderer/hooks/use-list-filter-refresh';
@@ -31,7 +32,7 @@ import {
     useListStoreActions,
     useListStoreByKey,
 } from '/@/renderer/store';
-import { ListDisplayType, Play, TableColumn } from '/@/renderer/types';
+import { ListDisplayType, Play, ServerType, TableColumn } from '/@/renderer/types';
 import i18n from '/@/i18n/i18n';
 
 const FILTERS = {
@@ -73,7 +74,7 @@ const FILTERS = {
         },
         {
             defaultOrder: SortOrder.DESC,
-            name: i18n.t('filter.releaseDate', { postProcess: 'titleCase' }),
+            name: i18n.t('filter.recentlyAdded', { postProcess: 'titleCase' }),
             value: AlbumListSort.RELEASE_DATE,
         },
     ],
@@ -139,14 +140,61 @@ const FILTERS = {
             value: AlbumListSort.YEAR,
         },
     ],
+    subsonic: [
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.albumArtist', { postProcess: 'titleCase' }),
+            value: AlbumListSort.ALBUM_ARTIST,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.mostPlayed', { postProcess: 'titleCase' }),
+            value: AlbumListSort.PLAY_COUNT,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.name', { postProcess: 'titleCase' }),
+            value: AlbumListSort.NAME,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.random', { postProcess: 'titleCase' }),
+            value: AlbumListSort.RANDOM,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.recentlyAdded', { postProcess: 'titleCase' }),
+            value: AlbumListSort.RECENTLY_ADDED,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.recentlyPlayed', { postProcess: 'titleCase' }),
+            value: AlbumListSort.RECENTLY_PLAYED,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.favorited', { postProcess: 'titleCase' }),
+            value: AlbumListSort.FAVORITED,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.releaseYear', { postProcess: 'titleCase' }),
+            value: AlbumListSort.YEAR,
+        },
+    ],
 };
 
 interface AlbumListHeaderFiltersProps {
     gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    itemCount: number | undefined;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFiltersProps) => {
+export const AlbumListHeaderFilters = ({
+    gridRef,
+    tableRef,
+    itemCount,
+}: AlbumListHeaderFiltersProps) => {
     const { t } = useTranslation();
     const queryClient = useQueryClient();
     const { pageKey, customFilters, handlePlay } = useListContext();
@@ -159,6 +207,7 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
     const cq = useContainerQuery();
 
     const { handleRefreshTable, handleRefreshGrid } = useListFilterRefresh({
+        itemCount,
         itemType: LibraryItem.ALBUM,
         server,
     });
@@ -185,27 +234,35 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
     );
 
     const handleOpenFiltersModal = () => {
+        let FilterComponent;
+
+        switch (server?.type) {
+            case ServerType.NAVIDROME:
+                FilterComponent = NavidromeAlbumFilters;
+                break;
+            case ServerType.JELLYFIN:
+                FilterComponent = JellyfinAlbumFilters;
+                break;
+            case ServerType.SUBSONIC:
+                FilterComponent = SubsonicAlbumFilters;
+                break;
+            default:
+                break;
+        }
+
+        if (!FilterComponent) {
+            return;
+        }
+
         openModal({
             children: (
-                <>
-                    {server?.type === ServerType.NAVIDROME ? (
-                        <NavidromeAlbumFilters
-                            customFilters={customFilters}
-                            disableArtistFilter={!!customFilters}
-                            pageKey={pageKey}
-                            serverId={server?.id}
-                            onFilterChange={onFilterChange}
-                        />
-                    ) : (
-                        <JellyfinAlbumFilters
-                            customFilters={customFilters}
-                            disableArtistFilter={!!customFilters}
-                            pageKey={pageKey}
-                            serverId={server?.id}
-                            onFilterChange={onFilterChange}
-                        />
-                    )}
-                </>
+                <FilterComponent
+                    customFilters={customFilters}
+                    disableArtistFilter={!!customFilters}
+                    pageKey={pageKey}
+                    serverId={server?.id}
+                    onFilterChange={onFilterChange}
+                />
             ),
             title: 'Album Filters',
         });
@@ -341,8 +398,20 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
             filter?._custom?.jellyfin &&
             Object.values(filter?._custom?.jellyfin).some((value) => value !== undefined);
 
-        return isNavidromeFilterApplied || isJellyfinFilterApplied;
-    }, [filter?._custom?.jellyfin, filter?._custom?.navidrome, server?.type]);
+        const isSubsonicFilterApplied =
+            server?.type === ServerType.SUBSONIC &&
+            (filter.maxYear || filter.minYear || filter.genre || filter.isFavorite);
+
+        return isNavidromeFilterApplied || isJellyfinFilterApplied || isSubsonicFilterApplied;
+    }, [
+        filter?._custom?.jellyfin,
+        filter?._custom?.navidrome,
+        filter.genre,
+        filter.isFavorite,
+        filter.maxYear,
+        filter.minYear,
+        server?.type,
+    ]);
 
     const isFolderFilterApplied = useMemo(() => {
         return filter.musicFolderId !== undefined;
@@ -538,9 +607,7 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
                             Table (paginated)
                         </DropdownMenu.Item> */}
                         <DropdownMenu.Divider />
-                        <DropdownMenu.Label>
-                            {t('table.config.general.itemSize', { postProcess: 'sentenceCase' })}
-                        </DropdownMenu.Label>
+                        <DropdownMenu.Label>Item size</DropdownMenu.Label>
                         <DropdownMenu.Item closeMenuOnClick={false}>
                             <Slider
                                 defaultValue={isGrid ? grid?.itemSize || 0 : table.rowHeight}
@@ -551,11 +618,7 @@ export const AlbumListHeaderFilters = ({ gridRef, tableRef }: AlbumListHeaderFil
                         </DropdownMenu.Item>
                         {isGrid && (
                             <>
-                                <DropdownMenu.Label>
-                                    {t('table.config.general.itemGap', {
-                                        postProcess: 'sentenceCase',
-                                    })}
-                                </DropdownMenu.Label>
+                                <DropdownMenu.Label>Item gap</DropdownMenu.Label>
                                 <DropdownMenu.Item closeMenuOnClick={false}>
                                     <Slider
                                         defaultValue={grid?.itemGap || 0}

src/renderer/features/albums/components/album-list-header.tsx

@@ -38,6 +38,7 @@ export const AlbumListHeader = ({ itemCount, gridRef, tableRef, title }: AlbumLi
     const playButtonBehavior = usePlayButtonBehavior();
 
     const { handleRefreshGrid, handleRefreshTable } = useListFilterRefresh({
+        itemCount,
         itemType: LibraryItem.ALBUM,
         server,
     });
@@ -94,6 +95,7 @@ export const AlbumListHeader = ({ itemCount, gridRef, tableRef, title }: AlbumLi
             <FilterBar>
                 <AlbumListHeaderFilters
                     gridRef={gridRef}
+                    itemCount={itemCount}
                     tableRef={tableRef}
                 />
             </FilterBar>

src/renderer/features/albums/components/subsonic-album-filters.tsx

@@ -0,0 +1,143 @@
+import { Divider, Group, Stack } from '@mantine/core';
+import debounce from 'lodash/debounce';
+import { ChangeEvent, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { GenreListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
+import { NumberInput, Select, Switch, Text } from '/@/renderer/components';
+import { useGenreList } from '/@/renderer/features/genres';
+import { AlbumListFilter, useListStoreActions, useListStoreByKey } from '/@/renderer/store';
+
+interface SubsonicAlbumFiltersProps {
+    onFilterChange: (filters: AlbumListFilter) => void;
+    pageKey: string;
+    serverId?: string;
+}
+
+export const SubsonicAlbumFilters = ({
+    onFilterChange,
+    pageKey,
+    serverId,
+}: SubsonicAlbumFiltersProps) => {
+    const { t } = useTranslation();
+    const { filter } = useListStoreByKey({ key: pageKey });
+    const { setFilter } = useListStoreActions();
+
+    const genreListQuery = useGenreList({
+        query: {
+            sortBy: GenreListSort.NAME,
+            sortOrder: SortOrder.ASC,
+            startIndex: 0,
+        },
+        serverId,
+    });
+
+    const genreList = useMemo(() => {
+        if (!genreListQuery?.data) return [];
+        return genreListQuery.data.items.map((genre) => ({
+            label: genre.name,
+            value: genre.id,
+        }));
+    }, [genreListQuery.data]);
+
+    const handleGenresFilter = debounce((e: string | null) => {
+        const updatedFilters = setFilter({
+            data: {
+                genre: e || undefined,
+            },
+            itemType: LibraryItem.ALBUM,
+            key: pageKey,
+        }) as AlbumListFilter;
+
+        onFilterChange(updatedFilters);
+    }, 250);
+
+    const toggleFilters = [
+        {
+            label: t('filter.isFavorited', { postProcess: 'sentenceCase' }),
+            onChange: (e: ChangeEvent<HTMLInputElement>) => {
+                const updatedFilters = setFilter({
+                    data: {
+                        isFavorite: e.target.checked ? true : undefined,
+                    },
+                    itemType: LibraryItem.ALBUM,
+                    key: pageKey,
+                }) as AlbumListFilter;
+                onFilterChange(updatedFilters);
+            },
+            value: filter.isFavorite,
+        },
+    ];
+
+    const handleYearFilter = debounce((e: number | string, type: 'min' | 'max') => {
+        let data = {};
+
+        if (type === 'min') {
+            data = {
+                minYear: e || undefined,
+            };
+        } else {
+            data = {
+                maxYear: e || undefined,
+            };
+        }
+
+        console.log('data', data);
+
+        const updatedFilters = setFilter({
+            data,
+            itemType: LibraryItem.ALBUM,
+            key: pageKey,
+        }) as AlbumListFilter;
+
+        onFilterChange(updatedFilters);
+    }, 500);
+
+    return (
+        <Stack p="0.8rem">
+            {toggleFilters.map((filter) => (
+                <Group
+                    key={`nd-filter-${filter.label}`}
+                    position="apart"
+                >
+                    <Text>{filter.label}</Text>
+                    <Switch
+                        checked={filter?.value || false}
+                        onChange={filter.onChange}
+                    />
+                </Group>
+            ))}
+            <Divider my="0.5rem" />
+            <Group grow>
+                <NumberInput
+                    defaultValue={filter.minYear}
+                    disabled={filter.genre}
+                    hideControls={false}
+                    label={t('filter.fromYear', { postProcess: 'sentenceCase' })}
+                    max={5000}
+                    min={0}
+                    onChange={(e) => handleYearFilter(e, 'min')}
+                />
+                <NumberInput
+                    defaultValue={filter.maxYear}
+                    disabled={filter.genre}
+                    hideControls={false}
+                    label={t('filter.toYear', { postProcess: 'sentenceCase' })}
+                    max={5000}
+                    min={0}
+                    onChange={(e) => handleYearFilter(e, 'max')}
+                />
+            </Group>
+            <Group grow>
+                <Select
+                    clearable
+                    searchable
+                    data={genreList}
+                    defaultValue={filter.genre}
+                    disabled={filter.minYear || filter.maxYear}
+                    label={t('entity.genre', { count: 1, postProcess: 'titleCase' })}
+                    onChange={handleGenresFilter}
+                />
+            </Group>
+        </Stack>
+    );
+};

src/renderer/features/albums/queries/album-list-count-query.ts

@@ -0,0 +1,44 @@
+import { useQuery } from '@tanstack/react-query';
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import type { AlbumListQuery } from '/@/renderer/api/types';
+import type { QueryHookArgs } from '/@/renderer/lib/react-query';
+import { getServerById } from '/@/renderer/store';
+
+export const getAlbumListCountQuery = (query: AlbumListQuery) => {
+    const filter: Record<string, unknown> = {};
+
+    if (query.artistIds) filter.artistIds = query.artistIds;
+    if (query.maxYear) filter.maxYear = query.maxYear;
+    if (query.minYear) filter.minYear = query.minYear;
+    if (query.searchTerm) filter.searchTerm = query.searchTerm;
+    if (query.genre) filter.genre = query.genre;
+    if (query.musicFolderId) filter.musicFolderId = query.musicFolderId;
+    if (query.isCompilation) filter.isCompilation = query.isCompilation;
+    if (query.isFavorite) filter.isCompilation = query.isFavorite;
+
+    if (Object.keys(filter).length === 0) return undefined;
+
+    return filter;
+};
+
+export const useAlbumListCount = (args: QueryHookArgs<AlbumListQuery>) => {
+    const { options, query, serverId } = args;
+    const server = getServerById(serverId);
+
+    return useQuery({
+        enabled: !!serverId,
+        queryFn: ({ signal }) => {
+            if (!server) throw new Error('Server not found');
+            return api.controller.getAlbumListCount({
+                apiClientProps: {
+                    server,
+                    signal,
+                },
+                query,
+            });
+        },
+        queryKey: queryKeys.albums.count(serverId || '', getAlbumListCountQuery(query)),
+        ...options,
+    });
+};

src/renderer/features/albums/routes/album-list-route.tsx

@@ -9,12 +9,12 @@ import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ListContext } from '/@/renderer/context/list-context';
 import { AlbumListContent } from '/@/renderer/features/albums/components/album-list-content';
 import { AlbumListHeader } from '/@/renderer/features/albums/components/album-list-header';
-import { useAlbumList } from '/@/renderer/features/albums/queries/album-list-query';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { AnimatedPage } from '/@/renderer/features/shared';
 import { queryClient } from '/@/renderer/lib/react-query';
 import { useCurrentServer, useListFilterByKey } from '/@/renderer/store';
 import { Play } from '/@/renderer/types';
+import { useAlbumListCount } from '/@/renderer/features/albums/queries/album-list-count-query';
 
 const AlbumListRoute = () => {
     const gridRef = useRef<VirtualInfiniteGridRef | null>(null);
@@ -42,23 +42,18 @@ const AlbumListRoute = () => {
         key: pageKey,
     });
 
-    const itemCountCheck = useAlbumList({
+    const itemCountCheck = useAlbumListCount({
         options: {
             cacheTime: 1000 * 60,
             staleTime: 1000 * 60,
         },
         query: {
-            limit: 1,
-            startIndex: 0,
             ...albumListFilter,
         },
         serverId: server?.id,
     });
 
-    const itemCount =
-        itemCountCheck.data?.totalRecordCount === null
-            ? undefined
-            : itemCountCheck.data?.totalRecordCount;
+    const itemCount = itemCountCheck.data === null ? undefined : itemCountCheck.data;
 
     const handlePlay = useCallback(
         async (args: { initialSongId?: string; playType: Play }) => {

src/renderer/features/artists/components/album-artist-detail-content.tsx

@@ -1,10 +1,7 @@
-import { useMemo } from 'react';
 import { ColDef, RowDoubleClickedEvent } from '@ag-grid-community/core';
 import { Box, Group, Stack } from '@mantine/core';
-import { useTranslation } from 'react-i18next';
-import { FaLastfmSquare } from 'react-icons/fa';
+import { useMemo } from 'react';
 import { RiHeartFill, RiHeartLine, RiMoreFill } from 'react-icons/ri';
-import { SiMusicbrainz } from 'react-icons/si';
 import { generatePath, useParams } from 'react-router';
 import { createSearchParams, Link } from 'react-router-dom';
 import styled from 'styled-components';
@@ -17,7 +14,7 @@ import {
     ServerType,
     SortOrder,
 } from '/@/renderer/api/types';
-import { Button, Spoiler, TextTitle } from '/@/renderer/components';
+import { Button, Text, TextTitle } from '/@/renderer/components';
 import { MemoizedSwiperGridCarousel } from '/@/renderer/components/grid-carousel';
 import { getColumnDefs, VirtualTable } from '/@/renderer/components/virtual-table';
 import { useAlbumList } from '/@/renderer/features/albums/queries/album-list-query';
@@ -37,7 +34,7 @@ import { LibraryBackgroundOverlay } from '/@/renderer/features/shared/components
 import { useContainerQuery } from '/@/renderer/hooks';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer } from '/@/renderer/store';
-import { useGeneralSettings, usePlayButtonBehavior } from '/@/renderer/store/settings.store';
+import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
 import { CardRow, Play, TableColumn } from '/@/renderer/types';
 
 const ContentContainer = styled.div`
@@ -48,7 +45,7 @@ const ContentContainer = styled.div`
 const DetailContainer = styled.div`
     display: flex;
     flex-direction: column;
-    gap: 2rem;
+    gap: 3rem;
     padding: 1rem 2rem 5rem;
     overflow: hidden;
 
@@ -62,8 +59,6 @@ interface AlbumArtistDetailContentProps {
 }
 
 export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailContentProps) => {
-    const { t } = useTranslation();
-    const { externalLinks } = useGeneralSettings();
     const { albumArtistId } = useParams() as { albumArtistId: string };
     const cq = useContainerQuery();
     const handlePlayQueueAdd = usePlayQueueAdd();
@@ -105,6 +100,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                         : undefined),
                 },
             },
+            artistIds: [albumArtistId],
             limit: 15,
             sortBy: AlbumListSort.RELEASE_DATE,
             sortOrder: SortOrder.DESC,
@@ -127,6 +123,8 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                         : undefined),
                 },
             },
+            artistIds: [albumArtistId],
+            isCompilation: true,
             limit: 15,
             sortBy: AlbumListSort.RELEASE_DATE,
             sortOrder: SortOrder.DESC,
@@ -213,9 +211,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                             order={2}
                             weight={700}
                         >
-                            {t('page.albumArtistDetail.recentReleases', {
-                                postProcess: 'sentenceCase',
-                            })}
+                            Recent releases
                         </TextTitle>
                         <Button
                             compact
@@ -224,7 +220,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                             to={artistDiscographyLink}
                             variant="subtle"
                         >
-                            {t('page.albumArtistDetail.viewDiscography')}
+                            View discography
                         </Button>
                     </Group>
                 ),
@@ -240,7 +236,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                         order={2}
                         weight={700}
                     >
-                        {t('page.albumArtistDetail.appearsOn', { postProcess: 'sentenceCase' })}
+                        Appears on
                     </TextTitle>
                 ),
                 uniqueId: 'compilationAlbums',
@@ -254,9 +250,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                         order={2}
                         weight={700}
                     >
-                        {t('page.albumArtistDetail.relatedArtists', {
-                            postProcess: 'sentenceCase',
-                        })}
+                        Related artists
                     </TextTitle>
                 ),
                 uniqueId: 'similarArtists',
@@ -271,7 +265,6 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
         recentAlbumsQuery?.data?.items,
         recentAlbumsQuery.isFetching,
         recentAlbumsQuery?.isLoading,
-        t,
     ]);
 
     const playButtonBehavior = usePlayButtonBehavior();
@@ -334,7 +327,6 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
         detailQuery?.data?.biography !== undefined && detailQuery?.data?.biography !== null;
     const showTopSongs = topSongsQuery?.data?.items?.length;
     const showGenres = detailQuery?.data?.genres ? detailQuery?.data?.genres.length !== 0 : false;
-    const mbzId = detailQuery?.data?.mbz;
 
     const isLoading =
         detailQuery?.isLoading ||
@@ -346,58 +338,61 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
         <ContentContainer ref={cq.ref}>
             <LibraryBackgroundOverlay $backgroundColor={background} />
             <DetailContainer>
-                <Group spacing="md">
-                    <PlayButton onClick={() => handlePlay(playButtonBehavior)} />
-                    <Group spacing="xs">
+                <Stack spacing="lg">
+                    <Group spacing="md">
+                        <PlayButton onClick={() => handlePlay(playButtonBehavior)} />
+                        <Group spacing="xs">
+                            <Button
+                                compact
+                                loading={
+                                    createFavoriteMutation.isLoading ||
+                                    deleteFavoriteMutation.isLoading
+                                }
+                                variant="subtle"
+                                onClick={handleFavorite}
+                            >
+                                {detailQuery?.data?.userFavorite ? (
+                                    <RiHeartFill
+                                        color="red"
+                                        size={20}
+                                    />
+                                ) : (
+                                    <RiHeartLine size={20} />
+                                )}
+                            </Button>
+                            <Button
+                                compact
+                                variant="subtle"
+                                onClick={(e) => {
+                                    if (!detailQuery?.data) return;
+                                    handleGeneralContextMenu(e, [detailQuery.data!]);
+                                }}
+                            >
+                                <RiMoreFill size={20} />
+                            </Button>
+                        </Group>
+                    </Group>
+                    <Group spacing="md">
                         <Button
                             compact
-                            loading={
-                                createFavoriteMutation.isLoading || deleteFavoriteMutation.isLoading
-                            }
+                            uppercase
+                            component={Link}
+                            to={artistDiscographyLink}
                             variant="subtle"
-                            onClick={handleFavorite}
                         >
-                            {detailQuery?.data?.userFavorite ? (
-                                <RiHeartFill
-                                    color="red"
-                                    size={20}
-                                />
-                            ) : (
-                                <RiHeartLine size={20} />
-                            )}
+                            View discography
                         </Button>
                         <Button
                             compact
+                            uppercase
+                            component={Link}
+                            to={artistSongsLink}
                             variant="subtle"
-                            onClick={(e) => {
-                                if (!detailQuery?.data) return;
-                                handleGeneralContextMenu(e, [detailQuery.data!]);
-                            }}
                         >
-                            <RiMoreFill size={20} />
+                            View all songs
                         </Button>
                     </Group>
-                </Group>
-                <Group spacing="md">
-                    <Button
-                        compact
-                        uppercase
-                        component={Link}
-                        to={artistDiscographyLink}
-                        variant="subtle"
-                    >
-                        {t('page.albumArtistDetail.viewDiscography')}
-                    </Button>
-                    <Button
-                        compact
-                        uppercase
-                        component={Link}
-                        to={artistSongsLink}
-                        variant="subtle"
-                    >
-                        {t('page.albumArtistDetail.viewAllTracks')}
-                    </Button>
-                </Group>
+                </Stack>
                 {showGenres ? (
                     <Box component="section">
                         <Group spacing="sm">
@@ -419,46 +414,6 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                         </Group>
                     </Box>
                 ) : null}
-                {externalLinks ? (
-                    <Box component="section">
-                        <Group spacing="sm">
-                            <Button
-                                compact
-                                component="a"
-                                href={`https://www.last.fm/music/${encodeURIComponent(
-                                    detailQuery?.data?.name || '',
-                                )}`}
-                                radius="md"
-                                rel="noopener noreferrer"
-                                size="md"
-                                target="_blank"
-                                tooltip={{
-                                    label: t('action.openIn.lastfm'),
-                                }}
-                                variant="subtle"
-                            >
-                                <FaLastfmSquare size={25} />
-                            </Button>
-                            {mbzId ? (
-                                <Button
-                                    compact
-                                    component="a"
-                                    href={`https://musicbrainz.org/artist/${mbzId}`}
-                                    radius="md"
-                                    rel="noopener noreferrer"
-                                    size="md"
-                                    target="_blank"
-                                    tooltip={{
-                                        label: t('action.openIn.musicbrainz'),
-                                    }}
-                                    variant="subtle"
-                                >
-                                    <SiMusicbrainz size={25} />
-                                </Button>
-                            ) : null}
-                        </Group>
-                    </Box>
-                ) : null}
                 {showBiography ? (
                     <Box
                         component="section"
@@ -468,12 +423,13 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                             order={2}
                             weight={700}
                         >
-                            {t('page.albumArtistDetail.about', {
-                                artist: detailQuery?.data?.name,
-                            })}
+                            About {detailQuery?.data?.name}
                         </TextTitle>
-                        <Spoiler
+                        <Text
+                            $secondary
+                            component="p"
                             dangerouslySetInnerHTML={{ __html: detailQuery?.data?.biography || '' }}
+                            sx={{ textAlign: 'justify' }}
                         />
                     </Box>
                 ) : null}
@@ -491,9 +447,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                                     order={2}
                                     weight={700}
                                 >
-                                    {t('page.albumArtistDetail.topSongs', {
-                                        postProcess: 'sentenceCase',
-                                    })}
+                                    Top Songs
                                 </TextTitle>
                                 <Button
                                     compact
@@ -507,9 +461,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                                     )}
                                     variant="subtle"
                                 >
-                                    {t('page.albumArtistDetail.viewAll', {
-                                        postProcess: 'sentenceCase',
-                                    })}
+                                    View all
                                 </Button>
                             </Group>
                         </Group>

src/renderer/features/artists/components/album-artist-detail-top-songs-list-header.tsx

@@ -33,9 +33,7 @@ export const AlbumArtistDetailTopSongsListHeader = ({
         <PageHeader p="1rem">
             <LibraryHeaderBar>
                 <LibraryHeaderBar.PlayButton onClick={() => handlePlay(playButtonBehavior)} />
-                <LibraryHeaderBar.Title>
-                    {t('page.albumArtistDetail.topSongsFrom', { title })}
-                </LibraryHeaderBar.Title>
+                <LibraryHeaderBar.Title>Top songs from {title}</LibraryHeaderBar.Title>
                 <Paper
                     fw="600"
                     px="1rem"
@@ -59,7 +57,7 @@ export const AlbumArtistDetailTopSongsListHeader = ({
                             icon={<RiPlayFill />}
                             onClick={() => handlePlay(Play.NOW)}
                         >
-                            {t('player.play', { postProcess: 'sentenceCase' })}
+                            {t('player.add', { postProcess: 'sentenceCase' })}
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             icon={<RiAddBoxFill />}

src/renderer/features/artists/components/album-artist-list-header-filters.tsx

@@ -9,7 +9,7 @@ import { RiFolder2Line, RiMoreFill, RiRefreshLine, RiSettings3Fill } from 'react
 import { useListContext } from '../../../context/list-context';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { AlbumArtistListSort, LibraryItem, ServerType, SortOrder } from '/@/renderer/api/types';
+import { AlbumArtistListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
 import { Button, DropdownMenu, MultiSelect, Slider, Switch, Text } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ALBUMARTIST_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
@@ -21,7 +21,7 @@ import {
     useListStoreActions,
     useListStoreByKey,
 } from '/@/renderer/store';
-import { ListDisplayType, TableColumn } from '/@/renderer/types';
+import { ListDisplayType, ServerType, TableColumn } from '/@/renderer/types';
 import i18n from '/@/i18n/i18n';
 
 const FILTERS = {
@@ -85,6 +85,28 @@ const FILTERS = {
             value: AlbumArtistListSort.SONG_COUNT,
         },
     ],
+    subsonic: [
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.albumCount', { postProcess: 'titleCase' }),
+            value: AlbumArtistListSort.ALBUM_COUNT,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.isFavorited', { postProcess: 'titleCase' }),
+            value: AlbumArtistListSort.FAVORITED,
+        },
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.name', { postProcess: 'titleCase' }),
+            value: AlbumArtistListSort.NAME,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.rating', { postProcess: 'titleCase' }),
+            value: AlbumArtistListSort.RATING,
+        },
+    ],
 };
 
 interface AlbumArtistListHeaderFiltersProps {
@@ -472,9 +494,7 @@ export const AlbumArtistListHeaderFilters = ({
                             Table (paginated)
                         </DropdownMenu.Item> */}
                         <DropdownMenu.Divider />
-                        <DropdownMenu.Label>
-                            {t('table.config.general.itemSize', { postProcess: 'sentenceCase' })}
-                        </DropdownMenu.Label>
+                        <DropdownMenu.Label>Item size</DropdownMenu.Label>
                         <DropdownMenu.Item closeMenuOnClick={false}>
                             {display === ListDisplayType.CARD ||
                             display === ListDisplayType.POSTER ? (
@@ -495,11 +515,7 @@ export const AlbumArtistListHeaderFilters = ({
                         </DropdownMenu.Item>
                         {isGrid && (
                             <>
-                                <DropdownMenu.Label>
-                                    {t('table.config.general.itemGap', {
-                                        postProcess: 'sentenceCase',
-                                    })}
-                                </DropdownMenu.Label>
+                                <DropdownMenu.Label>Item gap</DropdownMenu.Label>
                                 <DropdownMenu.Item closeMenuOnClick={false}>
                                     <Slider
                                         defaultValue={grid?.itemGap || 0}

src/renderer/features/artists/components/album-artist-list-header.tsx

@@ -35,6 +35,7 @@ export const AlbumArtistListHeader = ({
     const cq = useContainerQuery();
 
     const { handleRefreshGrid, handleRefreshTable } = useListFilterRefresh({
+        itemCount,
         itemType: LibraryItem.ALBUM_ARTIST,
         server,
     });

src/renderer/features/artists/queries/album-artist-list-count-query.ts

@@ -0,0 +1,38 @@
+import { useQuery } from '@tanstack/react-query';
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { AlbumArtistListQuery } from '/@/renderer/api/types';
+import { QueryHookArgs } from '/@/renderer/lib/react-query';
+import { getServerById } from '/@/renderer/store';
+
+export const getAlbumArtistListCountQuery = (query: AlbumArtistListQuery) => {
+    const filter: Record<string, unknown> = {};
+
+    if (query.searchTerm) filter.searchTerm = query.searchTerm;
+    if (query.musicFolderId) filter.musicFolderId = query.musicFolderId;
+
+    if (Object.keys(filter).length === 0) return undefined;
+
+    return filter;
+};
+
+export const useAlbumArtistListCount = (args: QueryHookArgs<AlbumArtistListQuery>) => {
+    const { options, query, serverId } = args;
+    const server = getServerById(serverId);
+
+    return useQuery({
+        enabled: !!serverId,
+        queryFn: ({ signal }) => {
+            if (!server) throw new Error('Server not found');
+            return api.controller.getAlbumArtistListCount({
+                apiClientProps: {
+                    server,
+                    signal,
+                },
+                query,
+            });
+        },
+        queryKey: queryKeys.albumArtists.count(serverId || '', getAlbumArtistListCountQuery(query)),
+        ...options,
+    });
+};

src/renderer/features/artists/routes/album-artist-list-route.tsx

@@ -7,7 +7,7 @@ import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ListContext } from '/@/renderer/context/list-context';
 import { AlbumArtistListContent } from '/@/renderer/features/artists/components/album-artist-list-content';
 import { AlbumArtistListHeader } from '/@/renderer/features/artists/components/album-artist-list-header';
-import { useAlbumArtistList } from '/@/renderer/features/artists/queries/album-artist-list-query';
+import { useAlbumArtistListCount } from '/@/renderer/features/artists/queries/album-artist-list-count-query';
 import { AnimatedPage } from '/@/renderer/features/shared';
 
 const AlbumArtistListRoute = () => {
@@ -18,23 +18,18 @@ const AlbumArtistListRoute = () => {
 
     const albumArtistListFilter = useListFilterByKey({ key: pageKey });
 
-    const itemCountCheck = useAlbumArtistList({
+    const itemCountCheck = useAlbumArtistListCount({
         options: {
             cacheTime: 1000 * 60,
             staleTime: 1000 * 60,
         },
         query: {
-            limit: 1,
-            startIndex: 0,
             ...albumArtistListFilter,
         },
         serverId: server?.id,
     });
 
-    const itemCount =
-        itemCountCheck.data?.totalRecordCount === null
-            ? undefined
-            : itemCountCheck.data?.totalRecordCount;
+    const itemCount = itemCountCheck.data === null ? undefined : itemCountCheck.data;
 
     const providerValue = useMemo(() => {
         return {

src/renderer/features/context-menu/context-menu-provider.tsx

@@ -51,7 +51,7 @@ import {
     usePlayerStore,
     useQueueControls,
 } from '/@/renderer/store';
-import { usePlaybackType } from '/@/renderer/store/settings.store';
+import { usePlayerType } from '/@/renderer/store/settings.store';
 import { Play, PlaybackType } from '/@/renderer/types';
 
 type ContextMenuContextProps = {
@@ -522,7 +522,7 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
 
     const handleUpdateRating = useCallback(
         (rating: number) => {
-            if (!ctx.dataNodes && !ctx.data) return;
+            if (!ctx.dataNodes || !ctx.data) return;
 
             let uniqueServerIds: string[] = [];
             let items: AnyLibraryItems = [];
@@ -575,7 +575,7 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
         [ctx.data, ctx.dataNodes, updateRatingMutation],
     );
 
-    const playbackType = usePlaybackType();
+    const playerType = usePlayerType();
     const { moveToBottomOfQueue, moveToTopOfQueue, removeFromQueue } = useQueueControls();
 
     const handleMoveToBottom = useCallback(() => {
@@ -584,10 +584,10 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
 
         const playerData = moveToBottomOfQueue(uniqueIds);
 
-        if (playbackType === PlaybackType.LOCAL) {
+        if (playerType === PlaybackType.LOCAL) {
             mpvPlayer!.setQueueNext(playerData);
         }
-    }, [ctx.dataNodes, moveToBottomOfQueue, playbackType]);
+    }, [ctx.dataNodes, moveToBottomOfQueue, playerType]);
 
     const handleMoveToTop = useCallback(() => {
         const uniqueIds = ctx.dataNodes?.map((row) => row.data.uniqueId);
@@ -595,10 +595,10 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
 
         const playerData = moveToTopOfQueue(uniqueIds);
 
-        if (playbackType === PlaybackType.LOCAL) {
+        if (playerType === PlaybackType.LOCAL) {
             mpvPlayer!.setQueueNext(playerData);
         }
-    }, [ctx.dataNodes, moveToTopOfQueue, playbackType]);
+    }, [ctx.dataNodes, moveToTopOfQueue, playerType]);
 
     const handleRemoveSelected = useCallback(() => {
         const uniqueIds = ctx.dataNodes?.map((row) => row.data.uniqueId);
@@ -608,7 +608,7 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
         const playerData = removeFromQueue(uniqueIds);
         const isCurrentSongRemoved = currentSong && uniqueIds.includes(currentSong?.uniqueId);
 
-        if (playbackType === PlaybackType.LOCAL) {
+        if (playerType === PlaybackType.LOCAL) {
             if (isCurrentSongRemoved) {
                 mpvPlayer!.setQueue(playerData);
             } else {
@@ -621,7 +621,7 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
         if (isCurrentSongRemoved) {
             remote?.updateSong({ song: playerData.current.song });
         }
-    }, [ctx.dataNodes, ctx.tableApi, playbackType, removeFromQueue]);
+    }, [ctx.dataNodes, ctx.tableApi, playerType, removeFromQueue]);
 
     const handleDeselectAll = useCallback(() => {
         ctx.tableApi?.deselectAll();

src/renderer/features/discord-rpc/use-discord-rpc.ts

@@ -8,8 +8,7 @@ import {
     usePlayerStore,
 } from '/@/renderer/store';
 import { SetActivity } from '@xhayper/discord-rpc';
-import { PlayerStatus } from '/@/renderer/types';
-import { ServerType } from '/@/renderer/api/types';
+import { PlayerStatus, ServerType } from '/@/renderer/types';
 
 const discordRpc = isElectron() ? window.electron.discordRpc : null;
 
@@ -41,7 +40,7 @@ export const useDiscordRpc = () => {
             largeImageText: currentSong?.album || 'Unknown album',
             smallImageKey: undefined,
             smallImageText: currentStatus,
-            state: (artists && `By ${artists}`) || 'Unknown artist',
+            state: artists && `By ${artists}` || "Unknown artist",
         };
 
         if (currentStatus === PlayerStatus.PLAYING) {

src/renderer/features/genres/components/genre-list-header-filters.tsx

@@ -5,7 +5,7 @@ import { useQueryClient } from '@tanstack/react-query';
 import { useTranslation } from 'react-i18next';
 import { RiFolder2Fill, RiMoreFill, RiRefreshLine, RiSettings3Fill } from 'react-icons/ri';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { GenreListSort, LibraryItem, ServerType, SortOrder } from '/@/renderer/api/types';
+import { GenreListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
 import { Button, DropdownMenu, MultiSelect, Slider, Switch, Text } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { GENRE_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
@@ -19,7 +19,7 @@ import {
     useListStoreActions,
     useListStoreByKey,
 } from '/@/renderer/store';
-import { ListDisplayType, TableColumn } from '/@/renderer/types';
+import { ListDisplayType, ServerType, TableColumn } from '/@/renderer/types';
 import i18n from '/@/i18n/i18n';
 
 const FILTERS = {
@@ -37,14 +37,36 @@ const FILTERS = {
             value: GenreListSort.NAME,
         },
     ],
+    subsonic: [
+        {
+            defaultOrder: SortOrder.ASC,
+            name: i18n.t('filter.name', { postProcess: 'titleCase' }),
+            value: GenreListSort.NAME,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.albumCount', { postProcess: 'titleCase' }),
+            value: GenreListSort.ALBUM_COUNT,
+        },
+        {
+            defaultOrder: SortOrder.DESC,
+            name: i18n.t('filter.songCount', { postProcess: 'titleCase' }),
+            value: GenreListSort.SONG_COUNT,
+        },
+    ],
 };
 
 interface GenreListHeaderFiltersProps {
     gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    itemCount: number | undefined;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const GenreListHeaderFilters = ({ gridRef, tableRef }: GenreListHeaderFiltersProps) => {
+export const GenreListHeaderFilters = ({
+    gridRef,
+    tableRef,
+    itemCount,
+}: GenreListHeaderFiltersProps) => {
     const { t } = useTranslation();
     const queryClient = useQueryClient();
     const { pageKey, customFilters } = useListContext();
@@ -54,6 +76,7 @@ export const GenreListHeaderFilters = ({ gridRef, tableRef }: GenreListHeaderFil
     const cq = useContainerQuery();
 
     const { handleRefreshTable, handleRefreshGrid } = useListFilterRefresh({
+        itemCount,
         itemType: LibraryItem.GENRE,
         server,
     });

src/renderer/features/genres/components/genre-list-header.tsx

@@ -34,6 +34,7 @@ export const GenreListHeader = ({ itemCount, gridRef, tableRef }: GenreListHeade
     const { setFilter, setTablePagination } = useListStoreActions();
 
     const { handleRefreshGrid, handleRefreshTable } = useListFilterRefresh({
+        itemCount,
         itemType: LibraryItem.GENRE,
         server,
     });
@@ -89,6 +90,7 @@ export const GenreListHeader = ({ itemCount, gridRef, tableRef }: GenreListHeade
             <FilterBar>
                 <GenreListHeaderFilters
                     gridRef={gridRef}
+                    itemCount={itemCount}
                     tableRef={tableRef}
                 />
             </FilterBar>

src/renderer/features/home/routes/home-route.tsx

@@ -12,12 +12,7 @@ import { useAlbumList } from '/@/renderer/features/albums';
 import { useRecentlyPlayed } from '/@/renderer/features/home/queries/recently-played-query';
 import { AnimatedPage, LibraryHeaderBar } from '/@/renderer/features/shared';
 import { AppRoute } from '/@/renderer/router/routes';
-import {
-    HomeItem,
-    useCurrentServer,
-    useGeneralSettings,
-    useWindowSettings,
-} from '/@/renderer/store';
+import { useCurrentServer, useWindowSettings } from '/@/renderer/store';
 import { MemoizedSwiperGridCarousel } from '/@/renderer/components/grid-carousel';
 import { Platform } from '/@/renderer/types';
 import { useQueryClient } from '@tanstack/react-query';
@@ -33,7 +28,6 @@ const HomeRoute = () => {
     const server = useCurrentServer();
     const itemsPerPage = 15;
     const { windowBarStyle } = useWindowSettings();
-    const { homeItems } = useGeneralSettings();
 
     const feature = useAlbumList({
         options: {
@@ -135,15 +129,16 @@ const HomeRoute = () => {
         return <Spinner container />;
     }
 
-    const carousels = {
-        [HomeItem.RANDOM]: {
+    const carousels = [
+        {
             data: random?.data?.items,
             itemType: LibraryItem.ALBUM,
             sortBy: AlbumListSort.RANDOM,
             sortOrder: SortOrder.ASC,
             title: t('page.home.explore', { postProcess: 'sentenceCase' }),
+            uniqueId: 'random',
         },
-        [HomeItem.RECENTLY_PLAYED]: {
+        {
             data: recentlyPlayed?.data?.items,
             itemType: LibraryItem.ALBUM,
             pagination: {
@@ -152,8 +147,9 @@ const HomeRoute = () => {
             sortBy: AlbumListSort.RECENTLY_PLAYED,
             sortOrder: SortOrder.DESC,
             title: t('page.home.recentlyPlayed', { postProcess: 'sentenceCase' }),
+            uniqueId: 'recentlyPlayed',
         },
-        [HomeItem.RECENTLY_ADDED]: {
+        {
             data: recentlyAdded?.data?.items,
             itemType: LibraryItem.ALBUM,
             pagination: {
@@ -162,8 +158,9 @@ const HomeRoute = () => {
             sortBy: AlbumListSort.RECENTLY_ADDED,
             sortOrder: SortOrder.DESC,
             title: t('page.home.newlyAdded', { postProcess: 'sentenceCase' }),
+            uniqueId: 'recentlyAdded',
         },
-        [HomeItem.MOST_PLAYED]: {
+        {
             data:
                 server?.type === ServerType.JELLYFIN
                     ? mostPlayedSongs?.data?.items
@@ -178,24 +175,9 @@ const HomeRoute = () => {
                     : AlbumListSort.PLAY_COUNT,
             sortOrder: SortOrder.DESC,
             title: t('page.home.mostPlayed', { postProcess: 'sentenceCase' }),
+            uniqueId: 'mostPlayed',
         },
-    };
-
-    const sortedCarousel = homeItems
-        .filter((item) => {
-            if (item.disabled) {
-                return false;
-            }
-            if (server?.type === ServerType.JELLYFIN && item.id === HomeItem.RECENTLY_PLAYED) {
-                return false;
-            }
-
-            return true;
-        })
-        .map((item) => ({
-            ...carousels[item.id],
-            uniqueId: item.id,
-        }));
+    ];
 
     const invalidateCarouselQuery = (carousel: {
         itemType: LibraryItem;
@@ -250,76 +232,69 @@ const HomeRoute = () => {
                     spacing="lg"
                 >
                     <FeatureCarousel data={featureItemsWithImage} />
-                    {sortedCarousel.map((carousel) => (
-                        <MemoizedSwiperGridCarousel
-                            key={`carousel-${carousel.uniqueId}`}
-                            cardRows={[
-                                {
-                                    property: 'name',
-                                    route: {
-                                        route: AppRoute.LIBRARY_ALBUMS_DETAIL,
-                                        slugs: [
-                                            {
-                                                idProperty:
-                                                    server?.type === ServerType.JELLYFIN &&
-                                                    carousel.itemType === LibraryItem.SONG
-                                                        ? 'albumId'
-                                                        : 'id',
-                                                slugProperty: 'albumId',
-                                            },
-                                        ],
-                                    },
-                                },
-                                {
-                                    arrayProperty: 'name',
-                                    property: 'albumArtists',
-                                    route: {
-                                        route: AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL,
-                                        slugs: [
-                                            {
-                                                idProperty: 'id',
-                                                slugProperty: 'albumArtistId',
-                                            },
-                                        ],
-                                    },
-                                },
-                            ]}
-                            data={carousel.data}
-                            itemType={carousel.itemType}
-                            route={{
-                                route: AppRoute.LIBRARY_ALBUMS_DETAIL,
-                                slugs: [
-                                    {
-                                        idProperty:
-                                            server?.type === ServerType.JELLYFIN &&
-                                            carousel.itemType === LibraryItem.SONG
-                                                ? 'albumId'
-                                                : 'id',
-                                        slugProperty: 'albumId',
-                                    },
-                                ],
-                            }}
-                            title={{
-                                label: (
-                                    <Group>
-                                        <TextTitle
-                                            order={2}
-                                            weight={700}
-                                        >
-                                            {carousel.title}
-                                        </TextTitle>
+                    {carousels
+                        .filter((carousel) => {
+                            if (
+                                server?.type === ServerType.JELLYFIN &&
+                                carousel.uniqueId === 'recentlyPlayed'
+                            ) {
+                                return null;
+                            }
 
-                                        <ActionIcon
-                                            onClick={() => invalidateCarouselQuery(carousel)}
-                                        >
-                                            <RiRefreshLine />
-                                        </ActionIcon>
-                                    </Group>
-                                ),
-                            }}
-                            uniqueId={carousel.uniqueId}
-                        />
-                    ))}
+                            return carousel;
+                        })
+                        .map((carousel) => (
+                            <MemoizedSwiperGridCarousel
+                                key={`carousel-${carousel.uniqueId}`}
+                                cardRows={[
+                                    {
+                                        property: 'name',
+                                        route: {
+                                            route: AppRoute.LIBRARY_ALBUMS_DETAIL,
+                                            slugs: [{ idProperty: 'id', slugProperty: 'albumId' }],
+                                        },
+                                    },
+                                    {
+                                        arrayProperty: 'name',
+                                        property: 'albumArtists',
+                                        route: {
+                                            route: AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL,
+                                            slugs: [
+                                                {
+                                                    idProperty: 'id',
+                                                    slugProperty: 'albumArtistId',
+                                                },
+                                            ],
+                                        },
+                                    },
+                                ]}
+                                data={carousel.data}
+                                itemType={carousel.itemType}
+                                route={{
+                                    route: AppRoute.LIBRARY_ALBUMS_DETAIL,
+                                    slugs: [{ idProperty: 'id', slugProperty: 'albumId' }],
+                                }}
+                                title={{
+                                    label: (
+                                        <Group>
+                                            <TextTitle
+                                                order={2}
+                                                weight={700}
+                                            >
+                                                {carousel.title}
+                                            </TextTitle>
+
+                                            <ActionIcon
+                                                onClick={() => invalidateCarouselQuery(carousel)}
+                                            >
+                                                <RiRefreshLine />
+                                            </ActionIcon>
+                                        </Group>
+                                    ),
+                                }}
+                                uniqueId={carousel.uniqueId}
+                            />
+                        ))}
                 </Stack>
             </NativeScrollArea>
         </AnimatedPage>

src/renderer/features/lyrics/lyrics-actions.tsx

@@ -1,4 +1,4 @@
-import { Box, Center, Group, Select, SelectItem } from '@mantine/core';
+import { Box, Group } from '@mantine/core';
 import isElectron from 'is-electron';
 import { useTranslation } from 'react-i18next';
 import { RiAddFill, RiSubtractFill } from 'react-icons/ri';
@@ -13,22 +13,15 @@ import {
 } from '/@/renderer/store';
 
 interface LyricsActionsProps {
-    index: number;
-    languages: SelectItem[];
-
     onRemoveLyric: () => void;
     onResetLyric: () => void;
     onSearchOverride: (params: LyricsOverride) => void;
-    setIndex: (idx: number) => void;
 }
 
 export const LyricsActions = ({
-    index,
-    languages,
     onRemoveLyric,
     onResetLyric,
     onSearchOverride,
-    setIndex,
 }: LyricsActionsProps) => {
     const { t } = useTranslation();
     const currentSong = useCurrentSong();
@@ -49,18 +42,6 @@ export const LyricsActions = ({
 
     return (
         <Box style={{ position: 'relative', width: '100%' }}>
-            {languages.length > 1 && (
-                <Center>
-                    <Select
-                        clearable={false}
-                        data={languages}
-                        style={{ bottom: 30, position: 'absolute' }}
-                        value={index.toString()}
-                        onChange={(value) => setIndex(parseInt(value!, 10))}
-                    />
-                </Center>
-            )}
-
             <Group position="center">
                 {isDesktop && sources.length ? (
                     <Button

src/renderer/features/lyrics/lyrics.tsx

@@ -1,19 +1,21 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { Center, Group } from '@mantine/core';
 import { AnimatePresence, motion } from 'framer-motion';
 import { ErrorBoundary } from 'react-error-boundary';
 import { RiInformationFill } from 'react-icons/ri';
 import styled from 'styled-components';
 import { useSongLyricsByRemoteId, useSongLyricsBySong } from './queries/lyric-query';
-import { SynchronizedLyrics, SynchronizedLyricsProps } from './synchronized-lyrics';
+import { SynchronizedLyrics } from './synchronized-lyrics';
 import { Spinner, TextTitle } from '/@/renderer/components';
 import { ErrorFallback } from '/@/renderer/features/action-required';
-import {
-    UnsynchronizedLyrics,
-    UnsynchronizedLyricsProps,
-} from '/@/renderer/features/lyrics/unsynchronized-lyrics';
+import { UnsynchronizedLyrics } from '/@/renderer/features/lyrics/unsynchronized-lyrics';
 import { useCurrentSong, usePlayerStore } from '/@/renderer/store';
-import { FullLyricsMetadata, LyricSource, LyricsOverride } from '/@/renderer/api/types';
+import {
+    FullLyricsMetadata,
+    LyricsOverride,
+    SynchronizedLyricMetadata,
+    UnsynchronizedLyricMetadata,
+} from '/@/renderer/api/types';
 import { LyricsActions } from '/@/renderer/features/lyrics/lyrics-actions';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { queryClient } from '/@/renderer/lib/react-query';
@@ -82,9 +84,17 @@ const ScrollContainer = styled(motion.div)`
     }
 `;
 
+function isSynchronized(
+    data: Partial<FullLyricsMetadata> | undefined,
+): data is SynchronizedLyricMetadata {
+    // Type magic. The only difference between Synchronized and Unsynchhronized is
+    // the datatype of lyrics. This makes Typescript happier later...
+    if (!data) return false;
+    return Array.isArray(data.lyrics);
+}
+
 export const Lyrics = () => {
     const currentSong = useCurrentSong();
-    const [index, setIndex] = useState(0);
 
     const { data, isInitialLoading } = useSongLyricsBySong(
         {
@@ -129,7 +139,7 @@ export const Lyrics = () => {
         },
         query: {
             remoteSongId: override?.id,
-            remoteSource: override?.source as LyricSource | undefined,
+            remoteSource: override?.source,
             song: currentSong,
         },
         serverId: currentSong?.serverId,
@@ -140,7 +150,6 @@ export const Lyrics = () => {
             (state) => state.current.song,
             () => {
                 setOverride(undefined);
-                setIndex(0);
             },
             { equalityFn: (a, b) => a?.id === b?.id },
         );
@@ -150,29 +159,16 @@ export const Lyrics = () => {
         };
     }, []);
 
-    const [lyrics, synced] = useMemo(() => {
-        if (Array.isArray(data)) {
-            if (data.length > 0) {
-                const selectedLyric = data[Math.min(index, data.length)];
-                return [selectedLyric, selectedLyric.synced];
-            }
-        } else if (data?.lyrics) {
-            return [data, Array.isArray(data.lyrics)];
-        }
-
-        return [undefined, false];
-    }, [data, index]);
-
-    const languages = useMemo(() => {
-        if (Array.isArray(data)) {
-            return data.map((lyric, idx) => ({ label: lyric.lang, value: idx.toString() }));
-        }
-        return [];
-    }, [data]);
-
     const isLoadingLyrics = isInitialLoading || isOverrideLoading;
 
-    const hasNoLyrics = !lyrics;
+    const hasNoLyrics = !data?.lyrics;
+
+    const lyricsMetadata:
+        | Partial<SynchronizedLyricMetadata>
+        | Partial<UnsynchronizedLyricMetadata>
+        | undefined = data;
+
+    const isSynchronizedLyrics = isSynchronized(lyricsMetadata);
 
     return (
         <ErrorBoundary FallbackComponent={ErrorFallback}>
@@ -202,11 +198,11 @@ export const Lyrics = () => {
                                 initial={{ opacity: 0 }}
                                 transition={{ duration: 0.5 }}
                             >
-                                {synced ? (
-                                    <SynchronizedLyrics {...(lyrics as SynchronizedLyricsProps)} />
+                                {isSynchronizedLyrics ? (
+                                    <SynchronizedLyrics {...lyricsMetadata} />
                                 ) : (
                                     <UnsynchronizedLyrics
-                                        {...(lyrics as UnsynchronizedLyricsProps)}
+                                        {...(lyricsMetadata as UnsynchronizedLyricMetadata)}
                                     />
                                 )}
                             </ScrollContainer>
@@ -215,9 +211,6 @@ export const Lyrics = () => {
                 )}
                 <ActionsContainer>
                     <LyricsActions
-                        index={index}
-                        languages={languages}
-                        setIndex={setIndex}
                         onRemoveLyric={handleOnRemoveLyric}
                         onResetLyric={handleOnResetLyric}
                         onSearchOverride={handleOnSearchOverride}

src/renderer/features/lyrics/queries/lyric-query.ts

@@ -6,16 +6,13 @@ import {
     InternetProviderLyricResponse,
     FullLyricsMetadata,
     LyricGetQuery,
-    StructuredLyric,
-    ServerType,
 } from '/@/renderer/api/types';
 import { QueryHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById, useLyricsSettings } from '/@/renderer/store';
 import { queryKeys } from '/@/renderer/api/query-keys';
+import { ServerType } from '/@/renderer/types';
 import { api } from '/@/renderer/api';
 import isElectron from 'is-electron';
-import { hasFeature } from '/@/renderer/api/utils';
-import { ServerFeature } from '/@/renderer/api/features-types';
 
 const lyricsIpc = isElectron() ? window.electron.lyrics : null;
 
@@ -83,7 +80,7 @@ export const useServerLyrics = (
 export const useSongLyricsBySong = (
     args: QueryHookArgs<LyricsQuery>,
     song: QueueSong | undefined,
-): UseQueryResult<FullLyricsMetadata | StructuredLyric[]> => {
+): UseQueryResult<FullLyricsMetadata> => {
     const { query } = args;
     const { fetch } = useLyricsSettings();
     const server = getServerById(song?.serverId);
@@ -92,22 +89,21 @@ export const useSongLyricsBySong = (
         cacheTime: Infinity,
         enabled: !!song && !!server,
         onError: () => {},
-        queryFn: async ({ signal }): Promise<FullLyricsMetadata | StructuredLyric[] | null> => {
+        queryFn: async ({ signal }) => {
             if (!server) throw new Error('Server not found');
             if (!song) return null;
 
-            if (hasFeature(server, ServerFeature.LYRICS_MULTIPLE_STRUCTURED)) {
-                const subsonicLyrics = await api.controller
-                    .getStructuredLyrics({
-                        apiClientProps: { server, signal },
-                        query: { songId: song.id },
-                    })
-                    .catch(console.error);
+            if (song.lyrics) {
+                return {
+                    artist: song.artists?.[0]?.name,
+                    lyrics: formatLyrics(song.lyrics),
+                    name: song.name,
+                    remote: false,
+                    source: server?.name ?? 'music server',
+                };
+            }
 
-                if (subsonicLyrics) {
-                    return subsonicLyrics;
-                }
-            } else if (hasFeature(server, ServerFeature.LYRICS_SINGLE_STRUCTURED)) {
+            if (server.type === ServerType.JELLYFIN) {
                 const jfLyrics = await api.controller
                     .getLyrics({
                         apiClientProps: { server, signal },
@@ -124,14 +120,6 @@ export const useSongLyricsBySong = (
                         source: server?.name ?? 'music server',
                     };
                 }
-            } else if (song.lyrics) {
-                return {
-                    artist: song.artists?.[0]?.name,
-                    lyrics: formatLyrics(song.lyrics),
-                    name: song.name,
-                    remote: false,
-                    source: server?.name ?? 'music server',
-                };
             }
 
             if (fetch) {

src/renderer/features/lyrics/synchronized-lyrics.tsx

@@ -3,7 +3,7 @@ import {
     useCurrentStatus,
     useCurrentTime,
     useLyricsSettings,
-    usePlaybackType,
+    usePlayerType,
     useSeeked,
 } from '/@/renderer/store';
 import { PlaybackType, PlayerStatus } from '/@/renderer/types';
@@ -21,7 +21,7 @@ const SynchronizedLyricsContainer = styled.div<{ $gap: number }>`
     gap: ${(props) => props.$gap || 5}px;
     width: 100%;
     height: 100%;
-    padding: 10vh 0 50vh;
+    padding: 10vh 0 6vh;
     overflow: scroll;
     transform: translateY(-2rem);
 
@@ -46,7 +46,7 @@ const SynchronizedLyricsContainer = styled.div<{ $gap: number }>`
     }
 `;
 
-export interface SynchronizedLyricsProps extends Omit<FullLyricsMetadata, 'lyrics'> {
+interface SynchronizedLyricsProps extends Omit<FullLyricsMetadata, 'lyrics'> {
     lyrics: SynchronizedLyricsArray;
 }
 
@@ -59,7 +59,7 @@ export const SynchronizedLyrics = ({
 }: SynchronizedLyricsProps) => {
     const playersRef = PlayersRef;
     const status = useCurrentStatus();
-    const playbackType = usePlaybackType();
+    const playerType = usePlayerType();
     const now = useCurrentTime();
     const settings = useLyricsSettings();
 
@@ -96,7 +96,7 @@ export const SynchronizedLyrics = ({
     };
 
     const getCurrentTime = useCallback(async () => {
-        if (isElectron() && playbackType !== PlaybackType.WEB) {
+        if (isElectron() && playerType !== PlaybackType.WEB) {
             if (mpvPlayer) {
                 return mpvPlayer.getCurrentTime();
             }
@@ -116,7 +116,7 @@ export const SynchronizedLyrics = ({
         if (!player) return 0;
 
         return player.currentTime;
-    }, [playbackType, playersRef]);
+    }, [playerType, playersRef]);
 
     const setCurrentLyric = useCallback(
         (timeInMs: number, epoch?: number, targetIndex?: number) => {
@@ -222,7 +222,7 @@ export const SynchronizedLyrics = ({
         }
 
         return () => {};
-    }, [getCurrentTime, lyrics, playbackType, setCurrentLyric, status]);
+    }, [getCurrentTime, lyrics, playerType, setCurrentLyric, status]);
 
     useEffect(() => {
         // This handler is used to deal with changes to the current delay. If the offset

src/renderer/features/lyrics/unsynchronized-lyrics.tsx

@@ -4,7 +4,7 @@ import { LyricLine } from '/@/renderer/features/lyrics/lyric-line';
 import { FullLyricsMetadata } from '/@/renderer/api/types';
 import { useLyricsSettings } from '/@/renderer/store';
 
-export interface UnsynchronizedLyricsProps extends Omit<FullLyricsMetadata, 'lyrics'> {
+interface UnsynchronizedLyricsProps extends Omit<FullLyricsMetadata, 'lyrics'> {
     lyrics: string;
 }