diff --git a/app.py b/app.py
index 4d29071..ea0c7b9 100644
--- a/app.py
+++ b/app.py
@@ -17,6 +17,7 @@ import time
import traceback
import pprint
import pathlib
+import shutil
import flask
import nkf
@@ -820,6 +821,16 @@ def upload_file():
return flask.jsonify({'success': True})
+@app.route("/api/delete", methods=["POST"])
+def delete():
+ id = flask.request.get_json().get('id')
+ client["taiko"]["songs"].delete_one({ "id": id })
+
+ target_dir = pathlib.Path(os.getenv("TAIKO_WEB_SONGS_DIR", "public/songs")) / id
+ shutil.rmtree(target_dir)
+
+ return flask.jsonify({'success': True})
+
if __name__ == '__main__':
import argparse
diff --git a/public/roboto/LICENSE.txt b/public/roboto/LICENSE.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/public/roboto/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/public/roboto/Roboto-Black.ttf b/public/roboto/Roboto-Black.ttf
new file mode 100644
index 0000000..0112e7d
Binary files /dev/null and b/public/roboto/Roboto-Black.ttf differ
diff --git a/public/roboto/Roboto-BlackItalic.ttf b/public/roboto/Roboto-BlackItalic.ttf
new file mode 100644
index 0000000..b2c6aca
Binary files /dev/null and b/public/roboto/Roboto-BlackItalic.ttf differ
diff --git a/public/roboto/Roboto-Bold.ttf b/public/roboto/Roboto-Bold.ttf
new file mode 100644
index 0000000..43da14d
Binary files /dev/null and b/public/roboto/Roboto-Bold.ttf differ
diff --git a/public/roboto/Roboto-BoldItalic.ttf b/public/roboto/Roboto-BoldItalic.ttf
new file mode 100644
index 0000000..bcfdab4
Binary files /dev/null and b/public/roboto/Roboto-BoldItalic.ttf differ
diff --git a/public/roboto/Roboto-Italic.ttf b/public/roboto/Roboto-Italic.ttf
new file mode 100644
index 0000000..1b5eaa3
Binary files /dev/null and b/public/roboto/Roboto-Italic.ttf differ
diff --git a/public/roboto/Roboto-Light.ttf b/public/roboto/Roboto-Light.ttf
new file mode 100644
index 0000000..e7307e7
Binary files /dev/null and b/public/roboto/Roboto-Light.ttf differ
diff --git a/public/roboto/Roboto-LightItalic.ttf b/public/roboto/Roboto-LightItalic.ttf
new file mode 100644
index 0000000..2d277af
Binary files /dev/null and b/public/roboto/Roboto-LightItalic.ttf differ
diff --git a/public/roboto/Roboto-Medium.ttf b/public/roboto/Roboto-Medium.ttf
new file mode 100644
index 0000000..ac0f908
Binary files /dev/null and b/public/roboto/Roboto-Medium.ttf differ
diff --git a/public/roboto/Roboto-MediumItalic.ttf b/public/roboto/Roboto-MediumItalic.ttf
new file mode 100644
index 0000000..fc36a47
Binary files /dev/null and b/public/roboto/Roboto-MediumItalic.ttf differ
diff --git a/public/roboto/Roboto-Regular.ttf b/public/roboto/Roboto-Regular.ttf
new file mode 100644
index 0000000..ddf4bfa
Binary files /dev/null and b/public/roboto/Roboto-Regular.ttf differ
diff --git a/public/roboto/Roboto-Thin.ttf b/public/roboto/Roboto-Thin.ttf
new file mode 100644
index 0000000..2e0dee6
Binary files /dev/null and b/public/roboto/Roboto-Thin.ttf differ
diff --git a/public/roboto/Roboto-ThinItalic.ttf b/public/roboto/Roboto-ThinItalic.ttf
new file mode 100644
index 0000000..084f9c0
Binary files /dev/null and b/public/roboto/Roboto-ThinItalic.ttf differ
diff --git a/public/src/css/main.css b/public/src/css/main.css
index e84b410..48bc632 100644
--- a/public/src/css/main.css
+++ b/public/src/css/main.css
@@ -109,6 +109,8 @@
right: 1vh;
opacity: 0.7;
font-family: TnT, Meiryo, sans-serif;
+ pointer-events: none;
+ max-width: 50%;
}
#version:hover{
opacity: 1;
@@ -118,6 +120,8 @@
color: #FFFFFF;
text-decoration: none;
pointer-events: none;
+ white-space: pre-line;
+ word-break: break-word;
}
.version-hide{
diff --git a/public/src/js/canvasdraw.js b/public/src/js/canvasdraw.js
index f5d7b95..de25cdd 100644
--- a/public/src/js/canvasdraw.js
+++ b/public/src/js/canvasdraw.js
@@ -1059,11 +1059,14 @@
var ctx = config.ctx
ctx.save()
- if(config.iconName === "download" ||config.iconName === "back"){
+ if(config.iconName === "download" ||config.iconName === "back" ||config.iconName === "trash"){
ctx.translate(config.x - 21, config.y - 21)
if(config.iconName === "download"){
ctx.rotate(Math.PI)
ctx.translate(-42, -42)
+ } else if(config.iconName === "trash") {
+ ctx.rotate(Math.PI / 2 * 3)
+ ctx.translate(-42, 0)
}
var drawLine = y => {
@@ -1095,8 +1098,8 @@
drawLine(11)
drawTriangle()
ctx.translate(-1.5, -0.5)
- ctx.fillStyle = config.iconName === "download" ? "#a08eea" : "#23a6e1"
- ctx.strokeStyle = config.iconName === "download" ? "#a08eea" : "#23a6e1"
+ ctx.fillStyle = config.iconName === "download" ? "#a08eea" : config.iconName == "trash" ? "#ff0000" : "#23a6e1"
+ ctx.strokeStyle = config.iconName === "download" ? "#a08eea" : config.iconName == "trash" ? "#ff0000" : "#23a6e1"
ctx.globalCompositeOperation = "darken"
drawLine(11)
drawTriangle()
diff --git a/public/src/js/main.js b/public/src/js/main.js
index e5602fc..2be387f 100644
--- a/public/src/js/main.js
+++ b/public/src/js/main.js
@@ -1,4 +1,9 @@
-addEventListener("error", function(err){
+addEventListener("load", () => {
+ document.querySelector("#version-link").textContent += ("taiko-web vRAINBOW-BETA4"+ "\n\n" + "《ウェブの航海者たちへの手紙》\n\n高潔なるウェブの航海者諸君へ、\n\n風を感じたことがあるかい？ウェブの風。それは時に優雅にして、時に荒々しく吹きすさんでいる。さて、今日はそんな風が再び吹き荒れる日だ。ウェブの航海は決して穏やかではない。時には波に呑まれ、時には星に導かれる。今日、私たちはひとつの航海を終える。だが、その終わりは新たな航路の始まりでもある。さあ、私の友よ、今宵はこの物語に耳を傾けよ。\n\nそれは遠い2024年、四月の初め。夜明けの色が空を染める頃、我々は一つの船出を告げる。ウェブの岸辺に立ち、喜びと哀しみを胸に、我々の旅路の終焉を知らせる。\"taikoapp.uk\"や\"yuuk1.tk\"、そしてその他の名高きサイトたちが、この日をもって船を降りるというのだ。\n\nその理由はさまざまだ。法の嵐に晒され、船員の数も減り、品質の維持も難しくなった。未知の海原を渡る船は、時に流れに飲み込まれ、時には頼りなき星を見失う。そして、かつての楽しみも、やがて影となり、心に暗雲を差す。だが、我々はそこに立ち止まることはない。この船が見たもの、得たものを忘れることはない。\n\n2023年、冬の深き日。我々は航海を開始した。多くの出会いがあった。多くの挑戦が待ち受けていた。そして、多くの喜びと悲しみが交錯した。しかし、それが我々の旅路だった。数えきれぬ航海の記憶が、今も私たちの心に残っている。\n\n我々は感謝に満ちている。ウェブの航海者たちよ、我々の旅を共にしてくれてありがとう。波に揉まれ、星に導かれ、互いの手を取り合って歩んだ日々を忘れない。新たな航路が見えるまで、私たちはここで一息つく。そして、次なる冒険への準備を整えるのだ。\n\nさあ、船出の時が来た。ウェブの海をさまよう船が、新たなる冒険へと進む。時には波に飲まれ、時には星に導かれながら、我々の旅は続く。ウェブの航海者たちよ、未知の海原へと旅立とう。新たなる冒険が待ち受けている。\n");
+ document.querySelector("#version-link").setAttribute("alt", document.querySelector("#version-link").textContent);
+});
+
+addEventListener("error", function(err){
var stack
if("error" in err && err.error){
stack = err.error.stack
diff --git a/public/src/js/songselect.js b/public/src/js/songselect.js
index 9dc7995..2aca4ef 100644
--- a/public/src/js/songselect.js
+++ b/public/src/js/songselect.js
@@ -208,13 +208,13 @@ class SongSelect{
// skin: this.songSkin.sourceCode,
// action: "sourceCode",
// });
- for (let i = 0; i < 10; i++) {
+ // for (let i = 0; i < 10; i++) {
this.songs.push({
title: "曲を投稿！",
skin: this.songSkin.upload,
action: "upload",
});
- }
+ // }
this.songs.push({
title: strings.back,
@@ -253,6 +253,12 @@ class SongSelect{
iconName: "download",
iconFill: "#e7cbe1",
letterSpacing: 4
+ }, {
+ text: "削除",
+ fill: "silver",
+ iconName: "trash",
+ iconFill: "#111111",
+ letterSpacing: 4
}]
this.optionsList = [strings.none, strings.auto, strings.netplay, "ばいそく", "さんばい", "よんばい", "ばいそく＋オート", "さんばい＋オート", "よんばい＋オート"]
@@ -421,6 +427,10 @@ class SongSelect{
}
setSelectedSong(songIdx, drawBg=true){
+ if (songIdx < 0) {
+ return;
+ }
+
if(drawBg){
var cat = this.songs[songIdx].originalCategory
if(cat){
@@ -588,6 +598,22 @@ class SongSelect{
this.toSongSelect()
}else if(moveBy === 2){
this.toDownload()
+ }else if(moveBy === 3){
+ // ここに削除処理を書く
+ alert("準備はいいですか？ (成功しても反映まで1分ほどかかる場合があります)");
+ fetch("/api/delete", {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({
+ id: this.songs[this.selectedSong].id,
+ })
+ })
+ .then((res) => res.text())
+ .then((text) => {
+ alert(text);
+ });
}else if(moveBy === 1){
this.toOptions(1)
}else if(moveBy === "maker"){
diff --git a/public/upload/index.html b/public/upload/index.html
index f0432e2..dc76f0a 100644
--- a/public/upload/index.html
+++ b/public/upload/index.html
@@ -18,7 +18,7 @@
-
+