AnthonyDuan/taiko-web
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utf-8で固定し歌詞の文字化けを修正

Browse Source
This commit is contained in:
yuuki
2024-03-21 00:16:44 +09:00
parent dcb7abf993
commit a2e7e197c3
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/js/controller.js
View File

@@ -266,7 +266,7 @@ class Controller{
var chartDiff = this.selectedSong.difficulty var chartDiff = this.selectedSong.difficulty
chart = chart[chartDiff] chart = chart[chartDiff]
} }
this.addPromise(promises, chart.read(this.selectedSong.type === "tja" ? "sjis" : undefined).then(data => { this.addPromise(promises, chart.read(this.selectedSong.type === "tja" ? "utf-8" : undefined).then(data => {
this.songData = data.replace(/\0/g, "").split("\n") this.songData = data.replace(/\0/g, "").split("\n")
return Promise.resolve() return Promise.resolve()
}), chart.url) }), chart.url)

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

@@ -146,7 +146,7 @@
var file = fileObj.file var file = fileObj.file
var level = fileObj.level var level = fileObj.level
var name = file.name.toLowerCase() var name = file.name.toLowerCase()
return file.read(name === "songtitle.txt" ? undefined : "sjis").then(data => { return file.read(name === "songtitle.txt" ? undefined : "utf-8").then(data => {
var data = data.replace(/\0/g, "").split("\n") var data = data.replace(/\0/g, "").split("\n")
var category var category
if(name === "genre.ini"){ if(name === "genre.ini"){
@@ -228,7 +228,7 @@
var category = fileObj.category var category = fileObj.category
var category_id = fileObj.category_id var category_id = fileObj.category_id
if(!this.limited){ if(!this.limited){
var filePromise = file.read("sjis") var filePromise = file.read("utf-8")
}else{ }else{
var filePromise = Promise.resolve() var filePromise = Promise.resolve()
} }

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

@@ -135,7 +135,7 @@ class LoadSong{
chart = chart[chartDiff] chart = chart[chartDiff]
} }
if(chart){ if(chart){
this.addPromise(chart.read(song.type === "tja" ? "sjis" : "").then(data => { this.addPromise(chart.read(song.type === "tja" ? "utf-8" : "").then(data => {
this.songData = data.replace(/\0/g, "").split("\n") this.songData = data.replace(/\0/g, "").split("\n")
}), chart.url) }), chart.url)
}else{ }else{
@@ -309,7 +309,7 @@ class LoadSong{
if(song.type === "tja" || !chart || !chart.separateDiff || !chart[chartDiff]){ if(song.type === "tja" || !chart || !chart.separateDiff || !chart[chartDiff]){
this.startMultiplayer() this.startMultiplayer()
}else{ }else{
chart[chartDiff].read(song.type === "tja" ? "sjis" : "").then(data => { chart[chartDiff].read(song.type === "tja" ? "utf-8" : "").then(data => {
this.song2Data = data.replace(/\0/g, "").split("\n") this.song2Data = data.replace(/\0/g, "").split("\n")
}, () => {}).then(() => { }, () => {}).then(() => {
this.startMultiplayer() this.startMultiplayer()

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

@@ -2681,7 +2681,7 @@ class SongSelect{
var currentSong = this.songs[selectedSong] var currentSong = this.songs[selectedSong]
var file = currentSong.chart var file = currentSong.chart
var importSongs = new ImportSongs(false, assets.otherFiles) var importSongs = new ImportSongs(false, assets.otherFiles)
return file.read(currentSong.type === "tja" ? "sjis" : "").then(data => { return file.read(currentSong.type === "tja" ? "utf-8" : "").then(data => {
currentSong.chart = new CachedFile(data, file) currentSong.chart = new CachedFile(data, file)
return importSongs[currentSong.type === "tja" ? "addTja" : "addOsu"]({ return importSongs[currentSong.type === "tja" ? "addTja" : "addOsu"]({
file: currentSong.chart, file: currentSong.chart,