Merge branch 'main' of https://github.com/ciderapp/Cider

.github/workflows/build-analyze-linux.yml

@@ -27,6 +27,21 @@ on:
     - cron: '44 20 * * 1'
 
 jobs:
+
+  flatpak:
+    name: "Flatpak Builder"
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-40
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v2
+    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
+      with:
+        bundle: Cider.flatpak
+        manifest-path: ./flatpak/org.cidercollective.cider.yml
+        cache-key: flatpak-builder-${{ github.sha }}
+
   analyze:
     name: Analyze
     runs-on: ubuntu-latest

.github/workflows/release-all.yml

@@ -0,0 +1,31 @@
+name: Build/release
+
+on: push
+
+jobs:
+  release:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+
+    steps:
+
+      - name: Check out Git repository
+        uses: actions/checkout@v1
+
+      - name: Install Node.js, NPM and Yarn
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16
+
+      - name: Build/release Electron app
+        uses: samuelmeuli/action-electron-builder@v1
+        with:
+          # GitHub token, automatically provided to the action
+          # (No need to define this secret in the repo settings)
+          github_token: ${{ secrets.github_token }}
+
+          # release the app after building
+          release: true

flatpak/org.cidercollective.cider.yml

@@ -0,0 +1,85 @@
+app-id: org.cidercollective.cider
+branch: main
+runtime: org.freedesktop.Platform
+runtime-version: '21.08'
+sdk: org.freedesktop.Sdk
+# Use the Electron 2 BaseApp, which adds several common libraries we'll need.
+base: org.electronjs.Electron2.BaseApp
+base-version: '21.08'
+# Add the Node 10 SDK extension.
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.node14
+# Electron doesn't use a traditional locale format so separate-locales is useless.
+separate-locales: false
+command: start-electron-webpack-quick-start
+finish-args:
+  # These two lines add Xorg access for graphics.
+  - '--share=ipc'
+  - '--socket=x11'
+  # Sound access.
+  - '--socket=pulseaudio'
+  # Network access.
+  - '--share=network'
+  # If you need to access the filesystem, also add:
+  # - '--filesystem=home'
+modules:
+  # With electron-webpack and electron-builder we don't install Node to /app/node,
+  # because electron-builder will bundle everything for us in one piece.
+  # Instead we jump straight to the quick start module.
+
+  # However, since this quick start uses yarn, we do have to install that.
+  - name: yarn
+    buildsystem: simple
+    build-commands:
+      - 'cp -a * /app'
+    # Only used for building, so clean it up afterwards.
+    cleanup:
+      - '*'
+    sources:
+      - type: archive
+        url: https://github.com/yarnpkg/yarn/releases/download/v1.19.1/yarn-v1.19.1.tar.gz
+        sha256: 34293da6266f2aae9690d59c2d764056053ff7eebc56b80b8df05010c3da9343
+
+  - name: cider
+    buildsystem: simple
+    build-options:
+      # Add the node bin directory & yarn directory.
+      append-path: '/usr/lib/sdk/node14/bin:/app/yarn/bin'
+      env:
+        # Set the Electron cache directory.
+        # (The directory format is: /run/build/MODULE_NAME/flatpak-node/electron-cache)
+        ELECTRON_CACHE: '/run/build/cider/flatpak-node/electron-cache'
+        # Sets the directory where Node is located so way npm won't download the headers.
+        npm_config_nodedir: '/usr/lib/sdk/node14'
+    build-commands:
+      # Have Yarn use the offline mirror.
+      - 'HOME=$PWD yarn config --offline set yarn-offline-mirror $FLATPAK_BUILDER_BUILDDIR/flatpak-node/yarn-mirror'
+      - 'HOME=$PWD yarn config --offline set yarn-offline-mirror-pruning true'
+      # Download the packages.
+      - 'yarn install --offline'
+      # If you were using npm with electron-webpack/electron-builder, then the above two commands
+      # would look more like the npm commands in the vanilla-quick-start manifest, just without
+      # the --prefix.
+
+      # Run electron-builder, passing the architecture arguments to it.
+      # Note that the -- is important; without that, the argument will be passed to
+      # yarn instead of electron-builder.
+      - '. flatpak-node/electron-builder-arch-args.sh; yarn run --offline electron-builder build --linux dir -- $ELECTRON_BUILDER_ARCH_ARGS'
+      # Copy the resulting, unpacked directory to /app.
+      # (A glob is used because the directory name may contain the current arch.)
+      - 'cp -r dist/linux*unpacked /app/cider'
+      # If you passed --electron-non-patented-ffmpeg, you could install it like this:
+      # - 'install -Dm 755 flatpak-node/libffmpeg.so -t /app/electron-webpack-quick-start'
+      # Install the wrapper script to start it.
+      - 'install -Dm 755 cider.sh /app/bin/cider'
+    sources:
+      - type: git
+        url: https://github.com/ciderapp/cider
+        commit: 58dc5e9fd3eec2700d672494037f025dc1b99f4c
+      # Add the flatpak-node-generator generated sources.
+      - generated-sources.json
+      # Our runner script.
+      - type: script
+        dest-filename: cider.sh
+        commands:
+          - '/app/cider/cider'

package.json

@@ -2,7 +2,7 @@
   "name": "cider",
   "applicationId": "Cider",
   "productName": "Cider",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "A new look into listening and enjoying music in style and performance.",
   "license": "AGPL-3.0",
   "main": "./build/index.js",
@@ -22,7 +22,8 @@
     "start:darwin": "npm run build && export ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
     "pack": "electron-builder --dir",
     "dist": "npm run build && electron-builder",
-    "msft": "electron-builder -c msft-package.json",
+    "dist:all": "npm run build && electron-builder -mwl",
+    "msft": "npm run build && electron-builder -c msft-package.json",
     "postinstall": "electron-builder install-app-deps"
   },
   "dependencies": {

src/i18n/en_US.jsonc

@@ -117,7 +117,6 @@
   "term.tracks": "tracks", // Assume x amount of tracks. e.g. 50 tracks 
   "term.videos": "Videos", 
 
-
   // Home
   "home.title": "Home",
   "home.recentlyPlayed": "Recently Played",
@@ -180,6 +179,8 @@
   "action.playTracksNext": "Play ${app.selectedMediaItems.length} tracks next",
   "action.playTracksLater": "Play ${app.selectedMediaItems.length} tracks later",
   "action.removeTracks": "Remove ${self.selectedItems.length} tracks from queue",
+  "action.import": "Import",
+  "action.export": "Export",
 
   // Settings - General
   "settings.header.general": "General",

src/i18n/ja_JP.jsonc

@@ -176,6 +176,8 @@
   "action.playTracksNext": "${app.selectedMediaItems.length}曲が次に再生",
   "action.playTracksLater": "${app.selectedMediaItems.length}曲が最後に再生",
   "action.removeTracks": "${self.selectedItems.length}曲が「次はこちら」から削除",
+  "action.import": "インポート",
+  "action.export": "エクスポート",
 
   // Settings - Audio
   "settings.header.audio": "オーディオ",

src/i18n/zh_CN.jsonc

@@ -178,6 +178,8 @@
   "action.playTracksNext": "插播 ${app.selectedMediaItems.length} 首歌曲",
   "action.playTracksLater": "最后播放 ${app.selectedMediaItems.length} 首歌曲",
   "action.removeTracks": "从队列中移除 ${self.selectedItems.length} 首歌曲",
+  "action.import": "导入",
+  "action.export": "导出",
 
   // Settings - Audio
   "settings.header.audio": "音频",

src/i18n/zh_TW.jsonc

@@ -177,6 +177,8 @@
   "action.playTracksNext": "插播 ${app.selectedMediaItems.length} 首歌曲",
   "action.playTracksLater": "最後播放 ${app.selectedMediaItems.length} 首歌曲",
   "action.removeTracks": "從待播清單刪除 ${self.selectedItems.length} 首歌曲",
+  "action.import": "導入",
+  "action.export": "導出",
   
   // Settings - Audio
   "settings.header.audio": "音訊",

src/renderer/views/components/equalizer.ejs

@@ -25,7 +25,7 @@
                     </div>
                     <div class="input-container mini">
                         {{$root.cfg.audio.equalizer.mix}}
-                        <input tabindex="0" type="range" class="eq-slider mini" orient="vertical" min="0" max="1" step="0.1" v-model="$root.cfg.audio.equalizer.mix" @change="changeMix()">
+                        <input tabindex="0" type="range" class="eq-slider mini" orient="vertical" min="0" max="2" step="0.1" v-model="$root.cfg.audio.equalizer.mix" @change="changeMix()">
                         Mix
                     </div>
                     <div class="input-container header mini">
@@ -128,15 +128,6 @@
                     this.userGenerated = true
                 },
                 defaultPresets: [{
-                    'preset': 'default',
-                    'name': 'Default',
-                    'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
-                    'gain': [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                    'Q': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-                    'preamp': 0,
-                    'mix': 1,
-                    'userGenerated': false
-                }, {
                     'preset': 'warmth',
                     'name': 'Warmth',
                     'frequencies': [32, 75, 125, 197, 500, 1000, 2000, 3040, 8000, 16000],
@@ -199,23 +190,34 @@
                     'preamp': 0,
                     'mix': 1,
                     'userGenerated': false
-                }, {
+                }, 
-                    'preset': 'tightPerc',
+                {
-                    'name': 'Tight Percussion',
+                    'preset': 'bassBoostCrystal',
-                    'frequencies': [20, 63, 125, 250, 402, 1000, 1677, 3000, 8000, 11000],
+                    'name': 'Crystal Bass Boost',
-                    'gain': [-6.5, 0, 0, 0, -4.5, 0, -1.5, 3, 0, 0.1],
+                    'frequencies': [45.53,88.06,116.18,161.3,247.05,295.6,365.79,495.13,716.85,960.76],
-                    'Q': [0.8, 1, 1, 1, 6, 1, 0.8, 0.8, 1, 1],
+                    'gain': [-0.36,4.07,-1.3,1.92,0.77,-0.53,-1.33,0.44,0.46,-0.5],
+                    'Q': [1.768,0.625,5,8.409,10,16.82,5.946,7.071,20,10],
+                    'preamp': -2,
+                    'mix': 1,
+                    'userGenerated': false
+                },
+                {
+                    'preset': 'bassBoostSurgical',
+                    'name': 'Surgical Bass Boost',
+                    'frequencies': [32, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000],
+                    'gain': [2.7, 2.2, 1.6, 1.4, 0.6, 0, 0, 0, 0, 0],
+                    'Q': [1.4, 1.4, 1.4, 1.4, 1.4, 1, 1, 1, 1, 1],
                     'preamp': 0,
                     'mix': 1,
                     'userGenerated': false
                 }, {
-                    'preset': 'Maikiwi',
+                    'preset': 'bassBoostClassic',
-                    'name': 'Maikiwi',
+                    'name': 'Classic Bass Boost',
-                    'frequencies': [20, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000],
+                    'frequencies': [32, 63, 160, 250, 500, 1000, 2000, 3500, 8000, 20000],
-                    'gain': [1.5, 0, -0.7, 0, 0, 0, 0, 0.5, 0, 1.2],
+                    'gain': [2.7, 2.2, 1.6, 1.4, 0.6, 0, 0, 0, 0, 0],
-                    'Q': [0.4, 1, 2.9, 1, 1, 1, 1, 1.5, 1, 0.1],
+                    'Q': [0.7, 0.7, 0.7, 0.7, 0.7, 1, 1, 1, 1, 1],
                     'preamp': 0,
-                    'mix': 1.2,
+                    'mix': 1,
                     'userGenerated': false
                 }]
             }