Redesigned data format

supr3meofficial · May 11, 2020 · 6cb996f · 6cb996f
1 parent 37dbd9a
commit 6cb996f
Show file tree

Hide file tree

Showing 34 changed files with 3,772 additions and 24,159 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 
 # CHANGELOG
 
+## v0.1.2 - 11/05/20
+* Redesigned data format
+
 ## v0.1.1 - 11/05/20
 * Added a changelog
 * Updated data format

diff --git a/data/chroma_2_case.json b/data/chroma_2_case.json
diff --git a/data/chroma_3_case.json b/data/chroma_3_case.json
diff --git a/data/chroma_case.json b/data/chroma_case.json
diff --git a/data/clutch_case.json b/data/clutch_case.json
diff --git a/data/cs b/data/cs
diff --git a/data/cs20_case.json b/data/cs20_case.json
diff --git a/data/danger_zone_case.json b/data/danger_zone_case.json
diff --git a/data/esports_2013_case.json b/data/esports_2013_case.json
diff --git a/data/esports_2013_winter_case.json b/data/esports_2013_winter_case.json
diff --git a/data/esports_2014_summer_case.json b/data/esports_2014_summer_case.json
diff --git a/data/falchion_case.json b/data/falchion_case.json
diff --git a/data/gamma_2_case.json b/data/gamma_2_case.json
diff --git a/data/gamma_case.json b/data/gamma_case.json
diff --git a/data/glove_case.json b/data/glove_case.json
diff --git a/data/horizon_case.json b/data/horizon_case.json
diff --git a/data/huntsman_weapon_case.json b/data/huntsman_weapon_case.json
diff --git a/data/operation_bravo_case.json b/data/operation_bravo_case.json
diff --git a/data/operation_breakout_weapon_case.json b/data/operation_breakout_weapon_case.json
diff --git a/data/operation_hydra_case.json b/data/operation_hydra_case.json
diff --git a/data/operation_phoenix_weapon_case.json b/data/operation_phoenix_weapon_case.json
diff --git a/data/operation_vanguard_weapon_case.json b/data/operation_vanguard_weapon_case.json
diff --git a/data/operation_wildfire_case.json b/data/operation_wildfire_case.json
diff --git a/data/output.json b/data/output.json
diff --git a/data/prisma_2_case.json b/data/prisma_2_case.json
diff --git a/data/prisma_case.json b/data/prisma_case.json
diff --git a/data/revolver_case.json b/data/revolver_case.json
diff --git a/data/shadow_case.json b/data/shadow_case.json
diff --git a/data/shattered_web_case.json b/data/shattered_web_case.json
diff --git a/data/spectrum_2_case.json b/data/spectrum_2_case.json
diff --git a/data/spectrum_case.json b/data/spectrum_case.json
diff --git a/data/winter_offensive_weapon_case.json b/data/winter_offensive_weapon_case.json
diff --git a/data/x-ray_p250_package.json b/data/x-ray_p250_package.json
@@ -1,38 +1,19 @@
-[
-  {
-    "url": "https://csgostash.com/case/292/X-Ray-P250-Package"
-  },
-  {
-    "image_url": "https://steamcommunity-a.akamaihd.net/economy/image/-9a81dlWLwJ2UUGcVs_nsVtzdOEdtWwKGZZLQHTxDZ7I56KU0Zwwo4NUX4oFJZEHLbXU5A1PIYQNqhpOSV-fRPasw8rsS091PDtH5O_1FAthwfTNP2kTvomzzYHdlqLxZb7XlW4IuJwk3u2S8NWl3QS1_EA6YT2iddeXdgIgIQaHHJc2aVo/256fx256f"
-  },
-  {
-    "Covert Skins": [],
-    "Classified Skins": [],
-    "Restricted Skins": [
-      {
-        "P250 | X-Ray": [
-          {
-            "url": "https://csgostash.com/skin/1097/P250-X-Ray"
-          },
-          {
-            "image": "https://steamcdn-a.akamaihd.net/apps/730/icons/econ/default_generated/weapon_p250_cu_xray_p250_light_large.4b9f603e1a1dd4de2d64e05bf21168bc8b070bf2.png"
-          },
-          {
-            "possible_wears": {
-              "fn": "https://steamcommunity-a.akamaihd.net/economy/image/-9a81dlWLwJ2UUGcVs_nsVtzdOEdtWwKGZZLQHTxDZ7I56KU0Zwwo4NUX4oFJZEHLbXH5ApeO4YmlhxYQknCRvCo04DEVlxkKgpopujwezhjxszQYzxb08zkwdC0m_7zO6_ummpD78A_3uuY89ql21HlqkI4N22ncYTBdAJrYV2CrFO_wOjn18W07p3OySA1uD5iuyiPLEDzxw/512fx384f",
-              "mw": "https://steamcommunity-a.akamaihd.net/economy/image/-9a81dlWLwJ2UUGcVs_nsVtzdOEdtWwKGZZLQHTxDZ7I56KU0Zwwo4NUX4oFJZEHLbXH5ApeO4YmlhxYQknCRvCo04DEVlxkKgpopujwezhjxszQYzxb08zkwdC0m_7zO6_ummpD78A_3uuY89ql21HlqkI4N22ncYTBdAJrYV2CrFO_wOjn18W07p3OySA1uD5iuyiPLEDzxw/512fx384f",
-              "ft": "https://steamcommunity-a.akamaihd.net/economy/image/-9a81dlWLwJ2UUGcVs_nsVtzdOEdtWwKGZZLQHTxDZ7I56KU0Zwwo4NUX4oFJZEHLbXH5ApeO4YmlhxYQknCRvCo04DEVlxkKgpopujwezhjxszQYzxb08zkwdC0mvLwOq7cqWdQ-sJ0xO-Q8Nyt2gDtqRVpYjv6IIDBcFA4Nw6Er1a4w7-51JO7ucibwCE27HE8pSGKBI8tbWI/512fx384f"
-            }
-          },
-          {
-            "desc": "A custom painted P250 showing its internals with an X-Ray"
-          },
-          {
-            "lore": "Custom Paint Job "
-          }
-        ]
+{
+  "url": "https://csgostash.com/case/292/X-Ray-P250-Package",
+  "image_url": "https://steamcommunity-a.akamaihd.net/economy/image/-9a81dlWLwJ2UUGcVs_nsVtzdOEdtWwKGZZLQHTxDZ7I56KU0Zwwo4NUX4oFJZEHLbXU5A1PIYQNqhpOSV-fRPasw8rsS091PDtH5O_1FAthwfTNP2kTvomzzYHdlqLxZb7XlW4IuJwk3u2S8NWl3QS1_EA6YT2iddeXdgIgIQaHHJc2aVo/256fx256f",
+  "content": {
+    "Restricted Skins": {
+      "title": {
+        "url": "https://csgostash.com/skin/1097/P250-X-Ray",
+        "image": "https://steamcdn-a.akamaihd.net/apps/730/icons/econ/default_generated/weapon_p250_cu_xray_p250_light_large.4b9f603e1a1dd4de2d64e05bf21168bc8b070bf2.png",
+        "possible_wears": {
+          "fn": "https://steamcommunity-a.akamaihd.net/economy/image/-9a81dlWLwJ2UUGcVs_nsVtzdOEdtWwKGZZLQHTxDZ7I56KU0Zwwo4NUX4oFJZEHLbXH5ApeO4YmlhxYQknCRvCo04DEVlxkKgpopujwezhjxszQYzxb08zkwdC0m_7zO6_ummpD78A_3uuY89ql21HlqkI4N22ncYTBdAJrYV2CrFO_wOjn18W07p3OySA1uD5iuyiPLEDzxw/512fx384f",
+          "mw": "https://steamcommunity-a.akamaihd.net/economy/image/-9a81dlWLwJ2UUGcVs_nsVtzdOEdtWwKGZZLQHTxDZ7I56KU0Zwwo4NUX4oFJZEHLbXH5ApeO4YmlhxYQknCRvCo04DEVlxkKgpopujwezhjxszQYzxb08zkwdC0m_7zO6_ummpD78A_3uuY89ql21HlqkI4N22ncYTBdAJrYV2CrFO_wOjn18W07p3OySA1uD5iuyiPLEDzxw/512fx384f",
+          "ft": "https://steamcommunity-a.akamaihd.net/economy/image/-9a81dlWLwJ2UUGcVs_nsVtzdOEdtWwKGZZLQHTxDZ7I56KU0Zwwo4NUX4oFJZEHLbXH5ApeO4YmlhxYQknCRvCo04DEVlxkKgpopujwezhjxszQYzxb08zkwdC0mvLwOq7cqWdQ-sJ0xO-Q8Nyt2gDtqRVpYjv6IIDBcFA4Nw6Er1a4w7-51JO7ucibwCE27HE8pSGKBI8tbWI/512fx384f"
+        },
+        "desc": "A custom painted P250 showing its internals with an X-Ray",
+        "lore": "Custom Paint Job "
       }
-    ],
-    "Mil-Spec Skins": []
+    }
   }
-]
+}
diff --git a/main.py b/main.py
@@ -55,12 +55,7 @@ def _get_skin_wears(self, skin_page_url):
         return possible_wears
 
     def _get_case_contents(self, case_page_url):
-        case_content = {
-        "Covert Skins" : [],
-        "Classified Skins" : [],
-        "Restricted Skins" : [],
-        "Mil-Spec Skins" : []
-        }
+        case_content = {}
         # Parse main page
         page = get_parsed_page(case_page_url)
         # Isolate elements related to the actual skins
@@ -84,16 +79,16 @@ def _get_case_contents(self, case_page_url):
             # Description & Lore
             description,lore = self._get_skin_description_and_lore(skin_url)
             # Full Skin details
-            skin_details = {title : [{"url" : skin_url}, {"image" : image_url}, {"possible_wears" : possible_wears}, {"desc" : description}, {"lore" : lore}]}
+            skin_details = dict(title = dict(url=skin_url, image=image_url, possible_wears=possible_wears, desc=description, lore = lore))
             # Add to case_content
             if rarity == 'Covert':
-                case_content['Covert Skins'].append(skin_details)
+                case_content['Covert Skins'] = skin_details
             elif rarity == 'Classified':
-                case_content['Classified Skins'].append(skin_details)
+                case_content['Classified Skins'] = skin_details
             elif rarity == 'Restricted':
-                case_content['Restricted Skins'].append(skin_details)
+                case_content['Restricted Skins'] = skin_details
             elif rarity == 'Mil-Spec':
-                case_content['Mil-Spec Skins'].append(skin_details)
+                case_content['Mil-Spec Skins'] = skin_details
         return case_content
 
     def _get_all_cases(self):
@@ -114,7 +109,7 @@ def _get_all_cases(self):
             image = page_content_single.img['src']
             print(f'Adding case: {title} [{i}/{total_cases}]')
             content = self._get_case_contents(url)
-            csgo_cases[title] = [{"url" : url}, {"image_url" : image}, content]
+            csgo_cases[title] = dict(url=url, image_url=image, content=content)
             print(f'Done!\n')
             i += 1
             time.sleep(2) # Sleep to prevent overload