Update to v2.1

README.md

@@ -55,23 +55,14 @@ It is just so interesting. What it can do is under exploration.
 >
 > Tips: When updating, please keep the original database in case of data loss.
 
-### Version 2.0
+### Version 2.1
-- 适用于Arcaea 3.4.1版本 For Arcaea 3.4.1
+- 适用于Arcaea 3.5.0版本 For Arcaea 3.5.0
-- 更新API接口至13 Update API interface to 13.
 - 更新了歌曲数据库 Update the song database.
-- 新增了兑换码系统 Add the redeem code system.
+- 新搭档**阿莱乌斯**、**希尔**、**伊莎贝尔**已解锁 Unlock the new characters **Areus**, **Seele** and **Isabelle**.
-- 优化了下载时文件MD5的读取速度 Optimize the reading speed of MD5 when downloading.
+- 源韵强化机制修改，现在源点会正常扣去 The mechanism of Memory Boost has been modified. Now the memories will be decreased normally.
-- 新增初见保护 Add initial protection.
+- 优化了代码结构 Optimize the code structure.
-- EX保护机制修改，现在重复歌曲若分数较高，会刷新r30中最早的记录，并保证ptt不下降，仍不清楚能否正常起效 EX protection mechanism has been modified. If the score of one repetitive song is higher, it will refresh the earliest record in r30 and ensure that PTT won't not drop. It is still unclear whether it can work normally.
-- 数据迁移机制修改，现在重复数据以旧数据库数据为准 The database migration mechanism has been modified. Now the duplicate data is subject to the old database data.
-- 机制修改，数据库缺少歌曲定数会当做Unrank处理 The mechanism has been modified. The lack of chart constant of songs in the database will be treated as unrank.
-- 后台新增用户密码修改、用户封禁和成绩清除 Add user password modification, user ban and score clearance in the background.
-- 游戏内数据同步将记录同步时间 Data synchronization in game will record synchronization time.
 - 修复了一些Bug Fix some bugs.
 
-> 提醒：本次更新针对了API接口更新，将无法兼容Arcaea 3.4.1以下版本
->
-> Tips: This update includes API interface update, and will not be compatible with the version below Arcaea 3.4.1.
 
 ## 运行环境与依赖 Running environment and requirements
 - Windows操作系统 Windows operating system

latest version/database/database_initialize.py

@@ -33,7 +33,8 @@ rating real,
 favorite_character int,
 max_stamina_notification_enabled int,
 current_map text,
-ticket int
+ticket int,
+prog_boost int
 );''')
 c.execute('''create table if not exists login(access_token text,
 user_id int primary key,
@@ -234,16 +235,16 @@ primary key(user_id, code)
 
 
 char = ['Hikari', 'Tairitsu', 'Kou', 'Sapphire', 'Lethe', '', 'Tairitsu(Axium)', 'Tairitsu(Grievous Lady)', 'Stella', 'Hikari & Fisica', 'Ilith', 'Eto', 'Luna', 'Shirabe', 'Hikari(Zero)', 'Hikari(Fracture)', 'Hikari(Summer)', 'Tairitsu(Summer)', 'Tairitsu & Trin',
-        'Ayu', 'Eto & Luna', 'Yume', 'Seine & Hikari', 'Saya', 'Tairitsu & Chuni Penguin', 'Chuni Penguin', 'Haruna', 'Nono', 'MTA-XXX', 'MDA-21', 'Kanae', 'Hikari(Fantasia)', 'Tairitsu(Sonata)', 'Sia', 'DORO*C', 'Tairitsu(Tempest)', 'Brillante', 'Ilith(Summer)', 'Etude', 'Alice & Tenniel', 'Luna & Mia']
+        'Ayu', 'Eto & Luna', 'Yume', 'Seine & Hikari', 'Saya', 'Tairitsu & Chuni Penguin', 'Chuni Penguin', 'Haruna', 'Nono', 'MTA-XXX', 'MDA-21', 'Kanae', 'Hikari(Fantasia)', 'Tairitsu(Sonata)', 'Sia', 'DORO*C', 'Tairitsu(Tempest)', 'Brillante', 'Ilith(Summer)', 'Etude', 'Alice & Tenniel', 'Luna & Mia', 'Areus', 'Seele', 'Isabelle']
 
 skill_id = ['gauge_easy', '', '', '', 'note_mirror', '', '', 'gauge_hard', 'frag_plus_10_pack_stellights', 'gauge_easy|frag_plus_15_pst&prs', 'gauge_hard|fail_frag_minus_100', 'frag_plus_5_side_light', 'visual_hide_hp', 'frag_plus_5_side_conflict', 'challenge_fullcombo_0gauge', 'gauge_overflow', 'gauge_easy|note_mirror', 'note_mirror', 'visual_tomato_pack_tonesphere',
-            'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', '', '', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', '', 'note_mirror|visual_hide_far', 'frags_ongeki']
+            'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', '', '', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', '', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle']
 
 skill_id_uncap = ['', '', 'frags_kou', '', 'visual_ink', '', '', '', '', '', '', '', '', 'shirabe_entry_fee',
-                  '', '', '', '', '', '', '', 'frags_yume', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '']
+                  '', '', '', '', '', '', '', 'frags_yume', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '']
 
-for i in range(0, 41):
+for i in range(0, 44):
-    if i in [0, 1, 2, 4, 13, 26, 27, 28, 29, 36, 21]:
+    if i in [0, 1, 2, 4, 13, 26, 27, 28, 29, 36, 21, 42, 43]:
         sql = 'insert into character values('+str(
             i)+',"'+char[i]+'''",30,25000,25000,90,90,90,"'''+skill_id[i]+'''",0,0,"'''+skill_id_uncap[i]+'''",0,'',1,1)'''
         c.execute(sql)

latest version/database/packs.json

@@ -3,7 +3,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "core",
-		"_id": "5ff79fc6a6e343038b058bd3",
+		"_id": "6008c2ff36651a07ebc52ca9",
 		"is_available": true
 	}],
 	"price": 500,
@@ -15,12 +15,12 @@
 	"items": [{
 		"type": "pack",
 		"id": "shiawase",
-		"_id": "5ff79fc6a6e343038b058c18",
+		"_id": "6008c2ff36651a07ebc52ce0",
 		"is_available": true
 	}, {
 		"type": "character",
 		"id": "kou",
-		"_id": "5ff79fc6a6e343038b058c17",
+		"_id": "6008c2ff36651a07ebc52cdf",
 		"is_available": true
 	}],
 	"price": 500,
@@ -32,12 +32,12 @@
 	"items": [{
 		"type": "pack",
 		"id": "dynamix",
-		"_id": "5ff79fc6a6e343038b058c1c",
+		"_id": "6008c2ff36651a07ebc52ce4",
 		"is_available": true
 	}, {
 		"type": "character",
 		"id": "sapphire",
-		"_id": "5ff79fc6a6e343038b058c1b",
+		"_id": "6008c2ff36651a07ebc52ce3",
 		"is_available": true
 	}],
 	"price": 500,
@@ -49,12 +49,12 @@
 	"items": [{
 		"type": "pack",
 		"id": "mirai",
-		"_id": "5ff79fc6a6e343038b058c10",
+		"_id": "6008c2ff36651a07ebc52cdc",
 		"is_available": true
 	}, {
 		"type": "character",
 		"id": "lethe",
-		"_id": "5ff79fc6a6e343038b058c0f",
+		"_id": "6008c2ff36651a07ebc52cdb",
 		"is_available": true
 	}],
 	"price": 500,
@@ -66,7 +66,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "yugamu",
-		"_id": "5ff79fc6a6e343038b058bd4",
+		"_id": "6008c2ff36651a07ebc52caa",
 		"is_available": true
 	}],
 	"price": 500,
@@ -78,7 +78,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "lanota",
-		"_id": "5ff79fc6a6e343038b058bf9",
+		"_id": "6008c2ff36651a07ebc52cd0",
 		"is_available": true
 	}],
 	"price": 500,
@@ -90,7 +90,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "nijuusei",
-		"_id": "5ff79fc6a6e343038b058bd5",
+		"_id": "6008c2ff36651a07ebc52cab",
 		"is_available": true
 	}],
 	"price": 500,
@@ -102,7 +102,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "rei",
-		"_id": "5ff79fc6a6e343038b058c06",
+		"_id": "6008c2ff36651a07ebc52cc5",
 		"is_available": true
 	}],
 	"price": 500,
@@ -114,7 +114,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "tonesphere",
-		"_id": "5ff79fc6a6e343038b058bfb",
+		"_id": "6008c2ff36651a07ebc52cd2",
 		"is_available": true
 	}],
 	"price": 500,
@@ -126,7 +126,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "groovecoaster",
-		"_id": "5ff79fc6a6e343038b058bf0",
+		"_id": "6008c2ff36651a07ebc52ca1",
 		"is_available": true
 	}],
 	"price": 500,
@@ -138,7 +138,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "zettai",
-		"_id": "5ff79fc6a6e343038b058c08",
+		"_id": "6008c2ff36651a07ebc52cc7",
 		"is_available": true
 	}],
 	"price": 500,
@@ -150,7 +150,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "chunithm",
-		"_id": "5ff79fc6a6e343038b058be4",
+		"_id": "6008c2ff36651a07ebc52cbb",
 		"is_available": true
 	}],
 	"price": 300,
@@ -160,7 +160,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "prelude",
-		"_id": "5ff79fc6a6e343038b058bf1",
+		"_id": "6008c2ff36651a07ebc52ca2",
 		"is_available": true
 	}],
 	"price": 400,
@@ -170,7 +170,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "omatsuri",
-		"_id": "5ff79fc6a6e343038b058c09",
+		"_id": "6008c2ff36651a07ebc52cc8",
 		"is_available": true
 	}],
 	"price": 500,
@@ -180,7 +180,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "vs",
-		"_id": "5ff79fc6a6e343038b058be7",
+		"_id": "6008c2ff36651a07ebc52cbe",
 		"is_available": true
 	}],
 	"price": 500,
@@ -190,7 +190,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "extend",
-		"_id": "5ff79fc6a6e343038b058bf4",
+		"_id": "6008c2ff36651a07ebc52ca5",
 		"is_available": true
 	}],
 	"price": 700,
@@ -200,7 +200,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "alice",
-		"_id": "5ff79fc6a6e343038b058c0e",
+		"_id": "6008c2ff36651a07ebc52ccd",
 		"is_available": true
 	}],
 	"orig_price": 500,
@@ -210,7 +210,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "alice_append_1",
-		"_id": "5ff79fc6a6e343038b058bde",
+		"_id": "6008c2ff36651a07ebc52cb4",
 		"is_available": true
 	}],
 	"orig_price": 300,
@@ -220,7 +220,7 @@
 	"items": [{
 		"type": "pack",
 		"id": "ongeki",
-		"_id": "5ff79fc6a6e343038b058bea",
+		"_id": "6008c2ff36651a07ebc52cc1",
 		"is_available": true
 	}],
 	"orig_price": 400,
@@ -230,9 +230,19 @@
 	"items": [{
 		"type": "pack",
 		"id": "maimai",
-		"_id": "5ff79fc6a6e343038b058bf7",
+		"_id": "6008c2ff36651a07ebc52ca8",
 		"is_available": true
 	}],
 	"orig_price": 400,
 	"price": 400
+}, {
+	"name": "chunithm_append_1",
+	"items": [{
+		"type": "pack",
+		"id": "chunithm_append_1",
+		"_id": "6008c2ff36651a07ebc52cda",
+		"is_available": true
+	}],
+	"orig_price": 300,
+	"price": 300
 }]

latest version/database/singles.json

@@ -12,7 +12,7 @@
 	"items": [{
 		"id": "dataerror",
 		"type": "single",
-		"_id": "5ff79fc6a6e343038b058beb",
+		"_id": "6008c2ff36651a07ebc52cb5",
 		"is_available": true
 	}],
 	"price": 100,
@@ -24,7 +24,7 @@
 	"items": [{
 		"id": "yourvoiceso",
 		"type": "single",
-		"_id": "5ff79fc6a6e343038b058bf8",
+		"_id": "6008c2ff36651a07ebc52cc2",
 		"is_available": true
 	}],
 	"price": 100,
@@ -36,7 +36,7 @@
 	"items": [{
 		"id": "crosssoul",
 		"type": "single",
-		"_id": "5ff79fc6a6e343038b058c03",
+		"_id": "6008c2ff36651a07ebc52ccf",
 		"is_available": true
 	}],
 	"price": 100,
@@ -48,7 +48,7 @@
 	"items": [{
 		"type": "single",
 		"id": "impurebird",
-		"_id": "5ff79fc6a6e343038b058bdf",
+		"_id": "6008c2ff36651a07ebc52cb6",
 		"is_available": true
 	}],
 	"price": 100,
@@ -60,7 +60,7 @@
 	"items": [{
 		"type": "single",
 		"id": "auxesia",
-		"_id": "5ff79fc6a6e343038b058bec",
+		"_id": "6008c2ff36651a07ebc52c9d",
 		"is_available": true
 	}],
 	"price": 100,
@@ -72,7 +72,7 @@
 	"items": [{
 		"type": "single",
 		"id": "modelista",
-		"_id": "5ff79fc6a6e343038b058c04",
+		"_id": "6008c2ff36651a07ebc52cc3",
 		"is_available": true
 	}],
 	"price": 100,
@@ -84,7 +84,7 @@
 	"items": [{
 		"type": "single",
 		"id": "yozakurafubuki",
-		"_id": "5ff79fc6a6e343038b058be0",
+		"_id": "6008c2ff36651a07ebc52cb7",
 		"is_available": true
 	}],
 	"price": 100,
@@ -96,7 +96,7 @@
 	"items": [{
 		"type": "single",
 		"id": "surrender",
-		"_id": "5ff79fc6a6e343038b058bed",
+		"_id": "6008c2ff36651a07ebc52c9e",
 		"is_available": true
 	}],
 	"price": 100,
@@ -108,7 +108,7 @@
 	"items": [{
 		"type": "single",
 		"id": "metallicpunisher",
-		"_id": "5ff79fc6a6e343038b058c05",
+		"_id": "6008c2ff36651a07ebc52cc4",
 		"is_available": true
 	}],
 	"price": 100,
@@ -118,7 +118,7 @@
 	"items": [{
 		"type": "single",
 		"id": "carminescythe",
-		"_id": "5ff79fc6a6e343038b058be1",
+		"_id": "6008c2ff36651a07ebc52cb8",
 		"is_available": true
 	}],
 	"price": 100,
@@ -128,7 +128,7 @@
 	"items": [{
 		"type": "single",
 		"id": "bethere",
-		"_id": "5ff79fc6a6e343038b058bee",
+		"_id": "6008c2ff36651a07ebc52c9f",
 		"is_available": true
 	}],
 	"price": 100,
@@ -140,7 +140,7 @@
 	"items": [{
 		"type": "single",
 		"id": "callmyname",
-		"_id": "5ff79fc6a6e343038b058bfa",
+		"_id": "6008c2ff36651a07ebc52cd1",
 		"is_available": true
 	}],
 	"price": 100,
@@ -152,7 +152,7 @@
 	"items": [{
 		"type": "single",
 		"id": "fallensquare",
-		"_id": "5ff79fc6a6e343038b058bd6",
+		"_id": "6008c2ff36651a07ebc52cac",
 		"is_available": true
 	}],
 	"price": 100,
@@ -164,7 +164,7 @@
 	"items": [{
 		"type": "single",
 		"id": "dropdead",
-		"_id": "5ff79fc6a6e343038b058be2",
+		"_id": "6008c2ff36651a07ebc52cb9",
 		"is_available": true
 	}],
 	"price": 100,
@@ -176,7 +176,7 @@
 	"items": [{
 		"type": "single",
 		"id": "alexandrite",
-		"_id": "5ff79fc6a6e343038b058bef",
+		"_id": "6008c2ff36651a07ebc52ca0",
 		"is_available": true
 	}],
 	"price": 100,
@@ -188,7 +188,7 @@
 	"items": [{
 		"type": "single",
 		"id": "astraltale",
-		"_id": "5ff79fc6a6e343038b058c07",
+		"_id": "6008c2ff36651a07ebc52cc6",
 		"is_available": true
 	}],
 	"price": 100,
@@ -200,7 +200,7 @@
 	"items": [{
 		"type": "single",
 		"id": "phantasia",
-		"_id": "5ff79fc6a6e343038b058bd7",
+		"_id": "6008c2ff36651a07ebc52cad",
 		"is_available": true
 	}],
 	"price": 100,
@@ -210,7 +210,7 @@
 	"items": [{
 		"type": "single",
 		"id": "empireofwinter",
-		"_id": "5ff79fc6a6e343038b058be3",
+		"_id": "6008c2ff36651a07ebc52cba",
 		"is_available": true
 	}],
 	"price": 100,
@@ -220,7 +220,7 @@
 	"items": [{
 		"type": "single",
 		"id": "libertas",
-		"_id": "5ff79fc6a6e343038b058bfc",
+		"_id": "6008c2ff36651a07ebc52cd3",
 		"is_available": true
 	}],
 	"price": 100,
@@ -232,7 +232,7 @@
 	"items": [{
 		"type": "single",
 		"id": "dottodot",
-		"_id": "5ff79fc6a6e343038b058bd8",
+		"_id": "6008c2ff36651a07ebc52cae",
 		"is_available": true
 	}],
 	"price": 100,
@@ -244,7 +244,7 @@
 	"items": [{
 		"type": "single",
 		"id": "dreadnought",
-		"_id": "5ff79fc6a6e343038b058bfd",
+		"_id": "6008c2ff36651a07ebc52cd4",
 		"is_available": true
 	}],
 	"price": 100,
@@ -256,7 +256,7 @@
 	"items": [{
 		"type": "single",
 		"id": "mirzam",
-		"_id": "5ff79fc6a6e343038b058bd9",
+		"_id": "6008c2ff36651a07ebc52caf",
 		"is_available": true
 	}],
 	"price": 100,
@@ -268,7 +268,7 @@
 	"items": [{
 		"type": "single",
 		"id": "heavenlycaress",
-		"_id": "5ff79fc6a6e343038b058be5",
+		"_id": "6008c2ff36651a07ebc52cbc",
 		"is_available": true
 	}],
 	"price": 100,
@@ -278,7 +278,7 @@
 	"items": [{
 		"type": "single",
 		"id": "filament",
-		"_id": "5ff79fc6a6e343038b058bf2",
+		"_id": "6008c2ff36651a07ebc52ca3",
 		"is_available": true
 	}],
 	"price": 100,
@@ -288,7 +288,7 @@
 	"items": [{
 		"type": "single",
 		"id": "avantraze",
-		"_id": "5ff79fc6a6e343038b058bfe",
+		"_id": "6008c2ff36651a07ebc52cd5",
 		"is_available": true
 	}],
 	"price": 100,
@@ -298,7 +298,7 @@
 	"items": [{
 		"type": "single",
 		"id": "battlenoone",
-		"_id": "5ff79fc6a6e343038b058c0a",
+		"_id": "6008c2ff36651a07ebc52cc9",
 		"is_available": true
 	}],
 	"price": 100,
@@ -308,7 +308,7 @@
 	"items": [{
 		"type": "single",
 		"id": "saikyostronger",
-		"_id": "5ff79fc6a6e343038b058bda",
+		"_id": "6008c2ff36651a07ebc52cb0",
 		"is_available": true
 	}],
 	"price": 100,
@@ -318,7 +318,7 @@
 	"items": [{
 		"type": "single",
 		"id": "izana",
-		"_id": "5ff79fc6a6e343038b058be6",
+		"_id": "6008c2ff36651a07ebc52cbd",
 		"is_available": true
 	}],
 	"price": 100,
@@ -328,7 +328,7 @@
 	"items": [{
 		"type": "single",
 		"id": "einherjar",
-		"_id": "5ff79fc6a6e343038b058bf3",
+		"_id": "6008c2ff36651a07ebc52ca4",
 		"is_available": true
 	}],
 	"price": 100,
@@ -338,7 +338,7 @@
 	"items": [{
 		"type": "single",
 		"id": "laqryma",
-		"_id": "5ff79fc6a6e343038b058bff",
+		"_id": "6008c2ff36651a07ebc52cd6",
 		"is_available": true
 	}],
 	"price": 100,
@@ -348,7 +348,7 @@
 	"items": [{
 		"type": "single",
 		"id": "amygdata",
-		"_id": "5ff79fc6a6e343038b058c0b",
+		"_id": "6008c2ff36651a07ebc52cca",
 		"is_available": true
 	}],
 	"price": 100,
@@ -358,7 +358,7 @@
 	"items": [{
 		"type": "single",
 		"id": "altale",
-		"_id": "5ff79fc6a6e343038b058bdb",
+		"_id": "6008c2ff36651a07ebc52cb1",
 		"is_available": true
 	}],
 	"price": 100,
@@ -368,7 +368,7 @@
 	"items": [{
 		"type": "single",
 		"id": "feelssoright",
-		"_id": "5ff79fc6a6e343038b058c00",
+		"_id": "6008c2ff36651a07ebc52cd7",
 		"is_available": true
 	}],
 	"price": 100,
@@ -378,7 +378,7 @@
 	"items": [{
 		"type": "single",
 		"id": "scarletcage",
-		"_id": "5ff79fc6a6e343038b058c0c",
+		"_id": "6008c2ff36651a07ebc52ccb",
 		"is_available": true
 	}],
 	"price": 100,
@@ -388,7 +388,7 @@
 	"items": [{
 		"type": "single",
 		"id": "teriqma",
-		"_id": "5ff79fc6a6e343038b058bdc",
+		"_id": "6008c2ff36651a07ebc52cb2",
 		"is_available": true
 	}],
 	"price": 100,
@@ -398,7 +398,7 @@
 	"items": [{
 		"type": "single",
 		"id": "mahoroba",
-		"_id": "5ff79fc6a6e343038b058be8",
+		"_id": "6008c2ff36651a07ebc52cbf",
 		"is_available": true
 	}],
 	"price": 100,
@@ -408,7 +408,7 @@
 	"items": [{
 		"type": "single",
 		"id": "badtek",
-		"_id": "5ff79fc6a6e343038b058c01",
+		"_id": "6008c2ff36651a07ebc52cd8",
 		"is_available": true
 	}],
 	"price": 100,
@@ -418,7 +418,7 @@
 	"items": [{
 		"type": "single",
 		"id": "maliciousmischance",
-		"_id": "5ff79fc6a6e343038b058c0d",
+		"_id": "6008c2ff36651a07ebc52ccc",
 		"is_available": true
 	}],
 	"price": 100,
@@ -428,7 +428,7 @@
 	"items": [{
 		"type": "single",
 		"id": "buchigireberserker",
-		"_id": "5ff79fc6a6e343038b058bdd",
+		"_id": "6008c2ff36651a07ebc52cb3",
 		"is_available": true
 	}],
 	"price": 100,
@@ -438,7 +438,7 @@
 	"items": [{
 		"type": "single",
 		"id": "galaxyfriends",
-		"_id": "5ff79fc6a6e343038b058be9",
+		"_id": "6008c2ff36651a07ebc52cc0",
 		"is_available": true
 	}],
 	"price": 100,
@@ -448,7 +448,7 @@
 	"items": [{
 		"type": "single",
 		"id": "xeraphinite",
-		"_id": "5ff79fc6a6e343038b058bf6",
+		"_id": "6008c2ff36651a07ebc52ca7",
 		"is_available": true
 	}],
 	"orig_price": 100,
@@ -458,9 +458,19 @@
 	"items": [{
 		"type": "single",
 		"id": "xanatos",
-		"_id": "5ff79fc6a6e343038b058c02",
+		"_id": "6008c2ff36651a07ebc52cd9",
 		"is_available": true
 	}],
 	"price": 100,
 	"orig_price": 100
+}, {
+	"name": "attraqtia",
+	"items": [{
+		"type": "single",
+		"id": "attraqtia",
+		"_id": "6008c2ff36651a07ebc52cce",
+		"is_available": true
+	}],
+	"orig_price": 100,
+	"price": 100
 }]

latest version/main.py

@@ -87,7 +87,6 @@ def login():
     id_pwd = headers['Authorization']
     id_pwd = base64.b64decode(id_pwd[6:]).decode()
     name, password = id_pwd.split(':', 1)
-
     try:
         token, error_code = server.auth.arc_login(name, password)
         if not error_code:
@@ -118,37 +117,23 @@ def register():
 
 # 集成式请求，没想到什么好办法处理，就先这样写着
 @app.route('/latte/13/compose/aggregate', methods=['GET'])
-def aggregate():
+@server.auth.auth_required(request)
+def aggregate(user_id):
     calls = request.args.get('calls')
-    headers = request.headers
-    token = headers['Authorization']
-    token = token[7:]
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id is not None:
     if calls == '[{ "endpoint": "/user/me", "id": 0 }]':  # 极其沙雕的判断，我猜get的参数就两种
         r = server.info.arc_aggregate_small(user_id)
     else:
         r = server.info.arc_aggregate_big(user_id)
     return jsonify(r)
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/user/me/character', methods=['POST'])  # 角色切换
-def character_change():
+@server.auth.auth_required(request)
-    headers = request.headers
+def character_change(user_id):
-    token = headers['Authorization']
-    token = token[7:]
     character_id = request.form['character']
     skill_sealed = request.form['skill_sealed']
-    try:
+
-        user_id = server.auth.token_get_id(token)
+    flag = server.setme.change_char(user_id, character_id, skill_sealed)
-        if user_id is not None:
-            flag = server.setme.change_char(
-                user_id, character_id, skill_sealed)
     if flag:
         return jsonify({
             "success": True,
@@ -159,21 +144,12 @@ def character_change():
         })
     else:
         return error_return(108)
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/<path:path>/toggle_uncap', methods=['POST'])  # 角色觉醒切换
-def character_uncap(path):
+@server.auth.auth_required(request)
+def character_uncap(user_id, path):
     character_id = int(path[22:])
-    headers = request.headers
-    token = headers['Authorization']
-    token = token[7:]
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id is not None:
     r = server.setme.change_char_uncap(user_id, character_id)
     if r is not None:
         return jsonify({
@@ -185,22 +161,14 @@ def character_uncap(path):
         })
     else:
         return error_return(108)
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/friend/me/add', methods=['POST'])  # 加好友
-def add_friend():
+@server.auth.auth_required(request)
-    headers = request.headers
+def add_friend(user_id):
-    token = headers['Authorization']
-    token = token[7:]
     friend_code = request.form['friend_code']
-    try:
-        user_id = server.auth.token_get_id(token)
     friend_id = server.auth.code_get_id(friend_code)
-        if user_id is not None and friend_id is not None:
+    if friend_id is not None:
         r = server.setme.arc_add_friend(user_id, friend_id)
         if r is not None and r != 602 and r != 604:
             return jsonify({
@@ -218,23 +186,14 @@ def add_friend():
             else:
                 return error_return(108)
     else:
-            if friend_id is None:
         return error_return(401)
-            else:
-                return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/friend/me/delete', methods=['POST'])  # 删好友
-def delete_friend():
+@server.auth.auth_required(request)
-    headers = request.headers
+def delete_friend(user_id):
-    token = headers['Authorization']
-    token = token[7:]
     friend_id = int(request.form['friend_id'])
-    try:
+    if friend_id is not None:
-        user_id = server.auth.token_get_id(token)
-        if user_id is not None and friend_id is not None:
         r = server.setme.arc_delete_friend(user_id, friend_id)
         if r is not None:
             return jsonify({
@@ -249,24 +208,14 @@ def delete_friend():
         else:
             return error_return(108)
     else:
-            if friend_id is None:
         return error_return(401)
-            else:
-                return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/score/song/friend', methods=['GET'])  # 好友排名，默认最多50
-def song_score_friend():
+@server.auth.auth_required(request)
+def song_score_friend(user_id):
     song_id = request.args.get('song_id')
     difficulty = request.args.get('difficulty')
-    headers = request.headers
-    token = headers['Authorization']
-    token = token[7:]
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id is not None:
     r = server.arcscore.arc_score_friend(user_id, song_id, difficulty)
     if r is not None:
         return jsonify({
@@ -275,22 +224,13 @@ def song_score_friend():
         })
     else:
         return error_return(108)
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/score/song/me', methods=['GET'])  # 我的排名，默认最多20
-def song_score_me():
+@server.auth.auth_required(request)
+def song_score_me(user_id):
     song_id = request.args.get('song_id')
     difficulty = request.args.get('difficulty')
-    headers = request.headers
-    token = headers['Authorization']
-    token = token[7:]
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id is not None:
     r = server.arcscore.arc_score_me(user_id, song_id, difficulty)
     if r is not None:
         return jsonify({
@@ -299,22 +239,13 @@ def song_score_me():
         })
     else:
         return error_return(108)
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/score/song', methods=['GET'])  # TOP20
-def song_score_top():
+@server.auth.auth_required(request)
+def song_score_top(user_id):
     song_id = request.args.get('song_id')
     difficulty = request.args.get('difficulty')
-    headers = request.headers
-    token = headers['Authorization']
-    token = token[7:]
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id is not None:
     r = server.arcscore.arc_score_top(song_id, difficulty)
     if r is not None:
         return jsonify({
@@ -323,17 +254,11 @@ def song_score_top():
         })
     else:
         return error_return(108)
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/score/song', methods=['POST'])  # 成绩上传
-def song_score_post():
+@server.auth.auth_required(request)
-    headers = request.headers
+def song_score_post(user_id):
-    token = headers['Authorization']
-    token = token[7:]
     song_token = request.form['song_token']
     song_hash = request.form['song_hash']
     song_id = request.form['song_id']
@@ -349,9 +274,6 @@ def song_score_post():
     clear_type = int(request.form['clear_type'])
     submission_hash = request.form['submission_hash']
 
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id is not None:
     # 增加成绩校验
     if not server.arcscore.arc_score_check(user_id, song_id, difficulty, score, shiny_perfect_count, perfect_count, near_count, miss_count, health, modifier, beyond_gauge, clear_type, song_token, song_hash, submission_hash):
         return error_return(107)
@@ -371,10 +293,6 @@ def song_score_post():
             })
     else:
         return error_return(108)
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/score/token', methods=['GET'])  # 成绩上传所需的token，显然我不想验证
@@ -389,14 +307,9 @@ def score_token():
 
 # 世界模式成绩上传所需的token，无验证
 @app.route('/latte/13/score/token/world', methods=['GET'])
-def score_token_world():
+@server.auth.auth_required(request)
-    headers = request.headers
+def score_token_world(user_id):
-    token = headers['Authorization']
-    token = token[7:]
     args = request.args
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id:
     server.arcworld.play_world_song(user_id, args)
     return jsonify({
         "success": True,
@@ -406,20 +319,11 @@ def score_token_world():
             "token": "13145201919810"
         }
     })
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/user/me/save', methods=['GET'])  # 从云端同步
-def cloud_get():
+@server.auth.auth_required(request)
-    headers = request.headers
+def cloud_get(user_id):
-    token = headers['Authorization']
-    token = token[7:]
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id is not None:
     r = server.arcscore.arc_all_get(user_id)
     if r is not None:
         return jsonify({
@@ -428,17 +332,11 @@ def cloud_get():
         })
     else:
         return error_return(108)
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/user/me/save', methods=['POST'])  # 向云端同步
-def cloud_post():
+@server.auth.auth_required(request)
-    headers = request.headers
+def cloud_post(user_id):
-    token = headers['Authorization']
-    token = token[7:]
     scores_data = request.form['scores_data']
     clearlamps_data = request.form['clearlamps_data']
     clearedsongs_data = request.form['clearedsongs_data']
@@ -446,9 +344,7 @@ def cloud_post():
     installid_data = request.form['installid_data']
     devicemodelname_data = request.form['devicemodelname_data']
     story_data = request.form['story_data']
-    try:
+
-        user_id = server.auth.token_get_id(token)
-        if user_id is not None:
     server.arcscore.arc_all_post(user_id, scores_data, clearlamps_data, clearedsongs_data,
                                  unlocklist_data, installid_data, devicemodelname_data, story_data)
     return jsonify({
@@ -457,21 +353,12 @@ def cloud_post():
             "user_id": user_id
         }
     })
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/purchase/me/redeem', methods=['POST'])  # 兑换码
-def redeem():
+@server.auth.auth_required(request)
-    headers = request.headers
+def redeem(user_id):
-    token = headers['Authorization']
-    token = token[7:]
     code = request.form['code']
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id is not None:
     fragment, error_code = server.arcpurchase.claim_user_redeem(
         user_id, code)
     if not error_code:
@@ -487,21 +374,12 @@ def redeem():
             })
     else:
         return error_return(error_code)
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 # 礼物确认
 @app.route('/latte/13/present/me/claim/<present_id>', methods=['POST'])
-def claim_present(present_id):
+@server.auth.auth_required(request)
-    headers = request.headers
+def claim_present(user_id, present_id):
-    token = headers['Authorization']
-    token = token[7:]
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id is not None:
     flag = server.arcpurchase.claim_user_present(user_id, present_id)
     if flag:
         return jsonify({
@@ -509,36 +387,33 @@ def claim_present(present_id):
         })
     else:
         return error_return(108)
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
-# 购买，为了world模式boost一下
+@app.route('/latte/13/purchase/me/item', methods=['POST'])  # 购买，world模式boost
-@app.route('/latte/13/purchase/me/item', methods=['POST'])
+@server.auth.auth_required(request)
-def item():
+def prog_boost(user_id):
-    return jsonify({
+    re = {"success": False}
-        "success": True
+    if 'item_id' in request.form:
-    })
+        if request.form['item_id'] == 'prog_boost_300':
+            ticket, error_code = server.arcpurchase.get_prog_boost(user_id)
+            if error_code:
+                return error_return(error_code)
+
+            re = {
+                "success": True,
+                "value": {'ticket': ticket}
+            }
+    return jsonify(re)
 
 
 @app.route('/latte/13/purchase/me/pack', methods=['POST'])  # 曲包和单曲购买
-def pack():
+@server.auth.auth_required(request)
-    headers = request.headers
+def pack(user_id):
-    token = headers['Authorization']
-    token = token[7:]
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id:
     if 'pack_id' in request.form:
         return jsonify(server.arcpurchase.buy_pack(user_id, request.form['pack_id']))
     if 'single_id' in request.form:
         return jsonify(server.arcpurchase.buy_single(user_id, request.form['single_id']))
-        else:
+
-            return error_return(108)
-    except:
-        return error_return(108)
     return jsonify({
         "success": True
     })
@@ -553,14 +428,8 @@ def single():
 
 
 @app.route('/latte/13/world/map/me', methods=['GET'])  # 获得世界模式信息，所有地图
-def world_all():
+@server.auth.auth_required(request)
-    headers = request.headers
+def world_all(user_id):
-    token = headers['Authorization']
-    token = token[7:]
-    try:
-
-        user_id = server.auth.token_get_id(token)
-        if user_id:
     return jsonify({
         "success": True,
         "value": {
@@ -569,39 +438,21 @@ def world_all():
             "maps": server.arcworld.get_world_all(user_id)
         }
     })
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/world/map/me/', methods=['POST'])  # 进入地图
-def world_in():
+@server.auth.auth_required(request)
-    headers = request.headers
+def world_in(user_id):
-    token = headers['Authorization']
-    token = token[7:]
     map_id = request.form['map_id']
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id:
     return jsonify({
         "success": True,
         "value": server.arcworld.get_user_world(user_id, map_id)
     })
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/world/map/me/<map_id>', methods=['GET'])  # 获得单个地图完整信息
-def world_one(map_id):
+@server.auth.auth_required(request)
-    headers = request.headers
+def world_one(user_id, map_id):
-    token = headers['Authorization']
-    token = token[7:]
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id:
     server.arcworld.change_user_current_map(user_id, map_id)
     return jsonify({
         "success": True,
@@ -611,21 +462,12 @@ def world_one(map_id):
             "maps": [server.arcworld.get_user_world_info(user_id, map_id)]
         }
     })
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/latte/13/serve/download/me/song', methods=['GET'])  # 歌曲下载
-def download_song():
+@server.auth.auth_required(request)
-    headers = request.headers
+def download_song(user_id):
-    token = headers['Authorization']
-    token = token[7:]
     song_ids = request.args.getlist('sid')
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id:
     if server.arcdownload.is_able_download(user_id):
         re = {}
         if not song_ids:
@@ -639,16 +481,12 @@ def download_song():
         })
     else:
         return error_return(903)
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 @app.route('/download/<path:file_path>', methods=['GET'])  # 下载
 def download(file_path):
-    t = request.args.get('t')
     try:
+        t = request.args.get('t')
         message = server.arcdownload.is_token_able_download(t)
         if message == 0:
             path = os.path.join('./database/songs', file_path)
@@ -663,24 +501,14 @@ def download(file_path):
 
 
 @app.route('/latte/<path:path>', methods=['POST'])  # 三个设置，写在最后降低优先级
-def sys_set(path):
+@server.auth.auth_required(request)
+def sys_set(user_id, path):
     set_arg = path[10:]
-    headers = request.headers
-    token = headers['Authorization']
-    token = token[7:]
     value = request.form['value']
-
-    try:
-        user_id = server.auth.token_get_id(token)
-        if user_id is not None:
     server.setme.arc_sys_set(user_id, value, set_arg)
     r = server.info.arc_aggregate_small(user_id)
     r['value'] = r['value'][0]['value']
     return jsonify(r)
-        else:
-            return error_return(108)
-    except:
-        return error_return(108)
 
 
 def main():

latest version/server/arcdownload.py

@@ -2,6 +2,7 @@ import os
 import hashlib
 from flask import url_for
 import sqlite3
+from server.sql import Connect
 import time
 
 time_limit = 3000  # 每个玩家24小时下载次数限制
@@ -13,13 +14,13 @@ def get_file_md5(file_path):
     if not os.path.isfile(file_path):
         return None
     myhash = hashlib.md5()
-    f = open(file_path, 'rb')
+    with open(file_path, 'rb') as f:
         while True:
             b = f.read(8096)
             if not b:
                 break
             myhash.update(b)
-    f.close()
+
     return myhash.hexdigest()
 
 
@@ -71,35 +72,28 @@ def get_all_songs(user_id, file_dir='./database/songs'):
     # 获取所有歌的下载链接，返回字典
     dir_list = os.listdir(file_dir)
     re = {}
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    with Connect() as c:
-    c = conn.cursor()
         for i in dir_list:
             if os.path.isdir(os.path.join(file_dir, i)):
                 re.update(get_one_song(c, user_id, i, file_dir))
 
-    conn.commit()
-    conn.close()
     return re
 
 
 def get_some_songs(user_id, song_ids):
     # 获取一些歌的下载链接，返回字典
     re = {}
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    with Connect() as c:
-    c = conn.cursor()
         for song_id in song_ids:
             re.update(get_one_song(c, user_id, song_id))
 
-    conn.commit()
-    conn.close()
     return re
 
 
 def is_token_able_download(t):
     # token是否可以下载，返回错误码，0即可以
-    errorcode = 0
+    errorcode = 108
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    with Connect() as c:
-    c = conn.cursor()
         c.execute('''select * from download_token where token = :t limit 1''',
                   {'t': t})
         x = c.fetchone()
@@ -111,21 +105,19 @@ def is_token_able_download(t):
             if y and y[0] <= time_limit:
                 c.execute('''insert into user_download values(:a,:b,:c)''', {
                     'a': x[0], 'b': x[3], 'c': now})
+                errorcode = 0
             else:
                 errorcode = 903
         else:
             errorcode = 108
 
-    conn.commit()
-    conn.close()
     return errorcode
 
 
 def is_able_download(user_id):
     # 是否可以下载，返回布尔值
-    f = True
+    f = False
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    with Connect() as c:
-    c = conn.cursor()
         now = int(time.time())
         c.execute(
             '''delete from user_download where user_id = :a and time <= :b''', {'a': user_id, 'b': now - 24*3600})
@@ -133,12 +125,10 @@ def is_able_download(user_id):
             '''select count(*) from user_download where user_id = :a''', {'a': user_id})
         y = c.fetchone()
         if y and y[0] <= time_limit:
-        pass
+            f = True
         else:
             f = False
 
-    conn.commit()
-    conn.close()
     return f
 
 

latest version/server/arcpurchase.py

@@ -1,4 +1,4 @@
-import sqlite3
+from server.sql import Connect
 import time
 import json
 
@@ -41,26 +41,17 @@ def get_item(c, type='pack'):
 
 def get_single_purchase():
     # main里面没开数据库，这里写一下代替
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    re = []
-    c = conn.cursor()
+    with Connect() as c:
         re = get_item(c, type='single')
-    conn.commit()
+
-    conn.close()
     return re
 
 
-def buy_pack(user_id, pack_id):
+def buy_item(c, user_id, price):
-    # 曲包购买，返回字典
+    # 购买接口，返回成功与否标识符和剩余源点数
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    c.execute('''select ticket from user where user_id = :a''',
-    c = conn.cursor()
+              {'a': user_id})
-    c.execute('''select price from item where item_id = :a''', {'a': pack_id})
-    price = c.fetchone()
-    if price:
-        price = price[0]
-    else:
-        price = 0
-
-    c.execute('''select ticket from user where user_id = :a''', {'a': user_id})
     ticket = c.fetchone()
     if ticket:
         ticket = ticket[0]
@@ -68,28 +59,41 @@ def buy_pack(user_id, pack_id):
         ticket = 0
 
     if ticket < price:
-        conn.commit()
+        return False, ticket
-        conn.close()
-        return {
-            "success": False
-        }
 
     c.execute('''update user set ticket = :b where user_id = :a''',
               {'a': user_id, 'b': ticket-price})
+
+    return True, ticket - price
+
+
+def buy_pack(user_id, pack_id):
+    # 曲包购买，返回字典
+    re = {"success": False}
+    with Connect() as c:
+        c.execute('''select price from item where item_id = :a''',
+                  {'a': pack_id})
+        price = c.fetchone()
+        if price:
+            price = price[0]
+        else:
+            price = 0
+
+        flag, ticket = buy_item(c, user_id, price)
+
+        if flag:
             c.execute('''insert into user_item values(:a,:b,'pack')''',
                       {'a': user_id, 'b': pack_id})
 
-    conn.commit()
+            re = {"success": True}
-    conn.close()
+
-    return {
+    return re
-        "success": True
-    }
 
 
 def buy_single(user_id, single_id):
     # 单曲购买，返回字典
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    re = {"success": False}
-    c = conn.cursor()
+    with Connect() as c:
         c.execute('''select price from item where item_id = :a''',
                   {'a': single_id})
         price = c.fetchone()
@@ -98,30 +102,30 @@ def buy_single(user_id, single_id):
         else:
             price = 0
 
-    c.execute('''select ticket from user where user_id = :a''', {'a': user_id})
+        flag, ticket = buy_item(c, user_id, price)
-    ticket = c.fetchone()
-    if ticket:
-        ticket = ticket[0]
-    else:
-        ticket = 0
 
-    if ticket < price:
+        if flag:
-        conn.commit()
-        conn.close()
-        return {
-            "success": False
-        }
-
-    c.execute('''update user set ticket = :b where user_id = :a''',
-              {'a': user_id, 'b': ticket-price})
             c.execute('''insert into user_item values(:a,:b,'single')''',
                       {'a': user_id, 'b': single_id})
+            re = {"success": True}
 
-    conn.commit()
+    return re
-    conn.close()
+
-    return {
+
-        "success": True
+def get_prog_boost(user_id):
-    }
+    # 世界模式源韵强化，扣50源点，返回剩余源点数
+
+    ticket = -1
+    with Connect() as c:
+        flag, ticket = buy_item(c, user_id, 50)
+
+        if flag:
+            c.execute('''update user set prog_boost = 1 where user_id = :a''', {
+                      'a': user_id})
+    if ticket >= 0:
+        return ticket, None
+    else:
+        return 0, 108
 
 
 def get_user_present(c, user_id):
@@ -146,13 +150,10 @@ def get_user_present(c, user_id):
 def claim_user_present(user_id, present_id):
     # 确认并删除用户奖励，返回成功与否的布尔值
     flag = False
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    with Connect() as c:
-    c = conn.cursor()
-
         c.execute('''select exists(select * from user_present where user_id=:a and present_id=:b)''',
                   {'a': user_id, 'b': present_id})
         if c.fetchone() == (1,):
-        flag = True
             c.execute('''delete from user_present where user_id=:a and present_id=:b''',
                       {'a': user_id, 'b': present_id})
             c.execute('''select * from present where present_id=:b''',
@@ -170,41 +171,33 @@ def claim_user_present(user_id, present_id):
                         ticket += int(i['amount'])
                         c.execute('''update user set ticket=:b where user_id=:a''', {
                             'a': user_id, 'b': ticket})
-
+                flag = True
             else:
                 # 过期
                 flag = False
 
-    conn.commit()
-    conn.close()
     return flag
 
 
 def claim_user_redeem(user_id, code):
     # 处理兑换码，返回碎片数量和错误码
     fragment = 0
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    error_code = 108
-    c = conn.cursor()
+    with Connect() as c:
         c.execute('''select * from redeem where code=:a''', {'a': code})
         x = c.fetchone()
         if not x:
-        conn.commit()
-        conn.close()
             return 0, 504
 
         if x[2] == 0:  # 一次性
             c.execute(
                 '''select exists(select * from user_redeem where code=:a)''', {'a': code})
             if c.fetchone() == (1,):
-            conn.commit()
-            conn.close()
                 return 0, 505
         elif x[2] == 1:  # 每个玩家一次
             c.execute('''select exists(select * from user_redeem where code=:a and user_id=:b)''',
                       {'a': code, 'b': user_id})
             if c.fetchone() == (1,):
-            conn.commit()
-            conn.close()
                 return 0, 506
 
         c.execute('''insert into user_redeem values(:b,:a)''',
@@ -221,7 +214,6 @@ def claim_user_redeem(user_id, code):
                 ticket += int(i['amount'])
                 c.execute('''update user set ticket=:b where user_id=:a''', {
                     'a': user_id, 'b': ticket})
+        error_code = None
 
-    conn.commit()
+    return fragment, error_code
-    conn.close()
-    return fragment, None

latest version/server/arcscore.py

@@ -1,4 +1,4 @@
-import sqlite3
+from server.sql import Connect
 import time
 import json
 import server.arcworld
@@ -80,12 +80,11 @@ def get_score(c, user_id, song_id, difficulty):
 
 def arc_score_friend(user_id, song_id, difficulty, limit=50):
     # 得到用户好友分数表，默认最大50个
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    r = []
-    c = conn.cursor()
+    with Connect() as c:
         c.execute('''select user_id from best_score where user_id in (select :user_id union select user_id_other from friend where user_id_me = :user_id) and song_id = :song_id and difficulty = :difficulty order by score DESC, time_played DESC limit :limit''', {
             'user_id': user_id, 'song_id': song_id, 'difficulty': difficulty, 'limit': limit})
         x = c.fetchall()
-    r = []
         if x != []:
             rank = 0
             for i in x:
@@ -94,15 +93,13 @@ def arc_score_friend(user_id, song_id, difficulty, limit=50):
                 y['rank'] = rank
                 r.append(y)
 
-    conn.commit()
-    conn.close()
     return r
 
 
 def arc_score_top(song_id, difficulty, limit=20):
     # 得到top分数表，默认最多20个，如果是负数则全部查询
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    r = []
-    c = conn.cursor()
+    with Connect() as c:
         if limit >= 0:
             c.execute('''select user_id from best_score where song_id = :song_id and difficulty = :difficulty order by score DESC, time_played DESC limit :limit''', {
                 'song_id': song_id, 'difficulty': difficulty, 'limit': limit})
@@ -110,7 +107,6 @@ def arc_score_top(song_id, difficulty, limit=20):
             c.execute('''select user_id from best_score where song_id = :song_id and difficulty = :difficulty order by score DESC, time_played DESC''', {
                 'song_id': song_id, 'difficulty': difficulty})
         x = c.fetchall()
-    r = []
         if x != []:
             rank = 0
             for i in x:
@@ -119,16 +115,13 @@ def arc_score_top(song_id, difficulty, limit=20):
                 y['rank'] = rank
                 r.append(y)
 
-    conn.commit()
-    conn.close()
     return r
 
 
 def arc_score_me(user_id, song_id, difficulty, limit=20):
     # 得到用户的排名，默认最大20个
-    conn = sqlite3.connect('./database/arcaea_database.db')
-    c = conn.cursor()
     r = []
+    with Connect() as c:
         c.execute('''select exists(select * from best_score where user_id = :user_id and song_id = :song_id and difficulty = :difficulty)''', {
             'user_id': user_id, 'song_id': song_id, 'difficulty': difficulty})
         if c.fetchone() == (1,):
@@ -178,15 +171,13 @@ def arc_score_me(user_id, song_id, difficulty, limit=20):
                         y['rank'] = rank
                         r.append(y)
 
-    conn.commit()
-    conn.close()
     return r
 
 
 def get_one_ptt(song_id, difficulty, score: int) -> float:
     # 单曲ptt计算，ptt为负说明没铺面定数数据
-    conn = sqlite3.connect('./database/arcsong.db')
+    ptt = -10
-    c = conn.cursor()
+    with Connect('./database/arcsong.db') as c:
         if difficulty == 0:
             c.execute('''select rating_pst from songs where sid = :sid;''', {
                 'sid': song_id})
@@ -216,8 +207,6 @@ def get_one_ptt(song_id, difficulty, score: int) -> float:
         else:
             ptt = defnum + 1 + (score-9800000) / 200000
 
-    conn.commit()
-    conn.close()
     return ptt
 
 
@@ -375,9 +364,9 @@ def update_recent30(c, user_id, song_id, rating, is_protected):
 
 def arc_score_post(user_id, song_id, difficulty, score, shiny_perfect_count, perfect_count, near_count, miss_count, health, modifier, beyond_gauge, clear_type):
     # 分数上传，返回变化后的ptt，和世界模式变化
-
+    ptt = 0
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    re = None
-    c = conn.cursor()
+    with Connect() as c:
         rating = get_one_ptt(song_id, difficulty, score)
         if rating < 0:  # 没数据不会向recent30里记入
             unrank_flag = True
@@ -408,9 +397,11 @@ def arc_score_post(user_id, song_id, difficulty, score, shiny_perfect_count, per
         if not unrank_flag:
             # recent30 更新
             if health == -1 or int(score) >= 9800000 or first_protect_flag:
-            update_recent30(c, user_id, song_id+str(difficulty), rating, True)
+                update_recent30(c, user_id, song_id +
+                                str(difficulty), rating, True)
             else:
-            update_recent30(c, user_id, song_id+str(difficulty), rating, False)
+                update_recent30(c, user_id, song_id +
+                                str(difficulty), rating, False)
         # 总PTT更新
         ptt = get_user_ptt(c, user_id)
         c.execute('''update user set rating_ptt = :a where user_id = :b''', {
@@ -427,6 +418,9 @@ def arc_score_post(user_id, song_id, difficulty, score, shiny_perfect_count, per
             step_times = stamina_multiply * fragment_multiply / \
                 100 * (prog_boost_multiply+100)/100
             exp_times = stamina_multiply * (prog_boost_multiply+100)/100
+            if prog_boost_multiply != 0:
+                c.execute('''update user set prog_boost = 0 where user_id = :a''', {
+                    'a': user_id})
             c.execute('''delete from world_songplay where user_id=:a and song_id=:b and difficulty=:c''', {
                 'a': user_id, 'b': song_id, 'c': difficulty})
             c.execute('''select character_id,frag,prog,overdrive from user_char where user_id = :a and character_id = (select character_id from user where user_id=:a)''', {
@@ -539,8 +533,6 @@ def arc_score_post(user_id, song_id, difficulty, score, shiny_perfect_count, per
                 curr_position = 0
             c.execute('''update user_world set curr_position=:a, curr_capture=:b where user_id=:c and map_id=:d''', {
                 'a': curr_position, 'b': curr_capture, 'c': user_id, 'd': map_id})
-    conn.commit()
-    conn.close()
     return ptt, re
 
 
@@ -569,24 +561,16 @@ def arc_score_check(user_id, song_id, difficulty, score, shiny_perfect_count, pe
 
 def arc_all_post(user_id, scores_data, clearlamps_data, clearedsongs_data, unlocklist_data, installid_data, devicemodelname_data, story_data):
     # 向云端同步，无返回
-
+    with Connect() as c:
-    conn = sqlite3.connect('./database/arcaea_database.db')
-    c = conn.cursor()
         now = int(time.time() * 1000)
         c.execute('''delete from user_save where user_id=:a''', {'a': user_id})
         c.execute('''insert into user_save values(:a,:b,:c,:d,:e,:f,:g,:h,:i)''', {
             'a': user_id, 'b': scores_data, 'c': clearlamps_data, 'd': clearedsongs_data, 'e': unlocklist_data, 'f': installid_data, 'g': devicemodelname_data, 'h': story_data, 'i': now})
-    conn.commit()
-    conn.close()
     return None
 
 
 def arc_all_get(user_id):
     # 从云端同步，返回字典
-    conn = sqlite3.connect('./database/arcaea_database.db')
-    c = conn.cursor()
-    c.execute('''select * from user_save where user_id=:a''', {'a': user_id})
-    x = c.fetchone()
 
     scores_data = []
     clearlamps_data = []
@@ -595,6 +579,12 @@ def arc_all_get(user_id):
     installid_data = ''
     devicemodelname_data = ''
     # story_data = []
+    createdAt = 0
+
+    with Connect() as c:
+        c.execute('''select * from user_save where user_id=:a''',
+                  {'a': user_id})
+        x = c.fetchone()
 
         if x:
             scores_data = json.loads(x[1])[""]
@@ -606,46 +596,7 @@ def arc_all_get(user_id):
         #    story_data = json.loads(x[7])[""]
             if x[8]:
                 createdAt = int(x[8])
-        else:
-            createdAt = 0
 
-    # c.execute('''select * from best_score where user_id = :a''',
-    #           {'a': user_id})
-    # x = c.fetchall()
-    # song_1 = []
-    # song_2 = []
-    # song_3 = []
-    # if x != []:
-    #     for i in x:
-    #         if i[11] != 0:
-    #             song_1.append({
-    #                 "grade": get_song_grade(i[3]),
-    #                 "difficulty": i[2],
-    #                 "song_id": i[1]
-    #             })
-    #             song_2.append({
-    #                 "ct": 0,
-    #                 "clear_type": i[11],
-    #                 "difficulty": i[2],
-    #                 "song_id": i[1]
-    #             })
-    #         song_3.append({
-    #             "ct": 0,
-    #             "time_played": i[10],
-    #             "modifier": i[9],
-    #             "health": i[8],
-    #             "miss_count": i[7],
-    #             "near_count": i[6],
-    #             "perfect_count": i[5],
-    #             "shiny_perfect_count": i[4],
-    #             "score": i[3],
-    #             "difficulty": i[2],
-    #             "version": 1,
-    #             "song_id": i[1]
-    #         })
-
-    conn.commit()
-    conn.close()
     return {
         "user_id": user_id,
         "story": {
@@ -1021,9 +972,6 @@ def arc_all_get(user_id):
             }, {
                 "unlock_key": "rugie|2|0",
                 "complete": 1
-            }, {
-                "unlock_key": "rugie|1|0",
-                "complete": 1
             }, {
                 "unlock_key": "rise|2|0",
                 "complete": 1
@@ -1123,6 +1071,9 @@ def arc_all_get(user_id):
             }, {
                 "unlock_key": "lucifer|1|0",
                 "complete": 1
+            }, {
+                "unlock_key": "lostdesire|2|0",
+                "complete": 1
             }, {
                 "unlock_key": "tiemedowngently|2|0",
                 "complete": 1
@@ -1141,9 +1092,6 @@ def arc_all_get(user_id):
             }, {
                 "unlock_key": "infinityheaven|1|0",
                 "complete": 1
-            }, {
-                "unlock_key": "lostdesire|2|0",
-                "complete": 1
             }, {
                 "unlock_key": "ignotus|2|0",
                 "complete": 1
@@ -1270,6 +1218,15 @@ def arc_all_get(user_id):
             }, {
                 "unlock_key": "flyburg|2|0",
                 "complete": 1
+            }, {
+                "unlock_key": "oracle|2|0",
+                "complete": 1
+            }, {
+                "unlock_key": "clotho|2|0",
+                "complete": 1
+            }, {
+                "unlock_key": "gou|2|0",
+                "complete": 1
             }, {
                 "unlock_key": "felis|2|0",
                 "complete": 1
@@ -1384,12 +1341,6 @@ def arc_all_get(user_id):
             }, {
                 "unlock_key": "cyberneciacatharsis|2|0",
                 "complete": 1
-            }, {
-                "unlock_key": "oracle|2|0",
-                "complete": 1
-            }, {
-                "unlock_key": "clotho|2|0",
-                "complete": 1
             }, {
                 "unlock_key": "ignotus|1|0",
                 "complete": 1
@@ -1510,6 +1461,12 @@ def arc_all_get(user_id):
             }, {
                 "unlock_key": "lethaeus|2|0",
                 "complete": 1
+            }, {
+                "unlock_key": "rugie|1|0",
+                "complete": 1
+            }, {
+                "unlock_key": "gou|1|0",
+                "complete": 1
             }, {
                 "unlock_key": "sheriruth|1|0",
                 "complete": 1

latest version/server/arcworld.py

@@ -1,5 +1,5 @@
 import json
-import sqlite3
+from server.sql import Connect
 import os
 
 
@@ -23,17 +23,17 @@ def get_world_name(file_dir='./database/map'):
 
 def get_world_info(map_id):
     # 读取json文件内容，返回字典
-    f = open('./database/map/'+map_id+'.json', 'r')
+    world_info = {}
+    with open('./database/map/'+map_id+'.json', 'r') as f:
         world_info = json.load(f)
-    f.close()
+
     return world_info
 
 
 def get_user_world_info(user_id, map_id):
     # 读取json文件内容，加上用户信息，返回字典
     info = get_world_info(map_id)
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    with Connect() as c:
-    c = conn.cursor()
         c.execute('''select * from user_world where map_id = :a and user_id = :b''',
                   {'a': map_id, 'b': user_id})
         x = c.fetchone()
@@ -44,33 +44,28 @@ def get_user_world_info(user_id, map_id):
         else:
             c.execute('''insert into user_world values(:a,:b,0,0,0)''', {
                 'a': user_id, 'b': map_id})
-    conn.commit()
+
-    conn.close()
     return info
 
 
 def get_current_map(user_id):
     # 得到user的当前图，返回字符串
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    re = ''
-    c = conn.cursor()
+    with Connect() as c:
         c.execute('''select current_map from user where user_id = :a''',
                   {'a': user_id})
         x = c.fetchone()
-    re = ''
         if x:
             re = x[0]
 
-    conn.commit()
-    conn.close()
     return re
 
 
 def get_world_all(user_id):
     # 读取所有地图信息并处理，返回字典列表
-    conn = sqlite3.connect('./database/arcaea_database.db')
-    c = conn.cursor()
-    worlds = get_world_name()
     re = []
+    with Connect() as c:
+        worlds = get_world_name()
         for map_id in worlds:
             info = get_world_info(map_id)
             steps = info['steps']
@@ -94,15 +89,13 @@ def get_world_all(user_id):
 
             re.append(info)
 
-    conn.commit()
-    conn.close()
     return re
 
 
 def get_user_world(user_id, map_id):
     # 获取用户图信息，返回字典
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    re = {}
-    c = conn.cursor()
+    with Connect() as c:
         c.execute('''select * from user_world where map_id = :a and user_id = :b''',
                   {'a': map_id, 'b': user_id})
         x = c.fetchone()
@@ -121,27 +114,20 @@ def get_user_world(user_id, map_id):
             c.execute('''insert into user_world values(:a,:b,0,0,0)''', {
                 'a': user_id, 'b': map_id})
 
-    conn.commit()
-    conn.close()
     return re
 
 
 def change_user_current_map(user_id, map_id):
     # 改变用户当前图
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    with Connect() as c:
-    c = conn.cursor()
         c.execute('''update user set current_map = :a where user_id=:b''', {
             'a': map_id, 'b': user_id})
-    conn.commit()
-    conn.close()
     return None
 
 
 def play_world_song(user_id, args):
     # 声明是世界模式的打歌，并且记录加成信息
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    with Connect() as c:
-    c = conn.cursor()
-
         stamina_multiply = 1
         fragment_multiply = 100
         prog_boost_multiply = 0
@@ -150,15 +136,17 @@ def play_world_song(user_id, args):
         if 'fragment_multiply' in args:
             fragment_multiply = int(args['fragment_multiply'])
         if 'prog_boost_multiply' in args:
-        prog_boost_multiply = int(args['prog_boost_multiply'])
+            c.execute('''select prog_boost from user where user_id=:a''', {
+                      'a': user_id})
+            x = c.fetchone()
+            if x and x[0] == 1:
+                prog_boost_multiply = 300
 
         c.execute('''delete from world_songplay where user_id=:a and song_id=:b and difficulty=:c''', {
             'a': user_id, 'b': args['song_id'], 'c': args['difficulty']})
         c.execute('''insert into world_songplay values(:a,:b,:c,:d,:e,:f)''', {
             'a': user_id, 'b': args['song_id'], 'c': args['difficulty'], 'd': stamina_multiply, 'e': fragment_multiply, 'f': prog_boost_multiply})
 
-    conn.commit()
-    conn.close()
     return None
 
 

latest version/server/auth.py

@@ -1,7 +1,8 @@
-import sqlite3
 import hashlib
 import time
 import server.arcworld
+from server.sql import Connect
+import functools
 
 
 def arc_login(name: str, password: str) -> str:  # 登录判断
@@ -9,10 +10,9 @@ def arc_login(name: str, password: str) -> str:  # 登录判断
     # token采用user_id和时间戳连接后hash生成（真的是瞎想的，没用bear）
     # 密码和token的加密方式为 SHA-256
 
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    error_code = 108
-    c = conn.cursor()
-    error_code = None
     token = None
+    with Connect() as c:
         hash_pwd = hashlib.sha256(password.encode("utf8")).hexdigest()
         c.execute('''select user_id, password from user where name = :name''', {
             'name': name})
@@ -35,6 +35,7 @@ def arc_login(name: str, password: str) -> str:  # 登录判断
 
                 c.execute('''insert into login(access_token, user_id) values(:access_token, :user_id)''', {
                     'user_id': user_id, 'access_token': token})
+                error_code = None
             else:
                 # 密码错误
                 error_code = 104
@@ -42,8 +43,6 @@ def arc_login(name: str, password: str) -> str:  # 登录判断
             # 用户名错误
             error_code = 104
 
-    conn.commit()
-    conn.close()
     return token, error_code
 
 
@@ -81,8 +80,10 @@ def arc_register(name: str, password: str):  # 注册
                 c.execute('''insert into user_char values(:a,:b,:c,:d,:e,:f,:g,:h,:i,:j,:k,:l,:m,:n,:o)''', {
                           'a': user_id, 'b': i[0], 'c': i[2], 'd': i[3], 'e': i[4], 'f': i[5], 'g': i[6], 'h': i[7], 'i': i[8], 'j': i[9], 'k': i[10], 'l': i[11], 'm': i[12], 'n': i[14], 'o': i[15]})
 
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    user_id = None
-    c = conn.cursor()
+    token = None
+    error_code = 108
+    with Connect() as c:
         hash_pwd = hashlib.sha256(password.encode("utf8")).hexdigest()
         c.execute(
             '''select exists(select * from user where name = :name)''', {'name': name})
@@ -103,46 +104,59 @@ def arc_register(name: str, password: str):  # 注册
                 'user_id': user_id, 'access_token': token})
 
             insert_user_char(c, user_id)
-        conn.commit()
+            error_code = 0
-        conn.close()
-        return user_id, token, 0
         else:
-        conn.commit()
+            error_code = 101
-        conn.close()
+
-        return None, None, 101
+    return user_id, token, error_code
 
 
 def token_get_id(token: str):
     # 用token获取id，没有考虑不同用户token相同情况，说不定会有bug
 
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    user_id = None
-    c = conn.cursor()
+    with Connect() as c:
         c.execute('''select user_id from login where access_token = :token''', {
             'token': token})
         x = c.fetchone()
         if x is not None:
-        conn.commit()
+            user_id = x[0]
-        conn.close()
+
-        return x[0]
+    return user_id
-    else:
-        conn.commit()
-        conn.close()
-        return None
 
 
 def code_get_id(user_code):
     # 用user_code获取id
 
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    user_id = None
-    c = conn.cursor()
+
+    with Connect() as c:
         c.execute('''select user_id from user where user_code = :a''',
                   {'a': user_code})
         x = c.fetchone()
         if x is not None:
-        conn.commit()
+            user_id = x[0]
-        conn.close()
+
-        return x[0]
+    return user_id
+
+
+def auth_required(request):
+    # arcaea登录验证，写成了修饰器
+    def decorator(view):
+        @functools.wraps(view)
+        def wrapped_view(*args, **kwargs):
+
+            user_id = None
+            with Connect() as c:
+                headers = request.headers
+                token = headers['Authorization']
+                token = token[7:]
+                user_id = token_get_id(token)
+
+            if user_id is not None:
+                return view(user_id, *args, **kwargs)
             else:
-        conn.commit()
+                return '''{"success":false,"error_code":108}'''
-        conn.close()
+
-        return None
+        return wrapped_view
+    return decorator

latest version/server/info.py

@@ -1,4 +1,4 @@
-import sqlite3
+from server.sql import Connect
 import server.arcworld
 import server.arcpurchase
 import time
@@ -170,6 +170,9 @@ def get_value_0(c, user_id):
         characters = []
         for i in user_character:
             characters.append(i['character_id'])
+        prog_boost = 0
+        if x[27] and x[27] != 0:
+            prog_boost = 300
 
         r = {"is_aprilfools": False,
              "curr_available_maps": [],
@@ -189,12 +192,12 @@ def get_value_0(c, user_id):
              "is_locked_name_duplicate": False,
              "is_skill_sealed": int2b(x[7]),
              "current_map": x[25],
-             "prog_boost": 0,
+             "prog_boost": prog_boost,
              "next_fragstam_ts": -1,
              "max_stamina_ts": 1586274871917,
              "stamina": 12,
              "world_unlocks": ["scenery_chap1", "scenery_chap2", "scenery_chap3", "scenery_chap4", "scenery_chap5"],
-             "world_songs": ["babaroque", "shadesoflight", "kanagawa", "lucifer", "anokumene", "ignotus", "rabbitintheblackroom", "qualia", "redandblue", "bookmaker", "darakunosono", "espebranch", "blacklotus", "givemeanightmare", "vividtheory", "onefr", "gekka", "vexaria3", "infinityheaven3", "fairytale3", "goodtek3", "suomi", "rugie", "faintlight", "harutopia", "goodtek", "dreaminattraction", "syro", "diode", "freefall", "grimheart", "blaster", "cyberneciacatharsis", "monochromeprincess", "revixy", "vector", "supernova", "nhelv", "purgatorium3", "dement3", "crossover", "guardina", "axiumcrisis", "worldvanquisher", "sheriruth", "pragmatism", "gloryroad", "etherstrike", "corpssansorganes", "lostdesire", "blrink", "essenceoftwilight", "lapis", "solitarydream", "lumia3", "purpleverse", "moonheart3"],
+             "world_songs": ["babaroque", "shadesoflight", "kanagawa", "lucifer", "anokumene", "ignotus", "rabbitintheblackroom", "qualia", "redandblue", "bookmaker", "darakunosono", "espebranch", "blacklotus", "givemeanightmare", "vividtheory", "onefr", "gekka", "vexaria3", "infinityheaven3", "fairytale3", "goodtek3", "suomi", "rugie", "faintlight", "harutopia", "goodtek", "dreaminattraction", "syro", "diode", "freefall", "grimheart", "blaster", "cyberneciacatharsis", "monochromeprincess", "revixy", "vector", "supernova", "nhelv", "purgatorium3", "dement3", "crossover", "guardina", "axiumcrisis", "worldvanquisher", "sheriruth", "pragmatism", "gloryroad", "etherstrike", "corpssansorganes", "lostdesire", "blrink", "essenceoftwilight", "lapis", "solitarydream", "lumia3", "purpleverse", "moonheart3", "glow"],
              "singles": get_user_singles(c, user_id),  # ["dataerror", "yourvoiceso", "crosssoul", "impurebird", "auxesia", "modelista", "yozakurafubuki", "surrender", "metallicpunisher", "carminescythe", "bethere", "callmyname", "fallensquare", "dropdead", "alexandrite", "astraltale", "phantasia", "empireofwinter", "libertas", "dottodot", "dreadnought", "mirzam", "heavenlycaress", "filament", "avantraze", "battlenoone", "saikyostronger", "izana", "einherjar", "laqryma", "amygdata", "altale", "feelssoright", "scarletcage", "teriqma", "mahoroba", "badtek", "maliciousmischance", "buchigireberserker", "galaxyfriends", "xeraphinite", "xanatos"]
              "packs": get_user_packs(c, user_id),
              # ["vs", "extend", "dynamix", "prelude", "core", "yugamu", "omatsuri", "zettai", "mirai", "shiawase", "chunithm", "nijuusei", "groovecoaster", "rei", "tonesphere", "lanota"]
@@ -211,24 +214,21 @@ def get_value_0(c, user_id):
 
 def arc_aggregate_small(user_id):
     # 返回用户数据
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    r = {"success": False}
-    c = conn.cursor()
+    with Connect() as c:
         r = {"success": True,
              "value": [{
                  "id": 0,
                  "value": get_value_0(c, user_id)
              }]}
 
-    conn.commit()
-    conn.close()
     return r
 
 
 def arc_aggregate_big(user_id):
     # 返回用户数据和地图歌曲信息
-
+    r = {"success": False}
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    with Connect() as c:
-    c = conn.cursor()
         r = {"success": True,
              "value": [{
                  "id": 0,
@@ -353,6 +353,4 @@ def arc_aggregate_big(user_id):
              }
              ]}
 
-    conn.commit()
-    conn.close()
     return r

latest version/server/setme.py

@@ -1,4 +1,4 @@
-import sqlite3
+from server.sql import Connect
 import server.info
 
 
@@ -20,8 +20,9 @@ def int2b(x):
 
 def change_char(user_id, character_id, skill_sealed):
     # 角色改变，包括技能封印的改变，返回成功与否的布尔值
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    re = False
-    c = conn.cursor()
+
+    with Connect() as c:
         c.execute('''select is_uncapped, is_uncapped_override from user_char where user_id = :a and character_id = :b''',
                   {'a': user_id, 'b': character_id})
         x = c.fetchone()
@@ -33,23 +34,19 @@ def change_char(user_id, character_id, skill_sealed):
             c.execute('''update user set is_skill_sealed = :a, character_id = :b, is_char_uncapped = :c, is_char_uncapped_override = :d where user_id = :e''', {
                 'a': b2int(skill_sealed), 'b': character_id, 'c': x[0], 'd': x[1], 'e': user_id})
 
-        conn.commit()
+            re = True
-        conn.close()
-        return True
 
-    conn.commit()
+    return re
-    conn.close()
-    return False
 
 
 def change_char_uncap(user_id, character_id):
     # 角色觉醒改变，返回字典
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    r = None
-    c = conn.cursor()
+    with Connect() as c:
         c.execute('''select is_uncapped, is_uncapped_override from user_char where user_id = :a and character_id = :b''',
                   {'a': user_id, 'b': character_id})
         x = c.fetchone()
-    r = None
+
         if x is not None and x[0] == 1:
             c.execute('''update user set is_char_uncapped_override = :a where user_id = :b''', {
                 'a': b2int(x[1] == 0), 'b': user_id})
@@ -83,15 +80,12 @@ def change_char_uncap(user_id, character_id):
                     "character_id": y[1]
                 }
 
-    conn.commit()
-    conn.close()
     return r
 
 
 def arc_sys_set(user_id, value, set_arg):
     # 三个设置，PTT隐藏、体力满通知、最爱角色，无返回
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    with Connect() as c:
-    c = conn.cursor()
         if 'favorite_character' in set_arg:
             value = int(value)
             c.execute('''update user set favorite_character = :a where user_id = :b''', {
@@ -110,8 +104,6 @@ def arc_sys_set(user_id, value, set_arg):
                 c.execute('''update user set max_stamina_notification_enabled = :a where user_id = :b''', {
                     'a': b2int(value), 'b': user_id})
 
-    conn.commit()
-    conn.close()
     return None
 
 
@@ -119,37 +111,32 @@ def arc_add_friend(user_id, friend_id):
     # 加好友，返回好友列表，或者是错误码602、604
     if user_id == friend_id:
         return 604
-    conn = sqlite3.connect('./database/arcaea_database.db')
+
-    c = conn.cursor()
+    r = None
+    with Connect() as c:
         c.execute('''select exists(select * from friend where user_id_me = :x and user_id_other = :y)''',
                   {'x': user_id, 'y': friend_id})
-    r = None
         if c.fetchone() == (0,):
             c.execute('''insert into friend values(:a, :b)''',
                       {'a': user_id, 'b': friend_id})
             r = server.info.get_user_friend(c, user_id)
-
         else:
-        return 602
+            r = 602
 
-    conn.commit()
-    conn.close()
     return r
 
 
 def arc_delete_friend(user_id, friend_id):
     # 删好友，返回好友列表
-    conn = sqlite3.connect('./database/arcaea_database.db')
+    r = None
-    c = conn.cursor()
+    with Connect() as c:
+
         c.execute('''select exists(select * from friend where user_id_me = :x and user_id_other = :y)''',
                   {'x': user_id, 'y': friend_id})
-    r = None
         if c.fetchone() == (1,):
             c.execute('''delete from friend where user_id_me = :x and user_id_other = :y''',
                       {'x': user_id, 'y': friend_id})
 
             r = server.info.get_user_friend(c, user_id)
 
-    conn.commit()
-    conn.close()
     return r

latest version/server/sql.py

@@ -0,0 +1,25 @@
+import sqlite3
+
+
+class Connect():
+    # 数据库连接类，上下文管理
+
+    def __init__(self, file_path='./database/arcaea_database.db'):
+        """
+        数据库连接，默认连接arcaea_database.db
+        接受：文件路径
+        返回：sqlite3连接操作对象
+        """
+        self.file_path = file_path
+
+    def __enter__(self):
+        self.conn = sqlite3.connect(self.file_path)
+        self.c = self.conn.cursor()
+        return self.c
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if self.conn:
+            self.conn.commit()
+            self.conn.close()
+
+        return True

latest version/web/index.py

@@ -403,7 +403,7 @@ def all_character():
 def change_character():
     # 修改角色数据
     skill_ids = ['No_skill', 'gauge_easy', 'note_mirror', 'gauge_hard', 'frag_plus_10_pack_stellights', 'gauge_easy|frag_plus_15_pst&prs', 'gauge_hard|fail_frag_minus_100', 'frag_plus_5_side_light', 'visual_hide_hp', 'frag_plus_5_side_conflict', 'challenge_fullcombo_0gauge', 'gauge_overflow', 'gauge_easy|note_mirror', 'note_mirror', 'visual_tomato_pack_tonesphere',
-                 'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', 'frags_kou', 'visual_ink', 'shirabe_entry_fee', 'frags_yume', 'note_mirror|visual_hide_far', 'frags_ongeki']
+                 'frag_rng_ayu', 'gaugestart_30|gaugegain_70', 'combo_100-frag_1', 'audio_gcemptyhit_pack_groovecoaster', 'gauge_saya', 'gauge_chuni', 'kantandeshou', 'gauge_haruna', 'frags_nono', 'gauge_pandora', 'gauge_regulus', 'omatsuri_daynight', 'sometimes(note_mirror|frag_plus_5)', 'scoreclear_aa|visual_scoregauge', 'gauge_tempest', 'gauge_hard', 'gauge_ilith_summer', 'frags_kou', 'visual_ink', 'shirabe_entry_fee', 'frags_yume', 'note_mirror|visual_hide_far', 'frags_ongeki', 'gauge_areus', 'gauge_seele', 'gauge_isabelle']
     return render_template('web/changechar.html', skill_ids=skill_ids)
 
 

latest version/web/system.py

@@ -445,7 +445,7 @@ def add_some_random_redeem(amount, redeem_type, items):
     message = None
     conn = sqlite3.connect('./database/arcaea_database.db')
     c = conn.cursor()
-    i = 0
+    i = 1
     while i <= amount:
         code = random_str()
         c.execute(