taiko web is back

.gitignore

@@ -48,3 +48,6 @@ version.json
 public/index.html
 config.json
 public/assets/song_skins
+*.log
+.venv*
+app.pyc

README.md

 # taiko-web
 A web-based Taiko no Tatsujin simulator.
 
-Running instance: [https://taiko.bui.pm](https://taiko.bui.pm)
+Running instance: [http://taiko.222diy.gdn:765](http://taiko.222diy.gdn:765)
 
 Still in development. Works best with Chrome.
 

app.py

@@ -170,7 +170,7 @@ def route_api_preview():
     song_type = song_row[0][12]
     prev_path = make_preview(song_id, song_type)
     if not prev_path:
-        return redirect(get_config()['songs_baseurl'] + '%s/main.mp3' % song_id)
+        return redirect(get_config()['songs_baseurl'] + '%s/main.ogg' % song_id)
 
     return redirect(get_config()['songs_baseurl'] + '%s/preview.mp3' % song_id)
 
@@ -227,7 +227,7 @@ def route_api_config():
 
 
 def make_preview(song_id, song_type):
-    song_path = 'public/songs/%s/main.mp3' % song_id
+    song_path = 'public/songs/%s/main.ogg' % song_id
     prev_path = 'public/songs/%s/preview.mp3' % song_id
 
     if os.path.isfile(song_path) and not os.path.isfile(prev_path):

pm2.json

+{
+	"apps": [
+		{
+			"name": "taiko-web",
+			"script": "./.venv2/bin/gunicorn",
+			"interpreter": "./.venv2/bin/python2",
+			"args": "-b 127.0.0.1:34801 app:app",
+			"error_file": "error_taiko.log",
+			"out_file": "log_taiko.log"
+		},
+		{
+			"name": "taiko-web-server",
+			"interpreter": "./.venv3/bin/python",
+			"script": "server.py",
+			"args": "34802",
+			"error_file": "error_taiko_server.log",
+			"out_file": "log_taiko_server.log"
+		}
+	]
+}

public/src/js/loadsong.js

@@ -97,7 +97,7 @@ class LoadSong{
 					resolve()
 				}, reject)
 			}else{
-				snd.musicGain.load(gameConfig.songs_baseurl + id + "/main.mp3").then(sound => {
+				snd.musicGain.load(gameConfig.songs_baseurl + id + "/main.ogg").then(sound => {
 					songObj.sound = sound
 					resolve()
 				}, reject)

public/src/js/songselect.js

@@ -1708,7 +1708,7 @@ class SongSelect{
 			}else{
 				songObj = {id: id}
 				
-				var previewFilename = prvTime > 0.1 ? "/preview.mp3" : "/main.mp3"
+				var previewFilename = prvTime > 0.1 ? "/preview.mp3" : "/main.ogg"
 				
 				var loadPreview = previewFilename => {
 					return snd.previewGain.load(gameConfig.songs_baseurl + id + previewFilename)
@@ -1722,7 +1722,7 @@ class SongSelect{
 						songObj.preview_time = 0
 						loadPreview(previewFilename).catch(() => {
 							songObj.preview_time = prvTime
-							return loadPreview("/main.mp3")
+							return loadPreview("/main.ogg")
 						}).then(resolve, reject)
 					}
 				}).then(sound => {