core: little cleanup

dinana · Oct 28, 2015 · be43303 · be43303
1 parent 497e61e
commit be43303
Showing 1 changed file with 41 additions and 52 deletions.
diff --git a/fut/core.py b/fut/core.py
@@ -52,59 +52,48 @@ def baseId(resource_id, return_version=False):
 
 def itemParse(item_data, full=True):
     """Parser for item data. Returns nice dictionary."""
+    # TODO: parse all data
+    item_data = {
+        'tradeId':           item_data.get('tradeId'),
+        'buyNowPrice':       item_data.get('buyNowPrice'),
+        'tradeState':        item_data.get('tradeState'),
+        'bidState':          item_data.get('bidState'),
+        'startingBid':       item_data.get('startingBid'),
+        'id':                item_data['itemData']['id'],
+        'offers':            item_data.get('offers'),
+        'currentBid':        item_data.get('currentBid'),
+        'expires':           item_data.get('expires'),  # seconds left
+        'sellerEstablished': item_data.get('sellerEstablished'),
+        'sellerId':          item_data.get('sellerId'),
+        'sellerName':        item_data.get('sellerName'),
+        'watched':           item_data.get('watched'),
+    }
     if full:
-        return {
-            'tradeId':           item_data.get('tradeId'),
-            'buyNowPrice':       item_data.get('buyNowPrice'),
-            'tradeState':        item_data.get('tradeState'),
-            'bidState':          item_data.get('bidState'),
-            'startingBid':       item_data.get('startingBid'),
-            'id':                item_data['itemData']['id'],
-            'timestamp':         item_data['itemData']['timestamp'],  # auction start
-            'rating':            item_data['itemData']['rating'],
-            'assetId':           item_data['itemData']['assetId'],
-            'resourceId':        item_data['itemData']['resourceId'],
-            'itemState':         item_data['itemData']['itemState'],
-            'rareflag':          item_data['itemData']['rareflag'],
-            'formation':         item_data['itemData']['formation'],
-            'leagueId':          item_data['itemData'].get('leagueId'),
-            'injuryType':        item_data['itemData'].get('injuryType'),
-            'injuryGames':       item_data['itemData']['injuryGames'],
-            'lastSalePrice':     item_data['itemData']['lastSalePrice'],
-            'fitness':           item_data['itemData']['fitness'],
-            'training':          item_data['itemData']['training'],
-            'suspension':        item_data['itemData']['suspension'],
-            'contract':          item_data['itemData']['contract'],
-            # 'position':         item_data['itemData']['preferredPosition'],
-            'playStyle':         item_data['itemData'].get('playStyle'),  # used only for players
-            'discardValue':      item_data['itemData']['discardValue'],
-            'itemType':          item_data['itemData']['itemType'],
-            'cardType':          item_data['itemData'].get("cardsubtypeid"),  # used only for cards
-            'owners':            item_data['itemData']['owners'],
-            'offers':            item_data.get('offers'),
-            'currentBid':        item_data.get('currentBid'),
-            'expires':           item_data.get('expires'),  # seconds left
-            'sellerEstablished': item_data.get('sellerEstablished'),
-            'sellerId':          item_data.get('sellerId'),
-            'sellerName':        item_data.get('sellerName'),
-            'watched':           item_data.get('watched'),
-        }
-    else:
-        return {
-            'tradeId':           item_data.get('tradeId'),
-            'buyNowPrice':       item_data.get('buyNowPrice'),
-            'tradeState':        item_data.get('tradeState'),
-            'bidState':          item_data.get('bidState'),
-            'startingBid':       item_data.get('startingBid'),
-            'id':                item_data['itemData']['id'],
-            'offers':            item_data.get('offers'),
-            'currentBid':        item_data.get('currentBid'),
-            'expires':           item_data.get('expires'),  # seconds left
-            'sellerEstablished': item_data.get('sellerEstablished'),
-            'sellerId':          item_data.get('sellerId'),
-            'sellerName':        item_data.get('sellerName'),
-            'watched':           item_data.get('watched'),
-        }
+        item_data.update({
+            'timestamp':     item_data['itemData']['timestamp'],  # auction start
+            'rating':        item_data['itemData']['rating'],
+            'assetId':       item_data['itemData']['assetId'],
+            'resourceId':    item_data['itemData']['resourceId'],
+            'itemState':     item_data['itemData']['itemState'],
+            'rareflag':      item_data['itemData']['rareflag'],
+            'formation':     item_data['itemData']['formation'],
+            'leagueId':      item_data['itemData'].get('leagueId'),
+            'injuryType':    item_data['itemData'].get('injuryType'),
+            'injuryGames':   item_data['itemData']['injuryGames'],
+            'lastSalePrice': item_data['itemData']['lastSalePrice'],
+            'fitness':       item_data['itemData']['fitness'],
+            'training':      item_data['itemData']['training'],
+            'suspension':    item_data['itemData']['suspension'],
+            'contract':      item_data['itemData']['contract'],
+            # 'position':     item_data['itemData']['preferredPosition'],
+            'playStyle':     item_data['itemData'].get('playStyle'),  # used only for players
+            'discardValue':  item_data['itemData']['discardValue'],
+            'itemType':      item_data['itemData']['itemType'],
+            'cardType':      item_data['itemData'].get("cardsubtypeid"),  # used only for cards
+            'owners':        item_data['itemData']['owners'],
+        })
+    return item_data
+
 
 '''  # different urls (platforms)
 def cardInfo(resource_id):