juan/japanese-drum-game
1
0
Fork 0
mirror of https://github.com/jiojciojsioe3/a3cjroijsiojiorj.git synced 2024-11-15 07:21:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

SongSelect: Use seconds for previews

Browse Source
This commit is contained in:
LoveEevee 2019-02-21 01:42:18 +03:00
parent 3a28d967b9
commit 1aecc7d52f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.py
View File

@ -160,7 +160,7 @@ def make_preview(song_id, song_type, preview):
prev_path = 'public/songs/%s/preview.mp3' % song_id prev_path = 'public/songs/%s/preview.mp3' % song_id
if os.path.isfile(song_path) and not os.path.isfile(prev_path): if os.path.isfile(song_path) and not os.path.isfile(prev_path):
if not preview or preview <= 0.1: if not preview or preview <= 0:
print('Skipping #%s due to no preview' % song_id) print('Skipping #%s due to no preview' % song_id)
return False return False

4
public/src/js/importsongs.js
View File

@ -197,7 +197,7 @@
subtitle = subtitle.slice(2) subtitle = subtitle.slice(2)
} }
songObj.subtitle = songObj.subtitle_en = subtitle songObj.subtitle = songObj.subtitle_en = subtitle
songObj.preview = meta.demostart ? Math.floor(meta.demostart * 1000) : 0 songObj.preview = meta.demostart || 0
if(meta.level){ if(meta.level){
songObj.stars[this.courseTypes[diff]] = meta.level + (meta.branch ? " B" : "") songObj.stars[this.courseTypes[diff]] = meta.level + (meta.branch ? " B" : "")
} }
@ -238,7 +238,7 @@
chart: data, chart: data,
subtitle: osu.metadata.ArtistUnicode || osu.metadata.Artist, subtitle: osu.metadata.ArtistUnicode || osu.metadata.Artist,
subtitle_en: osu.metadata.Artist || osu.metadata.ArtistUnicode, subtitle_en: osu.metadata.Artist || osu.metadata.ArtistUnicode,
preview: osu.generalInfo.PreviewTime, preview: osu.generalInfo.PreviewTime / 1000,
stars: [null, null, null, parseInt(osu.difficulty.overallDifficulty) || 1], stars: [null, null, null, parseInt(osu.difficulty.overallDifficulty) || 1],
music: this.otherFiles[dir + osu.generalInfo.AudioFilename.toLowerCase()] music: this.otherFiles[dir + osu.generalInfo.AudioFilename.toLowerCase()]
} }

4
public/src/js/songselect.js
View File

@ -1746,7 +1746,7 @@ class SongSelect{
}else{ }else{
songObj = {id: id} songObj = {id: id}
var previewFilename = prvTime > 0.1 ? "/preview.mp3" : "/main.mp3" var previewFilename = prvTime > 0 ? "/preview.mp3" : "/main.mp3"
var loadPreview = previewFilename => { var loadPreview = previewFilename => {
return snd.previewGain.load(gameConfig.songs_baseurl + id + previewFilename) return snd.previewGain.load(gameConfig.songs_baseurl + id + previewFilename)
@ -1786,7 +1786,7 @@ class SongSelect{
var difference = endLoad - startLoad var difference = endLoad - startLoad
var minDelay = 300 var minDelay = 300
var delay = minDelay - Math.min(minDelay, difference) var delay = minDelay - Math.min(minDelay, difference)
this.preview.playLoop(delay / 1000, false, prvTime / 1000) this.preview.playLoop(delay / 1000, false, prvTime)
} }
endPreview(){ endPreview(){
this.previewId++ this.previewId++