Fix a bug and add a new thing

- Add support for logging Arcaea's errors
- Fix a bug when world maps' data don't have some unnecessary parts the client of iOS may break down

latest version/server/purchase.py

@@ -1,6 +1,6 @@
 from time import time
 
-from core.error import ArcError, ItemUnavailable
+from core.error import InputError, ItemUnavailable, PostError
 from core.item import ItemFactory, Stamina6
 from core.purchase import Purchase, PurchaseList
 from core.redeem import UserRedeem
@@ -9,35 +9,29 @@ from core.user import UserOnline
 from flask import Blueprint, request
 
 from .auth import auth_required
-from .func import error_return, success_return
+from .func import arc_try, success_return
 
 bp = Blueprint('purchase', __name__, url_prefix='/purchase')
 
 
 @bp.route('/bundle/pack', methods=['GET'])  # 曲包信息
 @auth_required(request)
+@arc_try
 def bundle_pack(user_id):
     with Connect() as c:
-        try:
-            x = PurchaseList(c, UserOnline(c, user_id)
-                             ).select_from_type('pack')
-            return success_return(x.to_dict_list())
-        except ArcError as e:
-            return error_return(e)
-    return error_return()
+        x = PurchaseList(c, UserOnline(c, user_id)
+                         ).select_from_type('pack')
+        return success_return(x.to_dict_list())
 
 
 @bp.route('/bundle/single', methods=['GET'])  # 单曲购买信息获取
 @auth_required(request)
+@arc_try
 def get_single(user_id):
     with Connect() as c:
-        try:
-            x = PurchaseList(c, UserOnline(c, user_id)
-                             ).select_from_type('single')
-            return success_return(x.to_dict_list())
-        except ArcError as e:
-            return error_return(e)
-    return error_return()
+        x = PurchaseList(c, UserOnline(c, user_id)
+                         ).select_from_type('single')
+        return success_return(x.to_dict_list())
 
 
 @bp.route('/bundle/bundle', methods=['GET'])  # 捆绑包
@@ -72,99 +66,87 @@ def bundle_bundle():
 
 @bp.route('/me/pack', methods=['POST'])  # 曲包和单曲购买
 @auth_required(request)
+@arc_try
 def buy_pack_or_single(user_id):
     with Connect() as c:
-        try:
-            if 'pack_id' in request.form:
-                purchase_name = request.form['pack_id']
-            elif 'single_id' in request.form:
-                purchase_name = request.form['single_id']
-            else:
-                return success_return()
+        if 'pack_id' in request.form:
+            purchase_name = request.form['pack_id']
+        elif 'single_id' in request.form:
+            purchase_name = request.form['single_id']
+        else:
+            return success_return()
 
-            x = Purchase(c, UserOnline(c, user_id)).select(purchase_name)
-            x.buy()
+        x = Purchase(c, UserOnline(c, user_id)).select(purchase_name)
+        x.buy()
 
-            return success_return({
-                'user_id': x.user.user_id,
-                'ticket': x.user.ticket,
-                'packs': x.user.packs,
-                'singles': x.user.singles,
-                'characters': x.user.characters_list
-            })
-        except ArcError as e:
-            return error_return(e)
-    return error_return()
+        return success_return({
+            'user_id': x.user.user_id,
+            'ticket': x.user.ticket,
+            'packs': x.user.packs,
+            'singles': x.user.singles,
+            'characters': x.user.characters_list
+        })
 
 
 @bp.route('/me/item', methods=['POST'])  # 特殊购买，world模式boost和stamina
 @auth_required(request)
+@arc_try
 def buy_special(user_id):
     with Connect() as c:
-        try:
-            if 'item_id' not in request.form:
-                return error_return()
-            item_id = request.form['item_id']
+        if 'item_id' not in request.form:
+            raise PostError('`item_id` is required')
+        item_id = request.form['item_id']
 
-            x = Purchase(c, UserOnline(c, user_id))
-            x.purchase_name = item_id
-            x.price = 50
-            x.orig_price = 50
-            x.discount_from = -1
-            x.discount_to = -1
-            x.items = [ItemFactory(c).get_item(item_id)]
-            x.buy()
+        x = Purchase(c, UserOnline(c, user_id))
+        x.purchase_name = item_id
+        x.price = 50
+        x.orig_price = 50
+        x.discount_from = -1
+        x.discount_to = -1
+        x.items = [ItemFactory(c).get_item(item_id)]
+        x.buy()
 
-            r = {'user_id': x.user.user_id, 'ticket': x.user.ticket}
-            if item_id == 'stamina6':
-                r['stamina'] = x.user.stamina.stamina
-                r['max_stamina_ts'] = x.user.stamina.max_stamina_ts
-                r['world_mode_locked_end_ts'] = -1
-            return success_return(r)
-        except ArcError as e:
-            return error_return(e)
-    return error_return()
+        r = {'user_id': x.user.user_id, 'ticket': x.user.ticket}
+        if item_id == 'stamina6':
+            r['stamina'] = x.user.stamina.stamina
+            r['max_stamina_ts'] = x.user.stamina.max_stamina_ts
+            r['world_mode_locked_end_ts'] = -1
+        return success_return(r)
 
 
 @bp.route('/me/stamina/<buy_stamina_type>', methods=['POST'])  # 购买体力
 @auth_required(request)
+@arc_try
 def purchase_stamina(user_id, buy_stamina_type):
     with Connect() as c:
-        try:
-            if buy_stamina_type != 'fragment':
-                return error_return()
+        if buy_stamina_type != 'fragment':
+            raise InputError('Invalid type of buying stamina')
 
-            user = UserOnline(c, user_id)
-            user.select_user_one_column('next_fragstam_ts', -1)
-            now = int(time()*1000)
-            if user.next_fragstam_ts > now:
-                return ItemUnavailable('Buying stamina by fragment is not available yet.', 905)
+        user = UserOnline(c, user_id)
+        user.select_user_one_column('next_fragstam_ts', -1)
+        now = int(time()*1000)
+        if user.next_fragstam_ts > now:
+            return ItemUnavailable('Buying stamina by fragment is not available yet.', 905)
 
-            user.update_user_one_column(
-                'next_fragstam_ts', now + 24 * 3600 * 1000)
-            s = Stamina6(c)
-            s.user_claim_item(user)
-            return success_return({
-                "user_id": user.user_id,
-                "stamina": user.stamina.stamina,
-                "max_stamina_ts": user.stamina.max_stamina_ts,
-                "next_fragstam_ts": user.next_fragstam_ts,
-                'world_mode_locked_end_ts': -1
-            })
-        except ArcError as e:
-            return error_return(e)
-    return error_return()
+        user.update_user_one_column(
+            'next_fragstam_ts', now + 24 * 3600 * 1000)
+        s = Stamina6(c)
+        s.user_claim_item(user)
+        return success_return({
+            "user_id": user.user_id,
+            "stamina": user.stamina.stamina,
+            "max_stamina_ts": user.stamina.max_stamina_ts,
+            "next_fragstam_ts": user.next_fragstam_ts,
+            'world_mode_locked_end_ts': -1
+        })
 
 
 @bp.route('/me/redeem', methods=['POST'])  # 兑换码
 @auth_required(request)
+@arc_try
 def redeem(user_id):
     with Connect() as c:
-        try:
-            x = UserRedeem(c, UserOnline(c, user_id))
-            x.claim_user_redeem(request.form['code'])
+        x = UserRedeem(c, UserOnline(c, user_id))
+        x.claim_user_redeem(request.form['code'])
 
-            return success_return({"coupon": "fragment" + str(x.fragment) if x.fragment > 0 else ""})
-        except ArcError as e:
-            return error_return(e)
-    return error_return()
+        return success_return({"coupon": "fragment" + str(x.fragment) if x.fragment > 0 else ""})