myxelium/Bridge-Multi
1
0
Fork 0
mirror of https://github.com/Myxelium/Bridge-Multi.git synced 2026-04-11 14:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update formatting

Browse Source
This commit is contained in:
Geomitron
2023-11-23 13:00:30 -06:00
parent 93aae097c6
commit cddec0d9d4
75 changed files with 4900 additions and 3279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package.json
View File

@@ -55,6 +55,10 @@
"devDependencies": {
"@angular-devkit/build-angular": "^17.0.3",
"@angular-eslint/builder": "17.1.0",
"@angular-eslint/eslint-plugin": "^17.1.0",
"@angular-eslint/eslint-plugin-template": "^17.1.0",
"@angular-eslint/schematics": "^17.1.0",
"@angular-eslint/template-parser": "^17.1.0",
"@angular/cli": "^17.0.3",
"@angular/compiler-cli": "^17.0.4",
"@angular/language-service": "^17.0.4",
@@ -65,10 +69,22 @@
"@types/randombytes": "^2.0.0",
"@typescript-eslint/eslint-plugin": "^6.12.0",
"@typescript-eslint/parser": "^6.12.0",
"concurrently": "^8.2.2",
"electron": "^27.1.2",
"electron-builder": "^23.6.0",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jsdoc": "^46.9.0",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-prettier": "^5.0.1",
"nodemon": "^3.0.1",
"postcss": "^8.4.31",
"prettier": "^3.1.0",
"prettier-eslint": "^16.1.2",
"source-map-support": "^0.5.21",
"tailwindcss": "^3.3.5",
"tsx": "^4.4.0",
"typescript": "^5.2.2"
}
}

1576
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

7
src/app/app-routing.module.ts
View File

@@ -1,5 +1,6 @@
import { NgModule } from '@angular/core'
import { Routes, RouterModule, RouteReuseStrategy } from '@angular/router'
import { RouteReuseStrategy, RouterModule, Routes } from '@angular/router'
import { BrowseComponent } from './components/browse/browse.component'
import { SettingsComponent } from './components/settings/settings.component'
import { TabPersistStrategy } from './core/tab-persist.strategy'
@@ -10,7 +11,7 @@ const routes: Routes = [
{ path: 'library', redirectTo: '/browse' },
{ path: 'settings', component: SettingsComponent, data: { shouldReuse: true } },
{ path: 'about', redirectTo: '/browse' },
{ path: '**', redirectTo: '/browse' }
{ path: '**', redirectTo: '/browse' },
]
@NgModule({
@@ -18,6 +19,6 @@ const routes: Routes = [
exports: [RouterModule],
providers: [
{ provide: RouteReuseStrategy, useClass: TabPersistStrategy },
]
],
})
export class AppRoutingModule { }

2
src/app/app.component.html
View File

@@ -1,4 +1,4 @@
<div *ngIf="settingsLoaded" style="display: flex; flex-direction: column; height: 100%;">
<div *ngIf="settingsLoaded" style="display: flex; flex-direction: column; height: 100%">
<app-toolbar></app-toolbar>
<router-outlet></router-outlet>
</div>

3
src/app/app.component.ts
View File

@@ -1,10 +1,11 @@
import { Component } from '@angular/core'
import { SettingsService } from './core/services/settings.service'
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styles: []
styles: [],
})
export class AppComponent {

22
src/app/app.module.ts
View File

@@ -1,20 +1,20 @@
import { BrowserModule } from '@angular/platform-browser'
import { NgModule } from '@angular/core'
import { FormsModule } from '@angular/forms'
import { BrowserModule } from '@angular/platform-browser'
import { AppRoutingModule } from './app-routing.module'
import { AppComponent } from './app.component'
import { ToolbarComponent } from './components/toolbar/toolbar.component'
import { BrowseComponent } from './components/browse/browse.component'
import { SearchBarComponent } from './components/browse/search-bar/search-bar.component'
import { StatusBarComponent } from './components/browse/status-bar/status-bar.component'
import { ResultTableComponent } from './components/browse/result-table/result-table.component'
import { ChartSidebarComponent } from './components/browse/chart-sidebar/chart-sidebar.component'
import { ResultTableRowComponent } from './components/browse/result-table/result-table-row/result-table-row.component'
import { ResultTableComponent } from './components/browse/result-table/result-table.component'
import { SearchBarComponent } from './components/browse/search-bar/search-bar.component'
import { DownloadsModalComponent } from './components/browse/status-bar/downloads-modal/downloads-modal.component'
import { ProgressBarDirective } from './core/directives/progress-bar.directive'
import { CheckboxDirective } from './core/directives/checkbox.directive'
import { StatusBarComponent } from './components/browse/status-bar/status-bar.component'
import { SettingsComponent } from './components/settings/settings.component'
import { FormsModule } from '@angular/forms'
import { ToolbarComponent } from './components/toolbar/toolbar.component'
import { CheckboxDirective } from './core/directives/checkbox.directive'
import { ProgressBarDirective } from './core/directives/progress-bar.directive'
@NgModule({
declarations: [
@@ -29,13 +29,13 @@ import { FormsModule } from '@angular/forms'
DownloadsModalComponent,
ProgressBarDirective,
CheckboxDirective,
SettingsComponent
SettingsComponent,
],
imports: [
BrowserModule,
AppRoutingModule,
FormsModule
FormsModule,
],
bootstrap: [AppComponent]
bootstrap: [AppComponent],
})
export class AppModule { }

5
src/app/components/browse/browse.component.html
View File

@@ -2,10 +2,7 @@
<div class="ui celled two column grid">
<div id="table-row" class="row">
<div id="table-column" class="column twelve wide">
<app-result-table
#resultTable
(rowClicked)="chartSidebar.onRowClicked($event)"
></app-result-table>
<app-result-table #resultTable (rowClicked)="chartSidebar.onRowClicked($event)"></app-result-table>
</div>
<div id="sidebar-column" class="column four wide">
<app-chart-sidebar #chartSidebar></app-chart-sidebar>

11
src/app/components/browse/browse.component.ts
View File

@@ -1,13 +1,14 @@
import { Component, ViewChild, AfterViewInit } from '@angular/core'
import { ChartSidebarComponent } from './chart-sidebar/chart-sidebar.component'
import { StatusBarComponent } from './status-bar/status-bar.component'
import { ResultTableComponent } from './result-table/result-table.component'
import { AfterViewInit, Component, ViewChild } from '@angular/core'
import { SearchService } from 'src/app/core/services/search.service'
import { ChartSidebarComponent } from './chart-sidebar/chart-sidebar.component'
import { ResultTableComponent } from './result-table/result-table.component'
import { StatusBarComponent } from './status-bar/status-bar.component'
@Component({
selector: 'app-browse',
templateUrl: './browse.component.html',
styleUrls: ['./browse.component.scss']
styleUrls: ['./browse.component.scss'],
})
export class BrowseComponent implements AfterViewInit {

22
src/app/components/browse/chart-sidebar/chart-sidebar.component.html
View File

@@ -1,27 +1,28 @@
<div id="sidebarCard" *ngIf="selectedVersion" class="ui fluid card">
<div class="ui placeholder" [ngClass]="{'placeholder': albumArtSrc == '', 'inverted': settingsService.theme == 'Dark'}">
<img *ngIf="albumArtSrc != null" class="ui square image" [src]="albumArtSrc">
<div class="ui placeholder" [ngClass]="{ placeholder: albumArtSrc === '', inverted: settingsService.theme === 'Dark' }">
<img *ngIf="albumArtSrc !== null" class="ui square image" [src]="albumArtSrc" />
</div>
<div *ngIf="charts.length > 1" id="chartDropdown" class="ui fluid right labeled scrolling icon dropdown button">
<input type="hidden" name="Chart">
<input type="hidden" name="Chart" />
<i id="chartDropdownIcon" class="dropdown icon"></i>
<div class="default text"></div>
<div id="chartDropdownMenu" class="menu">
</div>
<div id="chartDropdownMenu" class="menu"></div>
</div>
<div id="textPanel" class="content">
<span class="header">{{ selectedVersion.chartName }}</span>
<div class="description">
<div *ngIf="songResult.album == null"><b>Album:</b> {{selectedVersion.album}} ({{selectedVersion.year}})</div>
<div *ngIf="songResult.album != null"><b>Year:</b> {{selectedVersion.year}}</div>
<div *ngIf="songResult.genre == null"><b>Genre:</b> {{selectedVersion.genre}}</div>
<div><b>{{charterPlural}}</b> {{selectedVersion.charters}}</div>
<div *ngIf="songResult.album === null"><b>Album:</b> {{ selectedVersion.album }} ({{ selectedVersion.year }})</div>
<div *ngIf="songResult.album !== null"><b>Year:</b> {{ selectedVersion.year }}</div>
<div *ngIf="songResult.genre === null"><b>Genre:</b> {{ selectedVersion.genre }}</div>
<div>
<b>{{ charterPlural }}</b> {{ selectedVersion.charters }}
</div>
<div *ngIf="selectedVersion.tags"><b>Tags:</b> {{ selectedVersion.tags }}</div>
<div><b>Audio Length:</b> {{ songLength }}</div>
<div class="ui divider"></div>
<div class="ui horizontal list">
<div *ngFor="let difficulty of difficultiesList" class="item">
<img class="ui avatar image" src="assets/images/instruments/{{difficulty.instrument}}">
<img class="ui avatar image" src="assets/images/instruments/{{ difficulty.instrument }}" />
<div class="content">
<div class="header">Diff: {{ difficulty.diffNumber }}</div>
{{ difficulty.chartedDifficulties }}
@@ -35,7 +36,6 @@
</button>
</div>
</div>
</div>
<div id="downloadButtons" class="ui positive buttons">
<div id="downloadButton" class="ui button" (click)="onDownloadClicked()">{{ downloadButtonText }}</div>

34
src/app/components/browse/chart-sidebar/chart-sidebar.component.ts
View File

@@ -1,13 +1,14 @@
import { Component, OnInit } from '@angular/core'
import { DomSanitizer, SafeUrl } from '@angular/platform-browser'
import { SearchService } from 'src/app/core/services/search.service'
import { SettingsService } from 'src/app/core/services/settings.service'
import { groupBy } from 'src/electron/shared/UtilFunctions'
import { SongResult } from '../../../../electron/shared/interfaces/search.interface'
import { ElectronService } from '../../../core/services/electron.service'
import { VersionResult, getInstrumentIcon, Instrument, ChartedDifficulty } from '../../../../electron/shared/interfaces/songDetails.interface'
import { ChartedDifficulty, getInstrumentIcon, Instrument, VersionResult } from '../../../../electron/shared/interfaces/songDetails.interface'
import { AlbumArtService } from '../../../core/services/album-art.service'
import { DownloadService } from '../../../core/services/download.service'
import { groupBy } from 'src/electron/shared/UtilFunctions'
import { SearchService } from 'src/app/core/services/search.service'
import { DomSanitizer, SafeUrl } from '@angular/platform-browser'
import { SettingsService } from 'src/app/core/services/settings.service'
import { ElectronService } from '../../../core/services/electron.service'
interface Difficulty {
instrument: string
@@ -18,7 +19,7 @@ interface Difficulty {
@Component({
selector: 'app-chart-sidebar',
templateUrl: './chart-sidebar.component.html',
styleUrls: ['./chart-sidebar.component.scss']
styleUrls: ['./chart-sidebar.component.scss'],
})
export class ChartSidebarComponent implements OnInit {
@@ -26,6 +27,12 @@ export class ChartSidebarComponent implements OnInit {
selectedVersion: VersionResult
charts: VersionResult[][]
albumArtSrc: SafeUrl = ''
charterPlural: string
songLength: string
difficultiesList: Difficulty[]
downloadButtonText: string
constructor(
private electronService: ElectronService,
private albumArtService: AlbumArtService,
@@ -72,7 +79,6 @@ export class ChartSidebarComponent implements OnInit {
}
}
albumArtSrc: SafeUrl = ''
/**
* Updates the sidebar to display the album art.
*/
@@ -93,7 +99,7 @@ export class ChartSidebarComponent implements OnInit {
return {
value: version.chartID,
text: version.chartName,
name: `${version.chartName} <b>[${version.charters}]</b>`
name: `${version.chartName} <b>[${version.charters}]</b>`,
}
})
const $chartDropdown = $('#chartDropdown')
@@ -123,7 +129,6 @@ export class ChartSidebarComponent implements OnInit {
}
}
charterPlural: string
/**
* Chooses to display 'Charter:' or 'Charters:'.
*/
@@ -131,7 +136,6 @@ export class ChartSidebarComponent implements OnInit {
this.charterPlural = this.selectedVersion.charterIDs.split('&').length == 1 ? 'Charter:' : 'Charters:'
}
songLength: string
/**
* Converts `this.selectedVersion.chartMetadata.length` into a readable duration.
*/
@@ -148,7 +152,6 @@ export class ChartSidebarComponent implements OnInit {
this.songLength = `${hours == 0 ? '' : hours + ':'}${minutes == 0 ? '' : minutes + ':'}${seconds < 10 ? '0' + seconds : seconds}`
}
difficultiesList: Difficulty[]
/**
* Updates `dfficultiesList` with the difficulty information for the selected version.
*/
@@ -160,7 +163,7 @@ export class ChartSidebarComponent implements OnInit {
this.difficultiesList.push({
instrument: getInstrumentIcon(instrument),
diffNumber: this.getDiffNumber(instrument),
chartedDifficulties: this.getChartedDifficultiesText(instrument)
chartedDifficulties: this.getChartedDifficultiesText(instrument),
})
}
}
@@ -189,7 +192,6 @@ export class ChartSidebarComponent implements OnInit {
return difficultyNames.join(', ')
}
downloadButtonText: string
/**
* Chooses the text to display on the download button.
*/
@@ -219,7 +221,7 @@ export class ChartSidebarComponent implements OnInit {
const values = versions.map(version => ({
value: version.versionID,
text: 'Uploaded ' + this.getLastModifiedText(version.lastModified),
name: 'Uploaded ' + this.getLastModifiedText(version.lastModified)
name: 'Uploaded ' + this.getLastModifiedText(version.lastModified),
}))
$versionDropdown.dropdown('setup menu', { values })
@@ -280,7 +282,7 @@ export class ChartSidebarComponent implements OnInit {
chartName: this.selectedVersion.chartName,
artist: this.songResult.artist,
charter: this.selectedVersion.charters,
driveData: this.selectedVersion.driveData
driveData: this.selectedVersion.driveData,
})
}
}

7
src/app/components/browse/result-table/result-table-row/result-table-row.component.html
View File

@@ -1,9 +1,12 @@
<td>
<div #checkbox class="ui checkbox" (click)="$event.stopPropagation()">
<input type="checkbox">
<input type="checkbox" />
</div>
</td>
<td><span id="chartCount" *ngIf="result.chartCount > 1">{{result.chartCount}}</span>{{result.name}}</td>
<td>
<span id="chartCount" *ngIf="result.chartCount > 1">{{ result.chartCount }}</span
>{{ result.name }}
</td>
<td>{{ result.artist }}</td>
<td>{{ result.album || 'Various' }}</td>
<td>{{ result.genre || 'Various' }}</td>

9
src/app/components/browse/result-table/result-table-row/result-table-row.component.ts
View File

@@ -1,11 +1,12 @@
import { Component, AfterViewInit, Input, ViewChild, ElementRef } from '@angular/core'
import { AfterViewInit, Component, ElementRef, Input, ViewChild } from '@angular/core'
import { SongResult } from '../../../../../electron/shared/interfaces/search.interface'
import { SelectionService } from '../../../../core/services/selection.service'
@Component({
selector: 'tr[app-result-table-row]',
templateUrl: './result-table-row.component.html',
styleUrls: ['./result-table-row.component.scss']
styleUrls: ['./result-table-row.component.scss'],
})
export class ResultTableRowComponent implements AfterViewInit {
@Input() result: SongResult
@@ -19,7 +20,7 @@ export class ResultTableRowComponent implements AfterViewInit {
}
ngAfterViewInit() {
this.selectionService.onSelectionChanged(this.songID, (isChecked) => {
this.selectionService.onSelectionChanged(this.songID, isChecked => {
if (isChecked) {
$(this.checkbox.nativeElement).checkbox('check')
} else {
@@ -33,7 +34,7 @@ export class ResultTableRowComponent implements AfterViewInit {
},
onUnchecked: () => {
this.selectionService.deselectSong(this.songID)
}
},
})
}
}

17
src/app/components/browse/result-table/result-table.component.html
View File

@@ -1,4 +1,7 @@
<table id="resultTable" class="ui stackable selectable single sortable fixed line striped compact small table" [class.inverted]="settingsService.theme == 'Dark'">
<table
id="resultTable"
class="ui stackable selectable single sortable fixed line striped compact small table"
[class.inverted]="settingsService.theme === 'Dark'">
<!-- TODO: maybe have some of these tags customizable? E.g. small/large/compact/padded -->
<!-- TODO: learn semantic themes in order to change the $mobileBreakpoint global variable (better search table adjustment) -->
<thead>
@@ -6,13 +9,13 @@
<tr>
<th class="collapsing" id="checkboxColumn">
<div class="ui checkbox" id="checkbox" #checkboxColumn appCheckbox (checked)="checkAll($event)">
<input type="checkbox">
<input type="checkbox" />
</div>
</th>
<th class="four wide" [class.sorted]="sortColumn == 'name'" [ngClass]="sortDirection" (click)="onColClicked('name')">Name</th>
<th class="four wide" [class.sorted]="sortColumn == 'artist'" [ngClass]="sortDirection" (click)="onColClicked('artist')">Artist</th>
<th class="four wide" [class.sorted]="sortColumn == 'album'" [ngClass]="sortDirection" (click)="onColClicked('album')">Album</th>
<th class="four wide" [class.sorted]="sortColumn == 'genre'" [ngClass]="sortDirection" (click)="onColClicked('genre')">Genre</th>
<th class="four wide" [class.sorted]="sortColumn === 'name'" [ngClass]="sortDirection" (click)="onColClicked('name')">Name</th>
<th class="four wide" [class.sorted]="sortColumn === 'artist'" [ngClass]="sortDirection" (click)="onColClicked('artist')">Artist</th>
<th class="four wide" [class.sorted]="sortColumn === 'album'" [ngClass]="sortDirection" (click)="onColClicked('album')">Album</th>
<th class="four wide" [class.sorted]="sortColumn === 'genre'" [ngClass]="sortDirection" (click)="onColClicked('genre')">Genre</th>
</tr>
</thead>
<tbody>
@@ -21,7 +24,7 @@
#tableRow
*ngFor="let result of results"
(click)="onRowClicked(result)"
[class.active]="activeRowID == result.id"
[class.active]="activeRowID === result.id"
[result]="result"></tr>
</tbody>
</table>

14
src/app/components/browse/result-table/result-table.component.ts
View File

@@ -1,16 +1,18 @@
import { Component, Output, EventEmitter, ViewChildren, QueryList, ViewChild, OnInit } from '@angular/core'
import { Component, EventEmitter, OnInit, Output, QueryList, ViewChild, ViewChildren } from '@angular/core'
import Comparators from 'comparators'
import { SettingsService } from 'src/app/core/services/settings.service'
import { SongResult } from '../../../../electron/shared/interfaces/search.interface'
import { ResultTableRowComponent } from './result-table-row/result-table-row.component'
import { CheckboxDirective } from '../../../core/directives/checkbox.directive'
import { SearchService } from '../../../core/services/search.service'
import { SelectionService } from '../../../core/services/selection.service'
import { SettingsService } from 'src/app/core/services/settings.service'
import Comparators from 'comparators'
import { ResultTableRowComponent } from './result-table-row/result-table-row.component'
@Component({
selector: 'app-result-table',
templateUrl: './result-table.component.html',
styleUrls: ['./result-table.component.scss']
styleUrls: ['./result-table.component.scss'],
})
export class ResultTableComponent implements OnInit {
@@ -31,7 +33,7 @@ export class ResultTableComponent implements OnInit {
) { }
ngOnInit() {
this.selectionService.onSelectAllChanged((selected) => {
this.selectionService.onSelectAllChanged(selected => {
this.checkboxColumn.check(selected)
})

71
src/app/components/browse/search-bar/search-bar.component.html
View File

@@ -1,15 +1,20 @@
<div id="searchMenu" class="ui bottom attached borderless menu">
<div class="item">
<div class="ui icon input" [class.loading]="isLoading()">
<input #searchBox type="text" placeholder=" Search..." (keyup.enter)="onSearch(searchBox.value)">
<i #searchIcon id="searchIcon" class="link icon" [ngClass]="isError ? 'red exclamation triangle' : 'search'"
data-content="Failed to connect to the Bridge database" data-position="bottom right"></i>
<input #searchBox type="text" placeholder=" Search..." (keyup.enter)="onSearch(searchBox.value)" />
<i
#searchIcon
id="searchIcon"
class="link icon"
[ngClass]="isError ? 'red exclamation triangle' : 'search'"
data-content="Failed to connect to the Bridge database"
data-position="bottom right"></i>
</div>
</div>
<div id="quantityDropdownItem" [class.hidden]="!showAdvanced" class="item">
<div #quantityDropdown class="ui compact selection dropdown">
<input name="quantityMatch" type="hidden">
<input name="quantityMatch" type="hidden" />
<i class="dropdown icon"></i>
<div class="text"><b>all</b> words match</div>
<div class="menu">
@@ -21,7 +26,7 @@
<div id="similarityDropdownItem" [class.hidden]="!showAdvanced" class="item">
<div #similarityDropdown class="ui compact selection dropdown">
<input name="similarityMatch" type="hidden" value="similar">
<input name="similarityMatch" type="hidden" value="similar" />
<i class="dropdown icon"></i>
<div class="text"><b>similar</b> words match</div>
<div class="menu">
@@ -45,43 +50,43 @@
<h5 class="ui dividing header">Search for</h5>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="name" [(ngModel)]="searchSettings.fields.name">
<input type="checkbox" name="name" [(ngModel)]="searchSettings.fields.name" />
<label>Name</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="artist" [(ngModel)]="searchSettings.fields.artist">
<input type="checkbox" name="artist" [(ngModel)]="searchSettings.fields.artist" />
<label>Artist</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="album" [(ngModel)]="searchSettings.fields.album">
<input type="checkbox" name="album" [(ngModel)]="searchSettings.fields.album" />
<label>Album</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="genre" [(ngModel)]="searchSettings.fields.genre">
<input type="checkbox" name="genre" [(ngModel)]="searchSettings.fields.genre" />
<label>Genre</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="year" [(ngModel)]="searchSettings.fields.year">
<input type="checkbox" name="year" [(ngModel)]="searchSettings.fields.year" />
<label>Year</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="charter" [(ngModel)]="searchSettings.fields.charter">
<input type="checkbox" name="charter" [(ngModel)]="searchSettings.fields.charter" />
<label>Charter</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="tag" [(ngModel)]="searchSettings.fields.tag">
<input type="checkbox" name="tag" [(ngModel)]="searchSettings.fields.tag" />
<label>Tag</label>
</div>
</div>
@@ -92,55 +97,55 @@
<h5 class="ui dividing header">Must include</h5>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="sections" [(ngModel)]="searchSettings.tags.sections">
<input type="checkbox" name="sections" [(ngModel)]="searchSettings.tags.sections" />
<label>Sections</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="starpower" [(ngModel)]="searchSettings.tags['star power']">
<input type="checkbox" name="starpower" [(ngModel)]="searchSettings.tags['star power']" />
<label>Star Power</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="forcing" [(ngModel)]="searchSettings.tags.forcing">
<input type="checkbox" name="forcing" [(ngModel)]="searchSettings.tags.forcing" />
<label>Forcing</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="taps" [(ngModel)]="searchSettings.tags.taps">
<input type="checkbox" name="taps" [(ngModel)]="searchSettings.tags.taps" />
<label>Taps</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="lyrics" [(ngModel)]="searchSettings.tags.lyrics">
<input type="checkbox" name="lyrics" [(ngModel)]="searchSettings.tags.lyrics" />
<label>Lyrics</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="videobackground" [(ngModel)]="searchSettings.tags.video">
<input type="checkbox" name="videobackground" [(ngModel)]="searchSettings.tags.video" />
<label>Video Background</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="stems" [(ngModel)]="searchSettings.tags.stems">
<input type="checkbox" name="stems" [(ngModel)]="searchSettings.tags.stems" />
<label>Audio Stems</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="solosections" [(ngModel)]="searchSettings.tags['solo sections']">
<input type="checkbox" name="solosections" [(ngModel)]="searchSettings.tags['solo sections']" />
<label>Solo Sections</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="opennotes" [(ngModel)]="searchSettings.tags['open notes']">
<input type="checkbox" name="opennotes" [(ngModel)]="searchSettings.tags['open notes']" />
<label>Open Notes</label>
</div>
</div>
@@ -151,49 +156,49 @@
<h5 class="ui dividing header">Instruments</h5>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="guitar" [(ngModel)]="searchSettings.instruments.guitar">
<input type="checkbox" name="guitar" [(ngModel)]="searchSettings.instruments.guitar" />
<label>Guitar</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="bass" [(ngModel)]="searchSettings.instruments.bass">
<input type="checkbox" name="bass" [(ngModel)]="searchSettings.instruments.bass" />
<label>Bass</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="rhythm" [(ngModel)]="searchSettings.instruments.rhythm">
<input type="checkbox" name="rhythm" [(ngModel)]="searchSettings.instruments.rhythm" />
<label>Rhythm</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="keys" [(ngModel)]="searchSettings.instruments.keys">
<input type="checkbox" name="keys" [(ngModel)]="searchSettings.instruments.keys" />
<label>Keys</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="drums" [(ngModel)]="searchSettings.instruments.drums">
<input type="checkbox" name="drums" [(ngModel)]="searchSettings.instruments.drums" />
<label>Drums</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="guitarghl" [(ngModel)]="searchSettings.instruments.guitarghl">
<input type="checkbox" name="guitarghl" [(ngModel)]="searchSettings.instruments.guitarghl" />
<label>GHL Guitar</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="bassghl" [(ngModel)]="searchSettings.instruments.bassghl">
<input type="checkbox" name="bassghl" [(ngModel)]="searchSettings.instruments.bassghl" />
<label>GHL Bass</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="vocals" [(ngModel)]="searchSettings.instruments.vocals">
<input type="checkbox" name="vocals" [(ngModel)]="searchSettings.instruments.vocals" />
<label>Vocals</label>
</div>
</div>
@@ -204,25 +209,25 @@
<div class="grouped fields">
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="expert" [(ngModel)]="searchSettings.difficulties.expert">
<input type="checkbox" name="expert" [(ngModel)]="searchSettings.difficulties.expert" />
<label>Expert</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="hard" [(ngModel)]="searchSettings.difficulties.hard">
<input type="checkbox" name="hard" [(ngModel)]="searchSettings.difficulties.hard" />
<label>Hard</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="medium" [(ngModel)]="searchSettings.difficulties.medium">
<input type="checkbox" name="medium" [(ngModel)]="searchSettings.difficulties.medium" />
<label>Medium</label>
</div>
</div>
<div class="field">
<div class="ui checkbox">
<input type="checkbox" name="easy" [(ngModel)]="searchSettings.difficulties.easy">
<input type="checkbox" name="easy" [(ngModel)]="searchSettings.difficulties.easy" />
<label>Easy</label>
</div>
</div>

17
src/app/components/browse/search-bar/search-bar.component.ts
View File

@@ -1,11 +1,12 @@
import { Component, AfterViewInit, ViewChild, ElementRef } from '@angular/core'
import { AfterViewInit, Component, ElementRef, ViewChild } from '@angular/core'
import { SearchService } from 'src/app/core/services/search.service'
import { getDefaultSearch, SongSearch } from 'src/electron/shared/interfaces/search.interface'
import { getDefaultSearch } from 'src/electron/shared/interfaces/search.interface'
@Component({
selector: 'app-search-bar',
templateUrl: './search-bar.component.html',
styleUrls: ['./search-bar.component.scss']
styleUrls: ['./search-bar.component.scss'],
})
export class SearchBarComponent implements AfterViewInit {
@@ -23,20 +24,20 @@ export class SearchBarComponent implements AfterViewInit {
ngAfterViewInit() {
$(this.searchIcon.nativeElement).popup({
onShow: () => this.isError // Only show the popup if there is an error
onShow: () => this.isError, // Only show the popup if there is an error
})
this.searchService.onSearchErrorStateUpdate((isError) => {
this.searchService.onSearchErrorStateUpdate(isError => {
this.isError = isError
})
$(this.quantityDropdown.nativeElement).dropdown({
onChange: (value: string) => {
this.searchSettings.quantity = value as 'all' | 'any'
}
},
})
$(this.similarityDropdown.nativeElement).dropdown({
onChange: (value: string) => {
this.searchSettings.similarity = value as 'similar' | 'exact'
}
},
})
}
@@ -61,7 +62,7 @@ export class SearchBarComponent implements AfterViewInit {
onChange: (_length: number, min: number, max: number) => {
this.searchSettings.minDiff = min
this.searchSettings.maxDiff = max
}
},
})
}, 50)
this.sliderInitialized = true

10
src/app/components/browse/status-bar/downloads-modal/downloads-modal.component.html
View File

@@ -1,13 +1,12 @@
<div *ngIf="downloads.length > 0" class="ui segments">
<div *ngFor="let download of downloads; trackBy: trackByVersionID" class="ui segment" [style.background-color]="getBackgroundColor(download)">
<h3 id="downloadTitle">
<span style="flex-grow: 1;">{{download.title}}</span>
<span style="flex-grow: 1">{{ download.title }}</span>
<i class="inside right close icon" (click)="cancelDownload(download.versionID)"></i>
</h3>
<div id="downloadText">
<span style="flex-grow: 1;">{{download.header}}</span>
<span style="flex-grow: 1">{{ download.header }}</span>
<span *ngIf="!download.isLink" class="description">{{ download.description }}</span>
<span *ngIf="download.isLink" class="description">
<a (click)="openFolder(download.description)">{{ download.description }}</a>
@@ -16,12 +15,11 @@
<div id="downloadProgressDiv">
<div id="downloadProgressBar" appProgressBar [percent]="download.percent" class="ui small progress">
<div class="bar" [style.height]="download.type == 'error' ? '-webkit-fill-available' : undefined">
<div class="bar" [style.height]="download.type === 'error' ? '-webkit-fill-available' : undefined">
<div class="progress"></div>
</div>
</div>
<button *ngIf="download.type == 'error'" class="ui right attached labeled compact icon button"
(click)="retryDownload(download.versionID)">
<button *ngIf="download.type === 'error'" class="ui right attached labeled compact icon button" (click)="retryDownload(download.versionID)">
<i class="redo icon"></i>
Retry
</button>

7
src/app/components/browse/status-bar/downloads-modal/downloads-modal.component.ts
View File

@@ -1,4 +1,5 @@
import { Component, ChangeDetectorRef } from '@angular/core'
import { ChangeDetectorRef, Component } from '@angular/core'
import { DownloadProgress } from '../../../../../electron/shared/interfaces/download.interface'
import { DownloadService } from '../../../../core/services/download.service'
import { ElectronService } from '../../../../core/services/electron.service'
@@ -6,14 +7,14 @@ import { ElectronService } from '../../../../core/services/electron.service'
@Component({
selector: 'app-downloads-modal',
templateUrl: './downloads-modal.component.html',
styleUrls: ['./downloads-modal.component.scss']
styleUrls: ['./downloads-modal.component.scss'],
})
export class DownloadsModalComponent {
downloads: DownloadProgress[] = []
constructor(private electronService: ElectronService, private downloadService: DownloadService, ref: ChangeDetectorRef) {
electronService.receiveIPC('queue-updated', (order) => {
electronService.receiveIPC('queue-updated', order => {
this.downloads.sort((a, b) => order.indexOf(a.versionID) - order.indexOf(b.versionID))
})

6
src/app/components/browse/status-bar/status-bar.component.html
View File

@@ -1,5 +1,5 @@
<div id="bottomMenu" class="ui bottom borderless menu">
<div *ngIf="resultCount > 0" class="item">{{resultCount}}{{allResultsVisible ? '' : '+'}} Result{{resultCount == 1 ? '' : 's'}}</div>
<div *ngIf="resultCount > 0" class="item">{{ resultCount }}{{ allResultsVisible ? '' : '+' }} Result{{ resultCount === 1 ? '' : 's' }}</div>
<div class="item">
<button *ngIf="selectedResults.length > 1" (click)="downloadSelected()" class="ui positive button">
Download {{ selectedResults.length }} Results
@@ -18,7 +18,9 @@
<div class="scrolling content">
<div class="ui segments">
<div class="ui segment" *ngFor="let chartGroup of chartGroups">
<p *ngFor="let chart of chartGroup">{{chart.chartName}} <b>[{{chart.charters}}]</b></p>
<p *ngFor="let chart of chartGroup">
{{ chart.chartName }} <b>[{{ chart.charters }}]</b>
</p>
</div>
</div>
</div>

13
src/app/components/browse/status-bar/status-bar.component.ts
View File

@@ -1,15 +1,16 @@
import { Component, ChangeDetectorRef } from '@angular/core'
import { ChangeDetectorRef, Component } from '@angular/core'
import { VersionResult } from '../../../../electron/shared/interfaces/songDetails.interface'
import { groupBy } from '../../../../electron/shared/UtilFunctions'
import { DownloadService } from '../../../core/services/download.service'
import { ElectronService } from '../../../core/services/electron.service'
import { groupBy } from '../../../../electron/shared/UtilFunctions'
import { VersionResult } from '../../../../electron/shared/interfaces/songDetails.interface'
import { SearchService } from '../../../core/services/search.service'
import { SelectionService } from '../../../core/services/selection.service'
@Component({
selector: 'app-status-bar',
templateUrl: './status-bar.component.html',
styleUrls: ['./status-bar.component.scss']
styleUrls: ['./status-bar.component.scss'],
})
export class StatusBarComponent {
@@ -76,7 +77,7 @@ export class StatusBarComponent {
chartName: downloadVersion.chartName,
artist: downloadSong.artist,
charter: downloadVersion.charters,
driveData: downloadVersion.driveData
driveData: downloadVersion.driveData,
})
}
} else {
@@ -96,7 +97,7 @@ export class StatusBarComponent {
chartName: downloadVersion.chartName,
artist: downloadSong.artist,
charter: downloadVersion.charters,
driveData: downloadVersion.driveData
driveData: downloadVersion.driveData,
}
)
}

40
src/app/components/settings/settings.component.html
View File

@@ -3,25 +3,30 @@
<div class="field">
<label>Chart library directory</label>
<div class="ui action input">
<input [value]="settingsService.libraryDirectory || 'No folder selected'" class="default-cursor" readonly
type="text" placeholder="No directory selected!">
<button *ngIf="settingsService.libraryDirectory != undefined" (click)="openLibraryDirectory()"
class="ui button">Open Folder</button>
<input
[value]="settingsService.libraryDirectory || 'No folder selected'"
class="default-cursor"
readonly
type="text"
placeholder="No directory selected!" />
<button *ngIf="settingsService.libraryDirectory !== undefined" (click)="openLibraryDirectory()" class="ui button">Open Folder</button>
<button (click)="getLibraryDirectory()" class="ui button positive">Choose</button>
</div>
</div>
</div>
<h3 class="ui header">Cache</h3>
<div>Current Cache Size: <div class="ui label" style="margin-left: 1em;">{{cacheSize}}</div>
<div>
Current Cache Size:
<div class="ui label" style="margin-left: 1em">{{ cacheSize }}</div>
</div>
<button style="margin-top: 0.5em;" (click)="clearCache()" class="ui button">Clear Cache</button>
<button style="margin-top: 0.5em" (click)="clearCache()" class="ui button">Clear Cache</button>
<h3 class="ui header">Downloads</h3>
<div class="ui form">
<div class="field">
<div appCheckbox #videoCheckbox class="ui checkbox" (checked)="downloadVideos($event)">
<input type="checkbox">
<input type="checkbox" />
<label>Download video backgrounds</label>
</div>
</div>
@@ -29,21 +34,19 @@
<div class="field">
<label>Google rate limit delay</label>
<div id="rateLimitInput" class="ui right labeled input">
<input type="number" [value]="settingsService.rateLimitDelay" (input)="changeRateLimit($event)">
<div class="ui basic label">
sec
</div>
<input type="number" [value]="settingsService.rateLimitDelay" (input)="changeRateLimit($event)" />
<div class="ui basic label">sec</div>
</div>
</div>
<div *ngIf="settingsService.rateLimitDelay < 30" class="ui warning message">
<i class="exclamation circle icon"></i>
<b>Warning:</b> downloading files from Google with a delay less than about 30 seconds will eventually cause Google to
refuse download requests from this program for a few hours. This limitation will be removed in a future update.
<b>Warning:</b> downloading files from Google with a delay less than about 30 seconds will eventually cause Google to refuse download requests from
this program for a few hours. This limitation will be removed in a future update.
</div>
<h3 class="ui header">Theme</h3>
<div #themeDropdown class="ui selection dropdown mr">
<input type="hidden" name="sort" [value]="settingsService.theme">
<input type="hidden" name="sort" [value]="settingsService.theme" />
<i class="dropdown icon"></i>
<div class="default text">{{ settingsService.theme }}</div>
<div class="menu">
@@ -54,14 +57,15 @@
<div class="bottom">
<div class="ui buttons">
<button *ngIf="updateAvailable" class="ui labeled icon positive button" (click)="downloadUpdate()">
<i class="left alternate icon" [ngClass]="(updateDownloaded ? 'sync' : 'cloud download')"></i>{{downloadUpdateText}}</button>
<i class="left alternate icon" [ngClass]="updateDownloaded ? 'sync' : 'cloud download'"></i>{{ downloadUpdateText }}
</button>
<button *ngIf="updateAvailable === null" class="ui labeled yellow icon button" [class.disabled]="updateRetrying" (click)="retryUpdate()">
<i class="left alternate sync alternate icon" [class.loading]="updateRetrying"></i>{{retryUpdateText}}</button>
<i class="left alternate sync alternate icon" [class.loading]="updateRetrying"></i>{{ retryUpdateText }}
</button>
<button id="versionNumberButton" class="ui basic disabled button">{{ currentVersion }}</button>
</div>
<button class="ui basic icon button" data-tooltip="Toggle developer tools" data-position="top right"
(click)="toggleDevTools()">
<button class="ui basic icon button" data-tooltip="Toggle developer tools" data-position="top right" (click)="toggleDevTools()">
<i class="cog icon"></i>
</button>
</div>

13
src/app/components/settings/settings.component.ts
View File

@@ -1,4 +1,5 @@
import { Component, OnInit, AfterViewInit, ChangeDetectorRef, ViewChild, ElementRef } from '@angular/core'
import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild } from '@angular/core'
import { CheckboxDirective } from 'src/app/core/directives/checkbox.directive'
import { ElectronService } from 'src/app/core/services/electron.service'
import { SettingsService } from 'src/app/core/services/settings.service'
@@ -6,7 +7,7 @@ import { SettingsService } from 'src/app/core/services/settings.service'
@Component({
selector: 'app-settings',
templateUrl: './settings.component.html',
styleUrls: ['./settings.component.scss']
styleUrls: ['./settings.component.scss'],
})
export class SettingsComponent implements OnInit, AfterViewInit {
@ViewChild('themeDropdown', { static: true }) themeDropdown: ElementRef
@@ -29,7 +30,7 @@ export class SettingsComponent implements OnInit, AfterViewInit {
) { }
async ngOnInit() {
this.electronService.receiveIPC('update-available', (result) => {
this.electronService.receiveIPC('update-available', result => {
this.updateAvailable = result != null
this.updateRetrying = false
if (this.updateAvailable) {
@@ -61,7 +62,7 @@ export class SettingsComponent implements OnInit, AfterViewInit {
$(this.themeDropdown.nativeElement).dropdown({
onChange: (_value: string, text: string) => {
this.settingsService.theme = text
}
},
})
this.videoCheckbox.check(this.settingsService.downloadVideos)
@@ -82,7 +83,7 @@ export class SettingsComponent implements OnInit, AfterViewInit {
title: 'Choose library folder',
buttonLabel: 'This is where my charts are!',
defaultPath: this.settingsService.libraryDirectory || '',
properties: ['openDirectory']
properties: ['openDirectory'],
})
if (result.canceled == false) {
@@ -106,7 +107,7 @@ export class SettingsComponent implements OnInit, AfterViewInit {
this.updateDownloading = true
this.electronService.sendIPC('download-update', undefined)
this.downloadUpdateText = 'Downloading... (0%)'
this.electronService.receiveIPC('update-progress', (result) => {
this.electronService.receiveIPC('update-progress', result => {
this.downloadUpdateText = `Downloading... (${result.percent.toFixed(0)}%)`
this.ref.detectChanges()
})

7
src/app/components/toolbar/toolbar.component.ts
View File

@@ -1,10 +1,11 @@
import { Component, OnInit, ChangeDetectorRef } from '@angular/core'
import { ChangeDetectorRef, Component, OnInit } from '@angular/core'
import { ElectronService } from '../../core/services/electron.service'
@Component({
selector: 'app-toolbar',
templateUrl: './toolbar.component.html',
styleUrls: ['./toolbar.component.scss']
styleUrls: ['./toolbar.component.scss'],
})
export class ToolbarComponent implements OnInit {
@@ -24,7 +25,7 @@ export class ToolbarComponent implements OnInit {
this.ref.detectChanges()
})
this.electronService.receiveIPC('update-available', (result) => {
this.electronService.receiveIPC('update-available', result => {
this.updateAvailable = result != null
this.ref.detectChanges()
})

6
src/app/core/directives/checkbox.directive.ts
View File

@@ -1,7 +1,7 @@
import { Directive, ElementRef, Output, EventEmitter, AfterViewInit } from '@angular/core'
import { AfterViewInit, Directive, ElementRef, EventEmitter, Output } from '@angular/core'
@Directive({
selector: '[appCheckbox]'
selector: '[appCheckbox]',
})
export class CheckboxDirective implements AfterViewInit {
@Output() checked = new EventEmitter<boolean>()
@@ -19,7 +19,7 @@ export class CheckboxDirective implements AfterViewInit {
onUnchecked: () => {
this.checked.emit(false)
this._isChecked = false
}
},
})
}

3
src/app/core/directives/progress-bar.directive.ts
View File

@@ -1,8 +1,9 @@
import { Directive, ElementRef, Input } from '@angular/core'
import * as _ from 'underscore'
@Directive({
selector: '[appProgressBar]'
selector: '[appProgressBar]',
})
export class ProgressBarDirective {

3
src/app/core/services/album-art.service.ts
View File

@@ -1,8 +1,9 @@
import { Injectable } from '@angular/core'
import { ElectronService } from './electron.service'
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class AlbumArtService {

7
src/app/core/services/download.service.ts
View File

@@ -1,9 +1,10 @@
import { Injectable, EventEmitter } from '@angular/core'
import { EventEmitter, Injectable } from '@angular/core'
import { DownloadProgress, NewDownload } from '../../../electron/shared/interfaces/download.interface'
import { ElectronService } from './electron.service'
import { NewDownload, DownloadProgress } from '../../../electron/shared/interfaces/download.interface'
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class DownloadService {

5
src/app/core/services/electron.service.ts
View File

@@ -3,12 +3,13 @@ import { Injectable } from '@angular/core'
// If you import a module but never use any of the imported values other than as TypeScript types,
// the resulting javascript file will look as if you never imported the module at all.
import * as electron from 'electron'
import { IPCInvokeEvents, IPCEmitEvents } from '../../../electron/shared/IPCHandler'
import { IPCEmitEvents, IPCInvokeEvents } from '../../../electron/shared/IPCHandler'
const { app, getCurrentWindow, dialog, session } = window.require('@electron/remote')
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class ElectronService {
electron: typeof electron

7
src/app/core/services/search.service.ts
View File

@@ -1,10 +1,11 @@
import { Injectable, EventEmitter } from '@angular/core'
import { ElectronService } from './electron.service'
import { EventEmitter, Injectable } from '@angular/core'
import { SongResult, SongSearch } from 'src/electron/shared/interfaces/search.interface'
import { VersionResult } from 'src/electron/shared/interfaces/songDetails.interface'
import { ElectronService } from './electron.service'
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class SearchService {

9
src/app/core/services/selection.service.ts
View File

@@ -1,4 +1,5 @@
import { Injectable, EventEmitter } from '@angular/core'
import { EventEmitter, Injectable } from '@angular/core'
import { SongResult } from '../../../electron/shared/interfaces/search.interface'
import { SearchService } from './search.service'
@@ -10,7 +11,7 @@ interface SelectionEvent {
}
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class SelectionService {
@@ -23,14 +24,14 @@ export class SelectionService {
private selections: { [songID: number]: boolean | undefined } = {}
constructor(searchService: SearchService) {
searchService.onSearchChanged((results) => {
searchService.onSearchChanged(results => {
this.searchResults = results
if (this.allSelected) {
this.selectAll() // Select newly added rows if allSelected
}
})
searchService.onNewSearch((results) => {
searchService.onNewSearch(results => {
this.searchResults = results
this.selectionChangedCallbacks = {}
this.selections = {}

5
src/app/core/services/settings.service.ts
View File

@@ -1,9 +1,10 @@
import { Injectable } from '@angular/core'
import { ElectronService } from './electron.service'
import { Settings } from 'src/electron/shared/Settings'
import { ElectronService } from './electron.service'
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class SettingsService {
readonly builtinThemes = ['Default', 'Dark']

2
src/app/core/tab-persist.strategy.ts
View File

@@ -1,5 +1,5 @@
import { RouteReuseStrategy, ActivatedRouteSnapshot, DetachedRouteHandle } from '@angular/router'
import { Injectable } from '@angular/core'
import { ActivatedRouteSnapshot, DetachedRouteHandle, RouteReuseStrategy } from '@angular/router'
/**
* This makes each route with the 'reuse' data flag persist when not in focus.

13
src/electron/ipc/CacheHandler.ipc.ts
View File

@@ -1,10 +1,11 @@
import { Dirent, readdir as _readdir } from 'fs'
import { join } from 'path'
import { rimraf } from 'rimraf'
import { inspect, promisify } from 'util'
import { devLog } from '../shared/ElectronUtilFunctions'
import { IPCInvokeHandler } from '../shared/IPCHandler'
import { tempPath } from '../shared/Paths'
import { rimraf } from 'rimraf'
import { Dirent, readdir as _readdir } from 'fs'
import { inspect, promisify } from 'util'
import { join } from 'path'
import { devLog } from '../shared/ElectronUtilFunctions'
const readdir = promisify(_readdir)
@@ -12,7 +13,7 @@ const readdir = promisify(_readdir)
* Handles the 'clear-cache' event.
*/
class ClearCacheHandler implements IPCInvokeHandler<'clear-cache'> {
event: 'clear-cache' = 'clear-cache'
event = 'clear-cache' as const
/**
* Deletes all the files under `tempPath`

5
src/electron/ipc/OpenURLHandler.ipc.ts
View File

@@ -1,11 +1,12 @@
import { IPCEmitHandler } from '../shared/IPCHandler'
import { shell } from 'electron'
import { IPCEmitHandler } from '../shared/IPCHandler'
/**
* Handles the 'open-url' event.
*/
class OpenURLHandler implements IPCEmitHandler<'open-url'> {
event: 'open-url' = 'open-url'
event = 'open-url' as const
/**
* Opens `url` in the default browser.

53
src/electron/ipc/SettingsHandler.ipc.ts
View File

@@ -1,7 +1,8 @@
import * as fs from 'fs'
import { dataPath, tempPath, themesPath, settingsPath } from '../shared/Paths'
import { promisify } from 'util'
import { IPCInvokeHandler, IPCEmitHandler } from '../shared/IPCHandler'
import { IPCEmitHandler, IPCInvokeHandler } from '../shared/IPCHandler'
import { dataPath, settingsPath, tempPath, themesPath } from '../shared/Paths'
import { defaultSettings, Settings } from '../shared/Settings'
const exists = promisify(fs.exists)
@@ -11,11 +12,34 @@ const writeFile = promisify(fs.writeFile)
let settings: Settings
/**
* Handles the 'set-settings' event.
*/
class SetSettingsHandler implements IPCEmitHandler<'set-settings'> {
event = 'set-settings' as const
/**
* Updates Bridge's settings object to `newSettings` and saves them to Bridge's data directories.
*/
handler(newSettings: Settings) {
settings = newSettings
SetSettingsHandler.saveSettings(settings)
}
/**
* Saves `settings` to Bridge's data directories.
*/
static async saveSettings(settings: Settings) {
const settingsJSON = JSON.stringify(settings, undefined, 2)
await writeFile(settingsPath, settingsJSON, 'utf8')
}
}
/**
* Handles the 'get-settings' event.
*/
class GetSettingsHandler implements IPCInvokeHandler<'get-settings'> {
event: 'get-settings' = 'get-settings'
event = 'get-settings' as const
/**
* @returns the current settings oject, or default settings if they couldn't be loaded.
@@ -65,29 +89,6 @@ class GetSettingsHandler implements IPCInvokeHandler<'get-settings'> {
}
}
/**
* Handles the 'set-settings' event.
*/
class SetSettingsHandler implements IPCEmitHandler<'set-settings'> {
event: 'set-settings' = 'set-settings'
/**
* Updates Bridge's settings object to `newSettings` and saves them to Bridge's data directories.
*/
handler(newSettings: Settings) {
settings = newSettings
SetSettingsHandler.saveSettings(settings)
}
/**
* Saves `settings` to Bridge's data directories.
*/
static async saveSettings(settings: Settings) {
const settingsJSON = JSON.stringify(settings, undefined, 2)
await writeFile(settingsPath, settingsJSON, 'utf8')
}
}
export const getSettingsHandler = new GetSettingsHandler()
export const setSettingsHandler = new SetSettingsHandler()
export function getSettings() { return getSettingsHandler.getSettings() }

25
src/electron/ipc/UpdateHandler.ipc.ts
View File

@@ -1,6 +1,7 @@
import { IPCEmitHandler, IPCInvokeHandler } from '../shared/IPCHandler'
import { autoUpdater, UpdateInfo } from 'electron-updater'
import { emitIPCEvent } from '../main'
import { IPCEmitHandler, IPCInvokeHandler } from '../shared/IPCHandler'
export interface UpdateProgress {
bytesPerSecond: number
@@ -15,7 +16,13 @@ let updateAvailable = false
* Checks for updates when the program is launched.
*/
class UpdateChecker implements IPCEmitHandler<'retry-update'> {
event: 'retry-update' = 'retry-update'
event = 'retry-update' as const
constructor() {
autoUpdater.autoDownload = false
autoUpdater.logger = null
this.registerUpdaterListeners()
}
/**
* Check for an update.
@@ -24,12 +31,6 @@ class UpdateChecker implements IPCEmitHandler<'retry-update'> {
this.checkForUpdates()
}
constructor() {
autoUpdater.autoDownload = false
autoUpdater.logger = null
this.registerUpdaterListeners()
}
checkForUpdates() {
autoUpdater.checkForUpdates().catch(reason => {
updateAvailable = null
@@ -61,7 +62,7 @@ export const updateChecker = new UpdateChecker()
* Handles the 'get-update-available' event.
*/
class GetUpdateAvailableHandler implements IPCInvokeHandler<'get-update-available'> {
event: 'get-update-available' = 'get-update-available'
event = 'get-update-available' as const
/**
* @returns `true` if an update is available.
@@ -77,7 +78,7 @@ export const getUpdateAvailableHandler = new GetUpdateAvailableHandler()
* Handles the 'get-current-version' event.
*/
class GetCurrentVersionHandler implements IPCInvokeHandler<'get-current-version'> {
event: 'get-current-version' = 'get-current-version'
event = 'get-current-version' as const
/**
* @returns the current version of Bridge.
@@ -93,7 +94,7 @@ export const getCurrentVersionHandler = new GetCurrentVersionHandler()
* Handles the 'download-update' event.
*/
class DownloadUpdateHandler implements IPCEmitHandler<'download-update'> {
event: 'download-update' = 'download-update'
event = 'download-update' as const
downloading = false
/**
@@ -121,7 +122,7 @@ export const downloadUpdateHandler = new DownloadUpdateHandler()
* Handles the 'quit-and-install' event.
*/
class QuitAndInstallHandler implements IPCEmitHandler<'quit-and-install'> {
event: 'quit-and-install' = 'quit-and-install'
event = 'quit-and-install' as const
/**
* Immediately closes the application and installs the update.

4
src/electron/ipc/browse/AlbumArtHandler.ipc.ts
View File

@@ -1,12 +1,12 @@
import { IPCInvokeHandler } from '../../shared/IPCHandler'
import { AlbumArtResult } from '../../shared/interfaces/songDetails.interface'
import { IPCInvokeHandler } from '../../shared/IPCHandler'
import { serverURL } from '../../shared/Paths'
/**
* Handles the 'album-art' event.
*/
class AlbumArtHandler implements IPCInvokeHandler<'album-art'> {
event: 'album-art' = 'album-art'
event = 'album-art' as const
/**
* @returns an `AlbumArtResult` object containing the album art for the song with `songID`.

4
src/electron/ipc/browse/BatchSongDetailsHandler.ipc.ts
View File

@@ -1,12 +1,12 @@
import { IPCInvokeHandler } from '../../shared/IPCHandler'
import { VersionResult } from '../../shared/interfaces/songDetails.interface'
import { IPCInvokeHandler } from '../../shared/IPCHandler'
import { serverURL } from '../../shared/Paths'
/**
* Handles the 'batch-song-details' event.
*/
class BatchSongDetailsHandler implements IPCInvokeHandler<'batch-song-details'> {
event: 'batch-song-details' = 'batch-song-details'
event = 'batch-song-details' as const
/**
* @returns an array of all the chart versions with a songID found in `songIDs`.

9
src/electron/ipc/browse/SearchHandler.ipc.ts
View File

@@ -1,12 +1,12 @@
import { IPCInvokeHandler } from '../../shared/IPCHandler'
import { SongResult, SongSearch } from '../../shared/interfaces/search.interface'
import { IPCInvokeHandler } from '../../shared/IPCHandler'
import { serverURL } from '../../shared/Paths'
/**
* Handles the 'song-search' event.
*/
class SearchHandler implements IPCInvokeHandler<'song-search'> {
event: 'song-search' = 'song-search'
event = 'song-search' as const
/**
* @returns the top 50 songs that match `search`.
@@ -15,9 +15,10 @@ class SearchHandler implements IPCInvokeHandler<'song-search'> {
const response = await fetch(`https://${serverURL}/api/search`, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
// eslint-disable-next-line @typescript-eslint/naming-convention
'Content-Type': 'application/json',
},
body: JSON.stringify(search)
body: JSON.stringify(search),
})
return await response.json()

4
src/electron/ipc/browse/SongDetailsHandler.ipc.ts
View File

@@ -1,12 +1,12 @@
import { IPCInvokeHandler } from '../../shared/IPCHandler'
import { VersionResult } from '../../shared/interfaces/songDetails.interface'
import { IPCInvokeHandler } from '../../shared/IPCHandler'
import { serverURL } from '../../shared/Paths'
/**
* Handles the 'song-details' event.
*/
class SongDetailsHandler implements IPCInvokeHandler<'song-details'> {
event: 'song-details' = 'song-details'
event = 'song-details' as const
/**
* @returns the chart versions with `songID`.

36
src/electron/ipc/download/ChartDownload.ts
View File

@@ -1,24 +1,25 @@
import { FileDownloader, getDownloader } from './FileDownloader'
import { join, parse } from 'path'
import { FileExtractor } from './FileExtractor'
import { sanitizeFilename, interpolate } from '../../shared/UtilFunctions'
import { emitIPCEvent } from '../../main'
import { ProgressType, NewDownload } from 'src/electron/shared/interfaces/download.interface'
import { DriveFile } from 'src/electron/shared/interfaces/songDetails.interface'
import { FileTransfer } from './FileTransfer'
import { rimraf } from 'rimraf'
import { FilesystemChecker } from './FilesystemChecker'
import { getSettings } from '../SettingsHandler.ipc'
import { hasVideoExtension } from '../../shared/ElectronUtilFunctions'
type EventCallback = {
import { NewDownload, ProgressType } from 'src/electron/shared/interfaces/download.interface'
import { DriveFile } from 'src/electron/shared/interfaces/songDetails.interface'
import { emitIPCEvent } from '../../main'
import { hasVideoExtension } from '../../shared/ElectronUtilFunctions'
import { interpolate, sanitizeFilename } from '../../shared/UtilFunctions'
import { getSettings } from '../SettingsHandler.ipc'
import { FileDownloader, getDownloader } from './FileDownloader'
import { FileExtractor } from './FileExtractor'
import { FilesystemChecker } from './FilesystemChecker'
import { FileTransfer } from './FileTransfer'
interface EventCallback {
/** Note: this will not be the last event if `retry()` is called. */
'error': () => void
'complete': () => void
}
type Callbacks = { [E in keyof EventCallback]: EventCallback[E] }
export type DownloadError = { header: string; body: string; isLink?: boolean }
export interface DownloadError { header: string; body: string; isLink?: boolean }
export class ChartDownload {
@@ -112,7 +113,7 @@ export class ChartDownload {
description: description,
percent: this.percent,
type: type,
isLink
isLink,
})
}
@@ -184,7 +185,7 @@ export class ChartDownload {
checker.on('error', this.handleError.bind(this))
return new Promise<void>(resolve => {
checker.on('complete', (tempPath) => {
checker.on('complete', tempPath => {
this.tempPath = tempPath
resolve()
})
@@ -202,7 +203,8 @@ export class ChartDownload {
downloader.on('waitProgress', (remainingSeconds: number, totalSeconds: number) => {
downloadStartPoint = this.individualFileProgressPortion / 2
this.percent = this._allFilesProgress + interpolate(remainingSeconds, totalSeconds, 0, 0, this.individualFileProgressPortion / 2)
this.percent =
this._allFilesProgress + interpolate(remainingSeconds, totalSeconds, 0, 0, this.individualFileProgressPortion / 2)
this.updateGUI(downloadHeader, `Waiting for Google rate limit... (${remainingSeconds}s)`, 'good')
})
@@ -237,7 +239,7 @@ export class ChartDownload {
private addExtractorEventListeners(extractor: FileExtractor) {
let archive = ''
extractor.on('start', (filename) => {
extractor.on('start', filename => {
archive = filename
this.updateGUI(`[${archive}]`, 'Extracting...', 'good')
})
@@ -264,7 +266,7 @@ export class ChartDownload {
private addTransferEventListeners(transfer: FileTransfer) {
let destinationFolder: string
transfer.on('start', (_destinationFolder) => {
transfer.on('start', _destinationFolder => {
destinationFolder = _destinationFolder
this.updateGUI('Moving files to library folder...', destinationFolder, 'good', true)
})

4
src/electron/ipc/download/DownloadHandler.ts
View File

@@ -1,10 +1,10 @@
import { IPCEmitHandler } from '../../shared/IPCHandler'
import { Download } from '../../shared/interfaces/download.interface'
import { IPCEmitHandler } from '../../shared/IPCHandler'
import { ChartDownload } from './ChartDownload'
import { DownloadQueue } from './DownloadQueue'
class DownloadHandler implements IPCEmitHandler<'download'> {
event: 'download' = 'download'
event = 'download' as const
downloadQueue: DownloadQueue = new DownloadQueue()
currentDownload: ChartDownload = undefined

3
src/electron/ipc/download/DownloadQueue.ts
View File

@@ -1,6 +1,7 @@
import Comparators from 'comparators'
import { ChartDownload } from './ChartDownload'
import { emitIPCEvent } from '../../main'
import { ChartDownload } from './ChartDownload'
export class DownloadQueue {

36
src/electron/ipc/download/FileDownloader.ts
View File

@@ -1,25 +1,27 @@
import { AnyFunction } from '../../shared/UtilFunctions'
import { devLog } from '../../shared/ElectronUtilFunctions'
import Bottleneck from 'bottleneck'
import { createWriteStream, writeFile as _writeFile } from 'fs'
import { google } from 'googleapis'
import * as needle from 'needle'
import { join } from 'path'
import { Readable } from 'stream'
import { inspect, promisify } from 'util'
import { devLog } from '../../shared/ElectronUtilFunctions'
import { tempPath } from '../../shared/Paths'
import { AnyFunction } from '../../shared/UtilFunctions'
import { DownloadError } from './ChartDownload'
// TODO: replace needle with got (for cancel() method) (if before-headers event is possible?)
import { googleTimer } from './GoogleTimer'
import { DownloadError } from './ChartDownload'
import { google } from 'googleapis'
import Bottleneck from 'bottleneck'
import { inspect, promisify } from 'util'
import { join } from 'path'
import { tempPath } from '../../shared/Paths'
const drive = google.drive('v3')
const limiter = new Bottleneck({
minTime: 200 // Wait 200 ms between API requests
minTime: 200, // Wait 200 ms between API requests
})
const RETRY_MAX = 2
const writeFile = promisify(_writeFile)
type EventCallback = {
interface EventCallback {
'waitProgress': (remainingSeconds: number, totalSeconds: number) => void
/** Note: this event can be called multiple times if the connection times out or a large file is downloaded */
'requestSent': () => void
@@ -36,7 +38,7 @@ const downloadErrors = {
connectionError: (err: Error) => { return { header: 'Connection Error', body: `${err.name}: ${err.message}` } },
responseError: (statusCode: string) => { return { header: 'Connection failed', body: `Server returned status code: ${statusCode}` } },
htmlError: (path: string) => { return { header: 'Download server returned HTML instead of a file.', body: path, isLink: true } },
linkError: (url: string) => { return { header: 'Invalid link', body: `The download link is not formatted correctly: ${url}` } }
linkError: (url: string) => { return { header: 'Invalid link', body: `The download link is not formatted correctly: ${url}` } },
}
/**
@@ -100,9 +102,9 @@ class APIFileDownloader {
try {
this.downloadStream = (await drive.files.get({
fileId: this.fileID,
alt: 'media'
alt: 'media',
}, {
responseType: 'stream'
responseType: 'stream',
})).data
if (this.wasCanceled) { return }
@@ -243,10 +245,10 @@ class SlowFileDownloader {
'open_timeout': 5000,
'headers': Object.assign({
'Referer': this.url,
'Accept': '*/*'
'Accept': '*/*',
},
(cookieHeader ? { 'Cookie': cookieHeader } : undefined)
)
),
})
this.req.on('timeout', this.cancelable((type: string) => {
@@ -300,7 +302,7 @@ class SlowFileDownloader {
const newHeader = `download_warning_${warningCode}=${confirmToken}; NID=${NID}`
this.requestDownload(newHeader)
} catch (e) {
this.saveHTMLError(virusScanHTML).then((path) => {
this.saveHTMLError(virusScanHTML).then(path => {
this.failDownload(downloadErrors.htmlError(path))
})
}
@@ -316,7 +318,7 @@ class SlowFileDownloader {
this.callbacks.downloadProgress(0)
let downloadedSize = 0
this.req.pipe(createWriteStream(this.fullPath))
this.req.on('data', this.cancelable((data) => {
this.req.on('data', this.cancelable(data => {
downloadedSize += data.length
this.callbacks.downloadProgress(downloadedSize)
}))

19
src/electron/ipc/download/FileExtractor.ts
View File

@@ -1,17 +1,18 @@
import { readdir, unlink, mkdir as _mkdir } from 'fs'
import { promisify } from 'util'
import { join, extname } from 'path'
import { AnyFunction } from '../../shared/UtilFunctions'
import { devLog } from '../../shared/ElectronUtilFunctions'
import * as node7z from 'node-7z'
import * as zipBin from '7zip-bin'
import { mkdir as _mkdir, readdir, unlink } from 'fs'
import * as node7z from 'node-7z'
import * as unrarjs from 'node-unrar-js' // TODO find better rar library that has async extraction
import { FailReason } from 'node-unrar-js/dist/js/extractor'
import { extname, join } from 'path'
import { promisify } from 'util'
import { devLog } from '../../shared/ElectronUtilFunctions'
import { AnyFunction } from '../../shared/UtilFunctions'
import { DownloadError } from './ChartDownload'
const mkdir = promisify(_mkdir)
type EventCallback = {
interface EventCallback {
'start': (filename: string) => void
'extractProgress': (percent: number, fileCount: number) => void
'error': (err: DownloadError, retry: () => void | Promise<void>) => void
@@ -27,7 +28,7 @@ const extractErrors = {
},
rarextractError: (result: { reason: FailReason; msg: string }, sourceFile: string) => {
return { header: `Extracting archive failed: ${result.reason}`, body: `${result.msg} (${sourceFile})` }
}
},
}
export class FileExtractor {
@@ -135,7 +136,7 @@ export class FileExtractor {
* Tries to delete the archive at `fullPath`.
*/
private deleteArchive(fullPath: string) {
unlink(fullPath, this.cancelable((err) => {
unlink(fullPath, this.cancelable(err => {
if (err && err.code != 'ENOENT') {
devLog(`Warning: failed to delete archive at [${fullPath}]`)
}

11
src/electron/ipc/download/FileTransfer.ts
View File

@@ -1,14 +1,15 @@
import { Dirent, readdir as _readdir } from 'fs'
import { promisify } from 'util'
import { getSettings } from '../SettingsHandler.ipc'
import * as mv from 'mv'
import { join } from 'path'
import { rimraf } from 'rimraf'
import { promisify } from 'util'
import { getSettings } from '../SettingsHandler.ipc'
import { DownloadError } from './ChartDownload'
const readdir = promisify(_readdir)
type EventCallback = {
interface EventCallback {
'start': (destinationFolder: string) => void
'error': (err: DownloadError, retry: () => void | Promise<void>) => void
'complete': () => void
@@ -19,7 +20,7 @@ const transferErrors = {
readError: (err: NodeJS.ErrnoException) => fsError(err, 'Failed to read file.'),
deleteError: (err: NodeJS.ErrnoException) => fsError(err, 'Failed to delete file.'),
rimrafError: (err: NodeJS.ErrnoException) => fsError(err, 'Failed to delete folder.'),
mvError: (err: NodeJS.ErrnoException) => fsError(err, `Failed to move folder to library.${err.code == 'EPERM' ? ' (does the chart already exist?)' : ''}`)
mvError: (err: NodeJS.ErrnoException) => fsError(err, `Failed to move folder to library.${err.code == 'EPERM' ? ' (does the chart already exist?)' : ''}`),
}
function fsError(err: NodeJS.ErrnoException, description: string) {
@@ -89,7 +90,7 @@ export class FileTransfer {
* Moves the downloaded chart to the library path.
*/
private moveFolder() {
mv(this.nestedSourceFolder, this.destinationFolder, { mkdirp: true }, (err) => {
mv(this.nestedSourceFolder, this.destinationFolder, { mkdirp: true }, err => {
if (err) {
this.callbacks.error(transferErrors.mvError(err), () => this.moveFolder())
} else {

21
src/electron/ipc/download/FilesystemChecker.ts
View File

@@ -1,16 +1,17 @@
import { DownloadError } from './ChartDownload'
import { tempPath } from '../../shared/Paths'
import { AnyFunction } from '../../shared/UtilFunctions'
import { devLog } from '../../shared/ElectronUtilFunctions'
import { randomBytes as _randomBytes } from 'crypto'
import { mkdir, access, constants } from 'fs'
import { access, constants, mkdir } from 'fs'
import { join } from 'path'
import { promisify } from 'util'
import { devLog } from '../../shared/ElectronUtilFunctions'
import { tempPath } from '../../shared/Paths'
import { AnyFunction } from '../../shared/UtilFunctions'
import { getSettings } from '../SettingsHandler.ipc'
import { DownloadError } from './ChartDownload'
const randomBytes = promisify(_randomBytes)
type EventCallback = {
interface EventCallback {
'start': () => void
'error': (err: DownloadError, retry: () => void | Promise<void>) => void
'complete': (tempPath: string) => void
@@ -23,7 +24,7 @@ const filesystemErrors = {
destinationFolderExists: (destinationPath: string) => {
return { header: 'This chart already exists in your library folder.', body: destinationPath, isLink: true }
},
mkdirError: (err: NodeJS.ErrnoException) => fsError(err, 'Failed to create temporary folder.')
mkdirError: (err: NodeJS.ErrnoException) => fsError(err, 'Failed to create temporary folder.'),
}
function fsError(err: NodeJS.ErrnoException, description: string) {
@@ -58,7 +59,7 @@ export class FilesystemChecker {
if (getSettings().libraryPath == undefined) {
this.callbacks.error(filesystemErrors.libraryFolder(), () => this.beginCheck())
} else {
access(getSettings().libraryPath, constants.W_OK, this.cancelable((err) => {
access(getSettings().libraryPath, constants.W_OK, this.cancelable(err => {
if (err) {
this.callbacks.error(filesystemErrors.libraryAccess(err), () => this.beginCheck())
} else {
@@ -73,7 +74,7 @@ export class FilesystemChecker {
*/
private checkDestinationFolder() {
const destinationPath = join(getSettings().libraryPath, this.destinationFolderName)
access(destinationPath, constants.F_OK, this.cancelable((err) => {
access(destinationPath, constants.F_OK, this.cancelable(err => {
if (err) { // File does not exist
this.createDownloadFolder()
} else {
@@ -88,7 +89,7 @@ export class FilesystemChecker {
private async createDownloadFolder(retryCount = 0) {
const tempChartPath = join(tempPath, `chart_${(await randomBytes(5)).toString('hex')}`)
mkdir(tempChartPath, this.cancelable((err) => {
mkdir(tempChartPath, this.cancelable(err => {
if (err) {
if (retryCount < 5) {
devLog(`Error creating folder [${tempChartPath}], retrying with a different folder...`)

2
src/electron/ipc/download/GoogleTimer.ts
View File

@@ -1,6 +1,6 @@
import { getSettings } from '../SettingsHandler.ipc'
type EventCallback = {
interface EventCallback {
'waitProgress': (remainingSeconds: number, totalSeconds: number) => void
'complete': () => void
}

18
src/electron/main.ts
View File

@@ -1,16 +1,16 @@
import { app, BrowserWindow, ipcMain } from 'electron'
import { updateChecker } from './ipc/UpdateHandler.ipc'
import * as windowStateKeeper from 'electron-window-state'
import * as path from 'path'
import * as url from 'url'
require('electron-unhandled')({ showDialog: true })
// IPC Handlers
import { getIPCInvokeHandlers, getIPCEmitHandlers, IPCEmitEvents } from './shared/IPCHandler'
import { getSettingsHandler } from './ipc/SettingsHandler.ipc'
import { updateChecker } from './ipc/UpdateHandler.ipc'
// IPC Handlers
import { getIPCEmitHandlers, getIPCInvokeHandlers, IPCEmitEvents } from './shared/IPCHandler'
import { dataPath } from './shared/Paths'
require('electron-unhandled')({ showDialog: true })
export let mainWindow: BrowserWindow
const args = process.argv.slice(1)
const isDevBuild = args.some(val => val == '--dev')
@@ -72,7 +72,7 @@ function createBridgeWindow() {
const windowState = windowStateKeeper({
defaultWidth: 1000,
defaultHeight: 800,
path: dataPath
path: dataPath,
})
// Create the browser window
@@ -118,11 +118,11 @@ function createBrowserWindow(windowState: windowStateKeeper.State) {
nodeIntegration: true,
allowRunningInsecureContent: (isDevBuild) ? true : false,
textAreasAreResizable: false,
contextIsolation: false
contextIsolation: false,
},
simpleFullscreen: true,
fullscreenable: false,
backgroundColor: '#121212'
backgroundColor: '#121212',
}
if (process.platform == 'linux' && !isDevBuild) {
@@ -139,7 +139,7 @@ function getLoadUrl() {
return url.format({
protocol: isDevBuild ? 'http:' : 'file:',
pathname: isDevBuild ? '//localhost:4200/' : path.join(__dirname, '..', 'index.html'),
slashes: true
slashes: true,
})
}

1
src/electron/shared/ElectronUtilFunctions.ts
View File

@@ -1,4 +1,5 @@
import { basename, parse } from 'path'
import { getSettingsHandler } from '../ipc/SettingsHandler.ipc'
import { emitIPCEvent } from '../main'
import { lower } from './UtilFunctions'

27
src/electron/shared/IPCHandler.ts
View File

@@ -1,17 +1,18 @@
import { SongSearch, SongResult } from './interfaces/search.interface'
import { VersionResult, AlbumArtResult } from './interfaces/songDetails.interface'
import { UpdateInfo } from 'electron-updater'
import { albumArtHandler } from '../ipc/browse/AlbumArtHandler.ipc'
import { batchSongDetailsHandler } from '../ipc/browse/BatchSongDetailsHandler.ipc'
import { searchHandler } from '../ipc/browse/SearchHandler.ipc'
import { songDetailsHandler } from '../ipc/browse/SongDetailsHandler.ipc'
import { albumArtHandler } from '../ipc/browse/AlbumArtHandler.ipc'
import { Download, DownloadProgress } from './interfaces/download.interface'
import { downloadHandler } from '../ipc/download/DownloadHandler'
import { Settings } from './Settings'
import { batchSongDetailsHandler } from '../ipc/browse/BatchSongDetailsHandler.ipc'
import { getSettingsHandler, setSettingsHandler } from '../ipc/SettingsHandler.ipc'
import { clearCacheHandler } from '../ipc/CacheHandler.ipc'
import { updateChecker, UpdateProgress, getCurrentVersionHandler, downloadUpdateHandler, quitAndInstallHandler, getUpdateAvailableHandler } from '../ipc/UpdateHandler.ipc'
import { UpdateInfo } from 'electron-updater'
import { downloadHandler } from '../ipc/download/DownloadHandler'
import { openURLHandler } from '../ipc/OpenURLHandler.ipc'
import { getSettingsHandler, setSettingsHandler } from '../ipc/SettingsHandler.ipc'
import { downloadUpdateHandler, getCurrentVersionHandler, getUpdateAvailableHandler, quitAndInstallHandler, updateChecker, UpdateProgress } from '../ipc/UpdateHandler.ipc'
import { Download, DownloadProgress } from './interfaces/download.interface'
import { SongResult, SongSearch } from './interfaces/search.interface'
import { AlbumArtResult, VersionResult } from './interfaces/songDetails.interface'
import { Settings } from './Settings'
/**
* To add a new IPC listener:
@@ -37,7 +38,7 @@ export function getIPCInvokeHandlers(): IPCInvokeHandler<keyof IPCInvokeEvents>[
/**
* The list of possible async IPC events that return values, mapped to their input and output types.
*/
export type IPCInvokeEvents = {
export interface IPCInvokeEvents {
'get-settings': {
input: undefined
output: Settings
@@ -88,14 +89,14 @@ export function getIPCEmitHandlers(): IPCEmitHandler<keyof IPCEmitEvents>[] {
downloadUpdateHandler,
updateChecker,
quitAndInstallHandler,
openURLHandler
openURLHandler,
]
}
/**
* The list of possible async IPC events that don't return values, mapped to their input types.
*/
export type IPCEmitEvents = {
export interface IPCEmitEvents {
'log': any[]
'download': Download

2
src/electron/shared/Paths.ts
View File

@@ -1,5 +1,5 @@
import { join } from 'path'
import { app } from 'electron'
import { join } from 'path'
// Data paths
export const dataPath = join(app.getPath('userData'), 'bridge_data')

2
src/electron/shared/Settings.ts
View File

@@ -15,5 +15,5 @@ export const defaultSettings: Settings = {
rateLimitDelay: 31,
downloadVideos: true,
theme: 'Default',
libraryPath: undefined
libraryPath: undefined,
}

3
src/electron/shared/UtilFunctions.ts
View File

@@ -1,4 +1,5 @@
import * as randomBytes from 'randombytes'
const sanitize = require('sanitize-filename')
// WARNING: do not import anything related to Electron; the code will not compile correctly.
@@ -24,7 +25,7 @@ export function sanitizeFilename(filename: string): string {
case '*': return '⁎'
default: return '_'
}
})
}),
})
return (newFilename == '' ? randomBytes(5).toString('hex') : newFilename)
}

14
src/electron/shared/interfaces/search.interface.ts
View File

@@ -21,15 +21,19 @@ export function getDefaultSearch(): SongSearch {
quantity: 'all',
similarity: 'similar',
fields: { name: true, artist: true, album: true, genre: true, year: true, charter: true, tag: true },
tags: { 'sections': false, 'star power': false, 'forcing': false, 'taps': false, 'lyrics': false,
'video': false, 'stems': false, 'solo sections': false, 'open notes': false },
instruments: { guitar: false, bass: false, rhythm: false, keys: false,
drums: false, guitarghl: false, bassghl: false, vocals: false },
tags: {
'sections': false, 'star power': false, 'forcing': false, 'taps': false, 'lyrics': false,
'video': false, 'stems': false, 'solo sections': false, 'open notes': false
},
instruments: {
guitar: false, bass: false, rhythm: false, keys: false,
drums: false, guitarghl: false, bassghl: false, vocals: false
},
difficulties: { expert: false, hard: false, medium: false, easy: false },
minDiff: 0,
maxDiff: 6,
limit: 50 + 1,
offset: 0
offset: 0,
}
}

1
src/electron/shared/typeDefinitions/node-7z.d.ts vendored
View File

@@ -1 +0,0 @@
declare module 'node-7z'

2
src/environments/environment.prod.ts
View File

@@ -1,3 +1,3 @@
export const environment = {
production: true
production: true,
}

2
src/environments/environment.ts
View File

@@ -3,7 +3,7 @@
// The list of file replacements can be found in `angular.json`.
export const environment = {
production: false
production: false,
}
/*

6
src/index.html
View File

@@ -1,10 +1,10 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta charset="utf-8" />
<title>Bridge</title>
<base href="./">
<meta name="viewport" content="width=device-width, initial-scale=1">
<base href="./" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
</head>
<body>
<app-root></app-root>

1
src/polyfills.ts
View File

@@ -47,7 +47,6 @@
*/
import 'zone.js' // Included with Angular CLI.
/***************************************************************************************************
* APPLICATION IMPORTS
*/

1
src/typings.d.ts vendored
View File

@@ -5,7 +5,6 @@ interface NodeModule {
id: string
}
// @ts-ignore
// declare let window: Window
declare let $: any
interface Window {

4
tsconfig.json
View File

@@ -3,7 +3,6 @@
"compilerOptions": {
"baseUrl": "./",
"noImplicitAny": true,
"suppressImplicitAnyIndexErrors": true,
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
@@ -19,5 +18,8 @@
],
"module": "commonjs",
"useDefineForClassFields": false
},
"angularCompilerOptions": {
"strictTemplates": true
}
}