feat: 记录并展示歌曲各难度最高记录（良率/连打数/总分）

app.py

@@ -28,7 +28,6 @@ import tjaf
 
 from functools import wraps
 from flask import Flask, g, jsonify, render_template, request, abort, redirect, session, flash, make_response, send_from_directory
-import mimetypes
 from flask_caching import Cache
 from flask_session import Session
 from flask_wtf.csrf import CSRFProtect, generate_csrf, CSRFError
@@ -807,33 +806,7 @@ def send_assets(ref):
 
 @app.route(basedir + "songs/<path:ref>")
 def send_songs(ref):
-    path = os.path.normpath(os.path.join("public/songs", ref))
-    if not os.path.isfile(path):
-        return abort(404)
-    rng = flask.request.headers.get("Range")
-    if rng and re.match(r"^bytes=\d+-\d*$", rng):
-        size = os.path.getsize(path)
-        m = re.match(r"bytes=(\d+)-(\d*)", rng)
-        start = int(m.group(1))
-        end = int(m.group(2) or size - 1)
-        start = max(0, start)
-        end = min(size - 1, end)
-        with open(path, "rb") as f:
-            f.seek(start)
-            data = f.read(end - start + 1)
-        mime = mimetypes.guess_type(path)[0] or "application/octet-stream"
-        resp = flask.Response(data, 206, mimetype=mime)
-        resp.headers["Content-Range"] = f"bytes {start}-{end}/{size}"
-        resp.headers["Accept-Ranges"] = "bytes"
-        resp.headers["Cache-Control"] = "public, max-age=604800, s-maxage=604800"
-        resp.headers["CDN-Cache-Control"] = "max-age=604800"
-        return resp
-    resp = flask.send_from_directory("public/songs", ref)
-    res = flask.make_response(resp)
-    res.headers["Accept-Ranges"] = "bytes"
-    res.headers["Cache-Control"] = "public, max-age=604800, s-maxage=604800"
-    res.headers["CDN-Cache-Control"] = "max-age=604800"
-    return res
+    return cache_wrap(flask.send_from_directory("public/songs", ref), 604800)
 
 @app.route(basedir + "manifest.json")
 def send_manifest():

public/src/js/abstractfile.js

@@ -51,55 +51,6 @@ class RemoteFile{
 			request.responseType = "arraybuffer"
 		})
 	}
-	arrayBufferFast(threads){
-		var t = threads || 4
-		var head = new XMLHttpRequest()
-		head.open("HEAD", this.url)
-		var headPromise = pageEvents.load(head).then(() => {
-			if(head.status !== 200){
-				return Promise.reject()
-			}
-			var len = parseInt(head.getResponseHeader("Content-Length"))
-			if(!len || len < 262144){
-				return this.arrayBuffer()
-			}
-			var chunk = Math.ceil(len / t)
-			var ranges = []
-			for(var i = 0; i < t; i++){
-				var start = i * chunk
-				var end = Math.min(len - 1, (i + 1) * chunk - 1)
-				if(start > end){ break }
-				ranges.push([start, end])
-			}
-			var promises = ranges.map(r => {
-				var req = new XMLHttpRequest()
-				req.open("GET", this.url)
-				req.responseType = "arraybuffer"
-				req.setRequestHeader("Range", "bytes=" + r[0] + "-" + r[1])
-				return pageEvents.load(req).then(() => {
-					if(req.status !== 206 && req.status !== 200){
-						return Promise.reject()
-					}
-					return req.response
-				})
-			})
-			return Promise.all(promises).then(parts => {
-				var total = 0
-				for(var i = 0; i < parts.length; i++){
-					total += parts[i].byteLength
-				}
-				var out = new Uint8Array(total)
-				var offset = 0
-				for(var i = 0; i < parts.length; i++){
-					out.set(new Uint8Array(parts[i]), offset)
-					offset += parts[i].byteLength
-				}
-				return out.buffer
-			})
-		})
-		head.send()
-		return headPromise.catch(() => this.arrayBuffer())
-	}
 	read(encoding){
 		if(encoding){
 			return this.blob().then(blob => readFile(blob, false, encoding))

public/src/js/assets.js

@@ -2,6 +2,7 @@ var assets = {
 	"js": [
 		"lib/md5.min.js",
 		"lib/fuzzysort.js",
+		"cookie.js",
 		"loadsong.js",
 		"parseosu.js",
 		"titlescreen.js",

public/src/js/cookie.js

@@ -0,0 +1,41 @@
+var cookie = {
+    get: function(name){
+        var pairs = document.cookie ? document.cookie.split("; ") : []
+        for(var i = 0; i < pairs.length; i++){
+            var idx = pairs[i].indexOf("=")
+            var key = idx > -1 ? pairs[i].slice(0, idx) : pairs[i]
+            if(key === name){
+                var val = idx > -1 ? pairs[i].slice(idx + 1) : ""
+                try{
+                    return decodeURIComponent(val)
+                }catch(e){
+                    return val
+                }
+            }
+        }
+        return null
+    },
+    set: function(name, value, maxAge){
+        var v = typeof value === "string" ? value : String(value)
+        document.cookie = name + "=" + encodeURIComponent(v) + ";path=/" + (maxAge ? ";max-age=" + maxAge : "")
+    },
+    getJSON: function(name){
+        var v = this.get(name)
+        if(!v){
+            return {}
+        }
+        try{
+            return JSON.parse(v)
+        }catch(e){
+            return {}
+        }
+    },
+    updateJSON: function(name, updater, maxAge){
+        var obj = this.getJSON(name)
+        var next = updater && updater(obj) || obj
+        try{
+            this.set(name, JSON.stringify(next), maxAge)
+        }catch(e){}
+        return next
+    }
+}

public/src/js/scoresheet.js

@@ -949,6 +949,21 @@ class Scoresheet{
 					this.showWarning = {name: "scoreSaveFailed"}
 				})
 			}
+			var key = "taiko_best_records"
+			var obj = cookie.getJSON(key)
+			if(!(hash in obj)){
+				obj[hash] = {}
+			}
+			var prev = obj[hash][difficulty]
+			var total = this.resultsObj.good + this.resultsObj.ok + this.resultsObj.bad
+			var acc = total > 0 ? Math.round(((this.resultsObj.good + this.resultsObj.ok) / total) * 1000) / 10 : 0
+			var combo = this.resultsObj.maxCombo || 0
+			var points = this.resultsObj.points || 0
+			var update = !prev || points > prev.score || (points === prev.score && (acc > prev.accuracy || combo > prev.combo))
+			if(update){
+				obj[hash][difficulty] = {score: points, accuracy: acc, combo: combo, updatedAt: Date.now()}
+				try{ cookie.set(key, JSON.stringify(obj), 31536000) }catch(e){}
+			}
 		}
 		this.scoreSaved = true
 	}

public/src/js/songselect.js

@@ -1989,6 +1989,37 @@ class SongSelect{
 									})
 								}
 							}
+							var recAll = cookie.getJSON("taiko_best_records")
+							var bySong = recAll[currentSong.hash] || null
+							var diffName = currentUra ? "ura" : this.difficultyId[i]
+							var rec = bySong && bySong[diffName] || null
+							var elapsedMS2 = Math.max(this.state.screenMS, this.state.moveMS, this.state.mouseMoveMS)
+							var cycle = Math.floor(((ms - elapsedMS2) % 6000) / 2000)
+							var label = ""
+							if(rec){
+								if(cycle === 0){
+									label = (strings.bestAccuracy || "良率") + " " + (Math.round(rec.accuracy * 10) / 10) + "%"
+								}else if(cycle === 1){
+									label = (strings.bestCombo || "连打数") + " " + rec.combo
+								}else{
+									label = (strings.bestScore || "总分") + " " + rec.score
+								}
+							}else{
+								label = (strings.none || "无")
+							}
+							this.draw.verticalText({
+								ctx: ctx,
+								text: label,
+								x: _x,
+								y: songSel ? _y + 220 : _y + 265,
+								width: songSel ? 44 : 56,
+								height: songSel ? 120 : 135,
+								fill: currentUra ? "#fff" : "#000",
+								outline: currentUra ? "#003C52" : false,
+								outlineSize: currentUra ? this.songAsset.letterBorder : 0,
+								fontSize: songSel ? 22 : 24,
+								fontFamily: this.font
+							})
 						}
 						var currentDiff = this.selectedDiff - this.diffOptions.length
 						if(this.selectedDiff === 4 + this.diffOptions.length){
@@ -2965,6 +2996,12 @@ class SongSelect{
 			var categoryName = song.category
 			var originalCategory = song.category
 		}
+		if(!categoryName){
+			if(song.song_type){
+				categoryName = song.song_type
+				originalCategory = song.song_type
+			}
+		}
 		var addedSong = {
 			title: title,
 			originalTitle: song.title,

public/src/js/soundbuffer.js

@@ -1,4 +1,4 @@
-class SoundBuffer{
+class SoundBuffer{
 	constructor(...args){
 		this.init(...args)
 	}
@@ -12,8 +12,7 @@ class SoundBuffer{
 	}
 	load(file, gain){
 		var decoder = file.name.endsWith(".ogg") ? this.oggDecoder : this.audioDecoder
-		var promise = typeof file.arrayBufferFast === "function" ? file.arrayBufferFast(4) : file.arrayBuffer()
-		return promise.then(response => {
+		return file.arrayBuffer().then(response => {
 			return new Promise((resolve, reject) => {
 				return decoder(response, resolve, reject)
 			}).catch(error => Promise.reject([error, file.url]))

public/src/js/strings.js

@@ -67,6 +67,27 @@ var translations = {
 		tw: "選擇難度",
 		ko: "난이도 선택"
 	},
+	bestAccuracy: {
+		ja: "良率",
+		en: "Accuracy",
+		cn: "良率",
+		tw: "良率",
+		ko: "정확도"
+	},
+	bestCombo: {
+		ja: "連打数",
+		en: "Max Combo",
+		cn: "连打数",
+		tw: "連打數",
+		ko: "최대 콤보"
+	},
+	bestScore: {
+		ja: "総得点",
+		en: "Score",
+		cn: "总分",
+		tw: "總分",
+		ko: "총점"
+	},
 	back: {
 		ja: "もどる",
 		en: "Back",

tjaf.py

@@ -7,6 +7,8 @@ class Tja:
         self.text = text
         self.title: Optional[str] = None
         self.subtitle: Optional[str] = None
+        self.title_ja: Optional[str] = None
+        self.subtitle_ja: Optional[str] = None
         self.wave: Optional[str] = None
         self.offset: Optional[float] = None
         self.courses: Dict[str, Dict[str, Optional[int]]] = {}
@@ -25,8 +27,12 @@ class Tja:
                 val = v.strip()
                 if key == "TITLE":
                     self.title = val or None
+                elif key == "TITLEJA":
+                    self.title_ja = val or None
                 elif key == "SUBTITLE":
                     self.subtitle = val or None
+                elif key == "SUBTITLEJA":
+                    self.subtitle_ja = val or None
                 elif key == "WAVE":
                     self.wave = val or None
                 elif key == "OFFSET":
@@ -73,8 +79,20 @@ class Tja:
             "type": "tja",
             "title": self.title,
             "subtitle": self.subtitle,
-            "title_lang": {"ja": self.title, "en": None, "cn": None, "tw": None, "ko": None},
-            "subtitle_lang": {"ja": self.subtitle, "en": None, "cn": None, "tw": None, "ko": None},
+            "title_lang": {
+                "ja": self.title_ja or self.title,
+                "en": None,
+                "cn": self.title_ja or None,
+                "tw": None,
+                "ko": None,
+            },
+            "subtitle_lang": {
+                "ja": self.subtitle_ja or self.subtitle,
+                "en": None,
+                "cn": self.subtitle_ja or None,
+                "tw": None,
+                "ko": None,
+            },
             "courses": courses_out,
             "enabled": False,
             "category_id": None,

update.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+if [ "${EUID}" -ne 0 ]; then echo "需要 root 权限"; exit 1; fi
+
+SRC_DIR=$(cd "$(dirname "$0")" && pwd)
+DEST_DIR=/srv/taiko-web
+SONGS_DIR="$DEST_DIR/public/songs"
+BACKUP_DIR="$DEST_DIR/.backup_songs_$(date +%Y%m%d_%H%M%S)"
+
+systemctl stop taiko-web || true
+
+if [ -d "$SONGS_DIR" ]; then
+  mkdir -p "$BACKUP_DIR"
+  rsync -a "$SONGS_DIR/" "$BACKUP_DIR/" || cp -a "$SONGS_DIR/." "$BACKUP_DIR/"
+fi
+
+mkdir -p "$DEST_DIR"
+rsync -a --delete \
+  --exclude '.git' \
+  --exclude '.venv' \
+  --exclude 'public/songs' \
+  "$SRC_DIR/" "$DEST_DIR/"
+
+if [ -x "$DEST_DIR/.venv/bin/pip" ]; then
+  "$DEST_DIR/.venv/bin/pip" install -U pip
+  "$DEST_DIR/.venv/bin/pip" install -r "$DEST_DIR/requirements.txt"
+fi
+
+chown -R www-data:www-data "$DEST_DIR"
+
+if [ -d "$BACKUP_DIR" ]; then
+  mkdir -p "$SONGS_DIR"
+  rsync -a "$BACKUP_DIR/" "$SONGS_DIR/" || cp -a "$BACKUP_DIR/." "$SONGS_DIR/"
+fi
+
+systemctl daemon-reload || true
+systemctl restart taiko-web || systemctl start taiko-web || true
+
+systemctl is-active --quiet taiko-web