mirror of
https://github.com/jiojciojsioe3/a3cjroijsiojiorj.git
synced 2024-12-22 17:26:13 +08:00
Assets: Convert to ogg
- Uses oggmented library to add ogg support to iOS - Adds support for ogg songs on the server, configurable per song on the admin page - Lets iOS users upload custom songs with gdrive when enabled - Tweaked colour picker on account page to respond faster - Fixed not being able to restart osu songs
This commit is contained in:
parent
348322b7d8
commit
dec0e55eb7
11
app.py
11
app.py
@ -243,6 +243,7 @@ def route_admin_songs_new_post():
|
||||
|
||||
output['category_id'] = int(request.form.get('category_id')) or None
|
||||
output['type'] = request.form.get('type')
|
||||
output['music_type'] = request.form.get('music_type')
|
||||
output['offset'] = float(request.form.get('offset')) or None
|
||||
output['skin_id'] = int(request.form.get('skin_id')) or None
|
||||
output['preview'] = float(request.form.get('preview')) or None
|
||||
@ -303,6 +304,7 @@ def route_admin_songs_id_post(id):
|
||||
|
||||
output['category_id'] = int(request.form.get('category_id')) or None
|
||||
output['type'] = request.form.get('type')
|
||||
output['music_type'] = request.form.get('music_type')
|
||||
output['offset'] = float(request.form.get('offset')) or None
|
||||
output['skin_id'] = int(request.form.get('skin_id')) or None
|
||||
output['preview'] = float(request.form.get('preview')) or None
|
||||
@ -351,9 +353,10 @@ def route_api_preview():
|
||||
abort(400)
|
||||
|
||||
song_type = song['type']
|
||||
prev_path = make_preview(song_id, song_type, song['preview'])
|
||||
song_ext = song['music_type'] if song['music_type'] else "mp3"
|
||||
prev_path = make_preview(song_id, song_type, song_ext, song['preview'])
|
||||
if not prev_path:
|
||||
return redirect(get_config()['songs_baseurl'] + '%s/main.mp3' % song_id)
|
||||
return redirect(get_config()['songs_baseurl'] + '%s/main.%s' % (song_id, song_ext))
|
||||
|
||||
return redirect(get_config()['songs_baseurl'] + '%s/preview.mp3' % song_id)
|
||||
|
||||
@ -606,8 +609,8 @@ def route_api_scores_get():
|
||||
return jsonify({'status': 'ok', 'scores': scores, 'username': user['username'], 'display_name': user['display_name'], 'don': don})
|
||||
|
||||
|
||||
def make_preview(song_id, song_type, preview):
|
||||
song_path = 'public/songs/%s/main.mp3' % song_id
|
||||
def make_preview(song_id, song_type, song_ext, preview):
|
||||
song_path = 'public/songs/%s/main.%s' % (song_id, song_ext)
|
||||
prev_path = 'public/songs/%s/preview.mp3' % song_id
|
||||
|
||||
if os.path.isfile(song_path) and not os.path.isfile(prev_path):
|
||||
|
BIN
public/assets/audio/neiro_1_don.ogg
Normal file
BIN
public/assets/audio/neiro_1_don.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/neiro_1_ka.ogg
Normal file
BIN
public/assets/audio/neiro_1_ka.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/se_balloon.ogg
Normal file
BIN
public/assets/audio/se_balloon.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/se_calibration.ogg
Normal file
BIN
public/assets/audio/se_calibration.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/se_cancel.ogg
Normal file
BIN
public/assets/audio/se_cancel.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/se_don.ogg
Normal file
BIN
public/assets/audio/se_don.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/se_gameclear.ogg
Normal file
BIN
public/assets/audio/se_gameclear.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/se_gamefail.ogg
Normal file
BIN
public/assets/audio/se_gamefail.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/se_gamefullcombo.ogg
Normal file
BIN
public/assets/audio/se_gamefullcombo.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/se_jump.ogg
Normal file
BIN
public/assets/audio/se_jump.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/se_ka.ogg
Normal file
BIN
public/assets/audio/se_ka.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/se_pause.ogg
Normal file
BIN
public/assets/audio/se_pause.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/se_results_countup.ogg
Normal file
BIN
public/assets/audio/se_results_countup.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/se_results_crown.ogg
Normal file
BIN
public/assets/audio/se_results_crown.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_100.ogg
Normal file
BIN
public/assets/audio/v_combo_100.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_1000.ogg
Normal file
BIN
public/assets/audio/v_combo_1000.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_1100.ogg
Normal file
BIN
public/assets/audio/v_combo_1100.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_1200.ogg
Normal file
BIN
public/assets/audio/v_combo_1200.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_1300.ogg
Normal file
BIN
public/assets/audio/v_combo_1300.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_1400.ogg
Normal file
BIN
public/assets/audio/v_combo_1400.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_1500.ogg
Normal file
BIN
public/assets/audio/v_combo_1500.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_1600.ogg
Normal file
BIN
public/assets/audio/v_combo_1600.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_1700.ogg
Normal file
BIN
public/assets/audio/v_combo_1700.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_1800.ogg
Normal file
BIN
public/assets/audio/v_combo_1800.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_1900.ogg
Normal file
BIN
public/assets/audio/v_combo_1900.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_200.ogg
Normal file
BIN
public/assets/audio/v_combo_200.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_2000.ogg
Normal file
BIN
public/assets/audio/v_combo_2000.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_2100.ogg
Normal file
BIN
public/assets/audio/v_combo_2100.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_2200.ogg
Normal file
BIN
public/assets/audio/v_combo_2200.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_2300.ogg
Normal file
BIN
public/assets/audio/v_combo_2300.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_2400.ogg
Normal file
BIN
public/assets/audio/v_combo_2400.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_2500.ogg
Normal file
BIN
public/assets/audio/v_combo_2500.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_2600.ogg
Normal file
BIN
public/assets/audio/v_combo_2600.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_2700.ogg
Normal file
BIN
public/assets/audio/v_combo_2700.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_2800.ogg
Normal file
BIN
public/assets/audio/v_combo_2800.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_2900.ogg
Normal file
BIN
public/assets/audio/v_combo_2900.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_300.ogg
Normal file
BIN
public/assets/audio/v_combo_300.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_3000.ogg
Normal file
BIN
public/assets/audio/v_combo_3000.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_3100.ogg
Normal file
BIN
public/assets/audio/v_combo_3100.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_3200.ogg
Normal file
BIN
public/assets/audio/v_combo_3200.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_3300.ogg
Normal file
BIN
public/assets/audio/v_combo_3300.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_3400.ogg
Normal file
BIN
public/assets/audio/v_combo_3400.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_3500.ogg
Normal file
BIN
public/assets/audio/v_combo_3500.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_3600.ogg
Normal file
BIN
public/assets/audio/v_combo_3600.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_3700.ogg
Normal file
BIN
public/assets/audio/v_combo_3700.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_3800.ogg
Normal file
BIN
public/assets/audio/v_combo_3800.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_3900.ogg
Normal file
BIN
public/assets/audio/v_combo_3900.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_400.ogg
Normal file
BIN
public/assets/audio/v_combo_400.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_4000.ogg
Normal file
BIN
public/assets/audio/v_combo_4000.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
public/assets/audio/v_combo_4100.ogg
Normal file
BIN
public/assets/audio/v_combo_4100.ogg
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user