Merge branch 'release-0.3.0'

edward-ly · May 23, 2021 · 63edfa9 · 63edfa9
2 parents 04d0a8d + 06c2874
commit 63edfa9
Show file tree

Hide file tree

Showing 8 changed files with 1,363 additions and 3,293 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,8 +22,8 @@ jobs:
       matrix:
         os:
           - windows-latest
-          - macos-10.15
-          - ubuntu-16.04
+          - macos-latest
+          - ubuntu-latest
       max-parallel: 1
       fail-fast: false
     steps:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stepmania-song-manager",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Download and update song packs for StepMania",
   "productName": "StepMania Song Manager",
   "author": {
@@ -21,18 +21,19 @@
   },
   "dependencies": {
     "@auth0/s3": "^1.0.0",
-    "@quasar/extras": "^1.10.2",
+    "@quasar/extras": "^1.10.5",
     "auto-launch": "^5.0.5",
     "axios": "^0.21.1",
     "core-js": "^3.6.5",
     "electron-updater": "^4.3.8",
     "is-svg": "^4.2.2",
-    "quasar": "^2.0.0-beta.12",
+    "postcss": "^8.3.0",
+    "quasar": "^2.0.0-beta.18",
     "vue-i18n": "^9.0.0-beta.0",
     "xmldom": "0.5.0"
   },
   "devDependencies": {
-    "@quasar/app": "^3.0.0-beta.12",
+    "@quasar/app": "^3.0.0-beta.26",
     "babel-eslint": "^10.0.1",
     "electron": "^11.3.0",
     "electron-builder": "^22.4.0",

diff --git a/quasar.conf.js b/quasar.conf.js
@@ -194,13 +194,28 @@ module.exports = configure(function (/* ctx */) {
 
         appId: 'com.electron.stepmania-song-manager',
         win: {
-          target: 'nsis'
+          target: [
+            {
+              target: 'nsis',
+              arch: [ 'x64', 'arm64', 'ia32' ]
+            }
+          ]
         },
         mac: {
-          target: 'dmg'
+          target: [
+            {
+              target: 'dmg',
+              arch: [ 'x64', 'arm64' ]
+            }
+          ]
         },
         linux: {
-          target: 'AppImage'
+          target: [
+            {
+              target: 'AppImage',
+              arch: [ 'x64', 'arm64', 'ia32', 'armv7l' ]
+            }
+          ]
         },
         publish: {
           provider: 'github'

diff --git a/src-electron/electron-main.js b/src-electron/electron-main.js
@@ -219,10 +219,12 @@ function parseSimfileData (data, fileExtension) {
     dspLevel: getChartLevel(data, fileExtension, 'dance-single', 'Medium'),
     espLevel: getChartLevel(data, fileExtension, 'dance-single', 'Hard'),
     cspLevel: getChartLevel(data, fileExtension, 'dance-single', 'Challenge'),
+    spEditLevel: getChartLevel(data, fileExtension, 'dance-single', 'Edit'),
     bdpLevel: getChartLevel(data, fileExtension, 'dance-double', 'Easy'),
     ddpLevel: getChartLevel(data, fileExtension, 'dance-double', 'Medium'),
     edpLevel: getChartLevel(data, fileExtension, 'dance-double', 'Hard'),
     cdpLevel: getChartLevel(data, fileExtension, 'dance-double', 'Challenge'),
+    dpEditLevel: getChartLevel(data, fileExtension, 'dance-double', 'Edit'),
   }
 }
 

diff --git a/src/components/defaultRepos.js b/src/components/defaultRepos.js
@@ -4,7 +4,7 @@ const defaultRepos = [
     bucketName: 'ddr-arcade-simfiles',
     endpoint: 'https://s3.us-west-000.backblazeb2.com',
     description:
-      'The latest official arcade release of DDR, with all songs grouped by mix in chronological order. Will include new songs, rating adjustments, songs removals, etc. as the arcade game is updated.',
+      'The latest official arcade release of DDR, with all songs grouped by mix in chronological order. Will include new songs, rating adjustments, songs removals, etc. as the arcade game is updated. Source files: https://zenius-i-vanisher.com/v5.2/simfiles.php?category=simfiles',
   },
   // {
   //   name: 'DanceDanceRevolution XX',
@@ -18,14 +18,14 @@ const defaultRepos = [
     bucketName: 'led-light-simfiles',
     endpoint: 'https://s3.us-west-000.backblazeb2.com',
     description:
-      'DDR custom simfiles from the creator of StepMania Song Manager.',
+      'DDR custom simfiles from the creator of StepMania Song Manager. More info: https://zenius-i-vanisher.com/v5.2/viewsimfilecategory.php?categoryid=821',
   },
   {
     name: "led_light's Tech Experiments",
     bucketName: 'led-light-simfiles-itg',
     endpoint: 'https://s3.us-west-000.backblazeb2.com',
     description:
-      'ITG tech-style charts from the creator of StepMania Song Manager.',
+      'ITG tech-style charts from the creator of StepMania Song Manager. More info: https://zenius-i-vanisher.com/v5.2/viewsimfilecategory.php?categoryid=821',
   },
 ]
 

diff --git a/src/pages/About.vue b/src/pages/About.vue
@@ -20,7 +20,9 @@
             <div class="text-subtitle1">
               Version: {{ version }}
               <span class="q-px-md" />
-              <span class="text-link" @click="openUrl(appLog)">Release Notes</span>
+              <span class="text-link" @click="openUrl(appLog)">
+                Release Notes
+              </span>
             </div>
             <div class="q-gutter-sm" @click="openUrl(appGitHub)">
               <q-icon name="fab fa-github" size="xl" class="cursor-pointer" />

diff --git a/src/pages/SongList.vue b/src/pages/SongList.vue
@@ -25,6 +25,7 @@
           @click="expanded.fill(false)"
         />
         <q-toggle v-model="showTranslit" label="Show Transliterated" />
+        <q-toggle v-model="showEditCharts" label="Show Edit Charts" />
         <q-space />
         <q-input
           v-model="searchText"
@@ -76,6 +77,7 @@
                   dense
                   :rows="pack.songs"
                   :columns="columns"
+                  :visible-columns="getVisibleColumns()"
                   :row-key="getSongTitle"
                   :pagination="{ rowsPerPage: 0 }"
                   hide-pagination
@@ -112,6 +114,7 @@ export default defineComponent({
     const expanded = ref([])
     const duration = ref([])
     const showTranslit = ref(false)
+    const showEditCharts = ref(false)
     const searchText = ref(null)
 
     const noSongsFound = computed(() => {
@@ -177,6 +180,12 @@ export default defineComponent({
       return subtitle ? `${title} ${subtitle}` : title
     }
 
+    function getArtist (row) {
+      return showTranslit.value && row.artistTranslit
+        ? row.artistTranslit
+        : row.artist
+    }
+
     const columns = [
       {
         name: 'title',
@@ -190,10 +199,7 @@ export default defineComponent({
       {
         name: 'artist',
         label: 'Artist',
-        field: (row) =>
-          showTranslit.value && row.artistTranslit
-            ? row.artistTranslit
-            : row.artist,
+        field: getArtist,
         align: 'left',
         sortable: true,
         style: 'width: 40%',
@@ -287,6 +293,18 @@ export default defineComponent({
         headerClasses:
           'text-center text-no-wrap q-table--col-auto-width padding-level',
       },
+      {
+        name: 'spEdit',
+        label: 'EDIT',
+        field: 'spEditLevel',
+        align: 'center',
+        sortable: true,
+        sort: levelSort,
+        classes:
+          'bg-blue-grey-1 text-no-wrap q-table--col-auto-width padding-level',
+        headerClasses:
+          'text-center text-no-wrap q-table--col-auto-width padding-level',
+      },
       {
         name: 'bdp',
         label: 'BDP',
@@ -333,8 +351,43 @@ export default defineComponent({
         headerClasses:
           'text-center text-no-wrap q-table--col-auto-width padding-level',
       },
+      {
+        name: 'dpEdit',
+        label: 'EDIT',
+        field: 'dpEditLevel',
+        align: 'center',
+        sortable: true,
+        sort: levelSort,
+        classes:
+          'bg-blue-grey-1 text-no-wrap q-table--col-auto-width padding-level',
+        headerClasses:
+          'text-center text-no-wrap q-table--col-auto-width padding-level',
+      },
     ]
 
+    const visibleColumns = ref([
+      'title',
+      'artist',
+      'bpm',
+      'beg',
+      'bsp',
+      'dsp',
+      'esp',
+      'csp',
+      'spEdit',
+      'bdp',
+      'ddp',
+      'edp',
+      'cdp',
+      'dpEdit',
+    ])
+
+    function getVisibleColumns () {
+      if (showEditCharts.value) return visibleColumns.value
+
+      return _.without(visibleColumns.value, 'spEdit', 'dpEdit')
+    }
+
     function minimize () {
       window.windowAPI.minimize()
     }
@@ -355,10 +408,12 @@ export default defineComponent({
       expanded,
       duration,
       showTranslit,
+      showEditCharts,
       searchText,
       noSongsFound,
       filterSongList,
       columns,
+      getVisibleColumns,
       minimize,
       toggleMaximize,
       closeApp,