-
Notifications
You must be signed in to change notification settings - Fork 143
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #695 from dtinth/custom-folder
- Loading branch information
Showing
20 changed files
with
1,014 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* eslint camelcase: off */ | ||
| /* REASON: These snake case names are used in our JSON files. */ | ||
|
|
||
| import { IResources } from 'bemuse/resources/types' | ||
|
|
||
| export type Song = { | ||
| id: string | ||
| title: string | ||
| path: string | ||
| tutorial?: boolean | ||
| video_url?: string | ||
| video_file?: string | ||
| video_offset?: number | ||
| replaygain?: string | ||
| charts: Chart[] | ||
|
|
||
| /** Added by Bemuse at runtime */ | ||
| resources?: IResources | ||
| custom?: boolean | ||
| } | ||
|
|
||
| export type Chart = { | ||
| file: string | ||
| bpm: { | ||
| init: number | ||
| min: number | ||
| max: number | ||
| median: number | ||
| } | ||
| info: { | ||
| title: string | ||
| artist: string | ||
| genre: string | ||
| subtitles: string[] | ||
| subartists: string[] | ||
| difficulty: number | ||
| level: number | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| import { | ||
| CustomFolderContext, | ||
| CustomFolderScanIO, | ||
| getCustomFolderState, | ||
| scanFolder, | ||
| setCustomFolder, | ||
| } from '.' | ||
| import { CustomFolderState } from './types' | ||
|
|
||
| const debugging = false | ||
|
|
||
| const mockFolderScanIO: CustomFolderScanIO = { | ||
| log: text => { | ||
| debugging && console.log('scanFolder: [log]', text) | ||
| }, | ||
| setStatus: text => { | ||
| debugging && console.debug('scanFolder: [setStatus]', text) | ||
| }, | ||
| updateState: () => {}, | ||
| } | ||
|
|
||
| class CustomFolderContextMock implements CustomFolderContext { | ||
| private map = new Map<string, CustomFolderState>() | ||
| async get(key: string) { | ||
| return this.map.get(key) | ||
| } | ||
| async set(key: string, value: CustomFolderState) { | ||
| this.map.set(key, value) | ||
| } | ||
| async del(key: string) { | ||
| this.map.delete(key) | ||
| } | ||
| } | ||
|
|
||
| const song1: MockFolder = { | ||
| 'normal.bms': '#TITLE meow [NORMAL]\n#BPM 90\n#00111:01', | ||
| 'hyper.bms': '#TITLE meow [HYPER]\n#BPM 90\n#00111:01', | ||
| } | ||
|
|
||
| const song2: MockFolder = { | ||
| 'normal.bms': '#TITLE nyan [NORMAL]\n#BPM 90\n#00111:01', | ||
| 'hyper.bms': '#TITLE nyan [HYPER]\n#BPM 90\n#00111:01', | ||
| } | ||
|
|
||
| it('allows setting custom folder and loading it in-game', async () => { | ||
| const folder: MockFolder = { song1, song2 } | ||
| const tester = new CustomFolderTestHarness() | ||
| await tester.setFolder(folder) | ||
| await tester.checkState(async state => { | ||
| expect(state.chartFilesScanned).not.to.equal(true) | ||
| }) | ||
|
|
||
| await tester.scan() | ||
| await tester.checkState(async state => { | ||
| expect(state.songs).to.have.length(2) | ||
| }) | ||
| }) | ||
|
|
||
| it('can scan for new songs', async () => { | ||
| const folder: MockFolder = { song1 } | ||
| const tester = new CustomFolderTestHarness() | ||
| await tester.setFolder(folder) | ||
| await tester.scan() | ||
| await tester.checkState(async state => { | ||
| expect(state.songs).to.have.length(1) | ||
| }) | ||
|
|
||
| folder['song2'] = song2 | ||
| await tester.scan() | ||
| await tester.checkState(async state => { | ||
| expect(state.songs).to.have.length(2) | ||
| }) | ||
| }) | ||
|
|
||
| class CustomFolderTestHarness { | ||
| private context = new CustomFolderContextMock() | ||
|
|
||
| constructor() { | ||
| this.context = new CustomFolderContextMock() | ||
| } | ||
|
|
||
| async setFolder(data: MockFolder) { | ||
| await setCustomFolder( | ||
| this.context, | ||
| createMockFileSystemDirectoryHandle(data) | ||
| ) | ||
| } | ||
|
|
||
| async scan() { | ||
| await scanFolder(this.context, mockFolderScanIO) | ||
| } | ||
|
|
||
| async checkState(f: (state: CustomFolderState) => Promise<void>) { | ||
| const state = await getCustomFolderState(this.context) | ||
| void expect(state).not.to.equal(undefined) | ||
| await f(state!) | ||
| } | ||
| } | ||
|
|
||
| type MockFolder = { | ||
| [name: string]: MockFolder | string | ||
| } | ||
|
|
||
| function createMockFileSystemDirectoryHandle( | ||
| data: MockFolder | ||
| ): FileSystemDirectoryHandle { | ||
| return { | ||
| kind: 'directory', | ||
| queryPermission: async () => 'granted', | ||
| [Symbol.asyncIterator]: async function*() { | ||
| for (const [name, value] of Object.entries(data)) { | ||
| if (typeof value === 'string') { | ||
| yield [name, createMockFileSystemFileHandle(name, value)] as const | ||
| } else { | ||
| yield [name, createMockFileSystemDirectoryHandle(value)] as const | ||
| } | ||
| } | ||
| }, | ||
| getDirectoryHandle: async (name: string) => { | ||
| expect(data[name]).to.be.an('object') | ||
| return createMockFileSystemDirectoryHandle(data[name] as MockFolder) | ||
| }, | ||
| getFileHandle: async (name: string) => { | ||
| expect(data[name]).to.be.a('string') | ||
| return createMockFileSystemFileHandle(name, data[name] as string) | ||
| }, | ||
| } as any | ||
| } | ||
|
|
||
| function createMockFileSystemFileHandle( | ||
| name: string, | ||
| data: string | ||
| ): FileSystemFileHandle { | ||
| return { | ||
| kind: 'file', | ||
| queryPermission: async () => 'granted', | ||
| getFile: async () => { | ||
| const blob = new Blob([data], { type: 'text/plain' }) | ||
| return Object.assign(blob, { | ||
| name, | ||
| lastModified: 1, | ||
| }) | ||
| }, | ||
| } as any | ||
| } |
Oops, something went wrong.