Updated API

src/app/components/browse/chart-sidebar/chart-sidebar.component.html

@@ -10,7 +10,7 @@
     </div>
   </div>
   <div id="textPanel" class="content">
-    <span class="header">{{selectedVersion.avTagName}}</span>
+    <span class="header">{{selectedVersion.chartName}}</span>
     <div class="description">
       <div *ngIf="songResult.album == null"><b>Album:</b> {{selectedVersion.album}}</div>
       <div><b>{{charterPlural}}</b> {{selectedVersion.charters}}</div>

src/app/components/browse/chart-sidebar/chart-sidebar.component.ts

@@ -42,7 +42,7 @@ export class ChartSidebarComponent implements OnInit {
       this.songResult = result
       const albumArt = this.albumArtService.getImage(result.id)
       const results = await this.electronService.invoke('song-details', result.id)
-      this.charts = groupBy(results, 'chartID').sort((v1, v2) => v1[0].avTagName.length - v2[0].avTagName.length)
+      this.charts = groupBy(results, 'chartID').sort((v1, v2) => v1[0].chartName.length - v2[0].chartName.length)
       this.sortCharts()
       await this.selectChart(this.charts[0][0].chartID)
       this.initChartDropdown()
@@ -84,8 +84,8 @@ export class ChartSidebarComponent implements OnInit {
       const version = chart[0]
       return {
         value: version.chartID,
-        text: version.avTagName,
-        name: `${version.avTagName} <b>[${version.charters}]</b>`
+        text: version.chartName,
+        name: `${version.chartName} <b>[${version.charters}]</b>`
       }
     })
     const $chartDropdown = $('#chartDropdown')
@@ -127,7 +127,7 @@ export class ChartSidebarComponent implements OnInit {
    * Converts `this.selectedVersion.chartMetadata.length` into a readable duration.
    */
   updateSongLength() {
-    let seconds = this.selectedVersion.chartMetadata.length
+    let seconds = this.selectedVersion.songLength
     if (seconds < 60) { this.songLength = `${seconds} second${seconds == 1 ? '' : 's'}`; return }
     let minutes = Math.floor(seconds / 60)
     let hours = 0
@@ -204,7 +204,7 @@ export class ChartSidebarComponent implements OnInit {
   onDownloadClicked() {
     this.downloadService.addDownload(
       this.selectedVersion.versionID, {
-        avTagName: this.selectedVersion.avTagName,
+        chartName: this.selectedVersion.chartName,
         artist: this.songResult.artist,
         charter: this.selectedVersion.charters,
         driveData: this.selectedVersion.driveData

src/app/components/browse/status-bar/status-bar.component.html

@@ -18,7 +18,7 @@
     <div class="scrolling content">
       <div class="ui segments">
         <div class="ui segment" *ngFor="let chartGroup of chartGroups">
-          <p *ngFor="let chart of chartGroup">{{chart.avTagName}} <b>[{{chart.charters}}]</b></p>
+          <p *ngFor="let chart of chartGroup">{{chart.chartName}} <b>[{{chart.charters}}]</b></p>
         </div>
       </div>
     </div>

src/app/components/browse/status-bar/status-bar.component.ts

@@ -71,7 +71,7 @@ export class StatusBarComponent {
         const downloadSong = this.selectedResults.find(song => song.id == downloadVersion.songID)
         this.downloadService.addDownload(
           downloadVersion.versionID, {
-            avTagName: downloadVersion.avTagName,
+            chartName: downloadVersion.chartName,
             artist: downloadSong.artist,
             charter: downloadVersion.charters,
             driveData: downloadVersion.driveData
@@ -91,7 +91,7 @@ export class StatusBarComponent {
       const downloadSong = this.selectedResults.find(song => song.id == downloadVersion.songID)
       this.downloadService.addDownload(
         downloadVersion.versionID, {
-          avTagName: downloadVersion.avTagName,
+          chartName: downloadVersion.chartName,
           artist: downloadSong.artist,
           charter: downloadVersion.charters,
           driveData: downloadVersion.driveData

src/electron/ipc/download/ChartDownload.ts

@@ -50,7 +50,7 @@ export class ChartDownload {
     if (data.driveData.inChartPack) {
       this.destinationFolderName = sanitizeFilename(parse(data.driveData.files[0].name).name)
     } else {
-      this.destinationFolderName = sanitizeFilename(`${this.data.artist} - ${this.data.avTagName} (${this.data.charter})`)
+      this.destinationFolderName = sanitizeFilename(`${this.data.artist} - ${this.data.chartName} (${this.data.charter})`)
     }
   }
 
@@ -107,7 +107,7 @@ export class ChartDownload {
 
     emitIPCEvent('download-updated', {
       versionID: this.versionID,
-      title: `${this.data.avTagName} - ${this.data.artist}`,
+      title: `${this.data.chartName} - ${this.data.artist}`,
       header: header,
       description: description,
       percent: this.percent,

src/electron/shared/interfaces/download.interface.ts

@@ -13,7 +13,7 @@ export interface Download {
  * Contains the data required to start downloading a single chart.
  */
 export interface NewDownload {
-  avTagName: string
+  chartName: string
   artist: string
   charter: string
   driveData: DriveChart & { inChartPack: boolean }

src/electron/shared/interfaces/songDetails.interface.ts

@@ -14,27 +14,30 @@ export interface VersionResult {
   songID: number
   latestVersionID: number
   latestSetlistVersionID: number
-  icon: string
+  name: string
+  chartName: string
+  artist: string
+  album: string
+  genre: string
+  year: string
+  songDataIncorrect: boolean
   driveData: DriveChart & { inChartPack: boolean }
-  avTagName: string
+  md5: string
+  lastModified: string
+  icon: string
   charters: string
   charterIDs: string
   tags: string | null
-  lastModified: string
-  song_length: number
+  songLength: number
   diff_band: number
   diff_guitar: number
-  diff_rhythm: number
   diff_bass: number
+  diff_rhythm: number
   diff_drums: number
   diff_keys: number
   diff_guitarghl: number
   diff_bassghl: number
-  songDataIncorrect: boolean
-  year: string
-  chartMetadata: ChartMetadata
-  isRemoved: boolean
-  album: string
+  chartData: ChartData
 }
 
 export interface DriveChart {
@@ -42,15 +45,19 @@ export interface DriveChart {
   isArchive: boolean
   downloadPath: string
   filesHash: string
+  folderName: string
+  folderID: string
   files: DriveFile[]
 }
 
 export interface DriveSource {
   isSetlistSource: boolean
+  isDriveFileSource?: boolean
   setlistIcon?: string
   sourceUserIDs: number[]
   sourceName: string
   sourceDriveID: string
+  proxyLink?: string
 }
 
 export interface DriveFile {
@@ -63,7 +70,7 @@ export interface DriveFile {
   size: string
 }
 
-export interface ChartMetadata {
+export interface ChartData {
   hasSections: boolean
   hasStarPower: boolean
   hasForced: boolean