From 391bff5362190e220b457f1be0cfb66ba706e71d Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Fri, 07 Sep 2018 00:36:27 +0000
Subject: [PATCH] Cards can be skewed now

---
 fetch_data.py |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/fetch_data.py b/fetch_data.py
index 1721478..adad979 100644
--- a/fetch_data.py
+++ b/fetch_data.py
@@ -5,6 +5,10 @@
 import re
 import os
 
+all_set_list = ['mrd', 'dst', '5dn', 'chk', 'bok', 'sok', 'rav', 'gpt', 'dis', 'csp', 'tsp', 'plc', 'fut',
+                '10e', 'lrw', 'mor', 'shm', 'eve', 'ala', 'con', 'arb', 'm10', 'zen', 'wwk', 'roe', 'm11', 'som', 'mbs',
+                'nph', 'm12', 'isd', 'dka', 'avr', 'm13', 'rtr', 'gtc', 'dgm', 'm14', 'ths', 'bng', 'jou']
+
 
 def fetch_all_cards_text(url='https://api.scryfall.com/cards/search?q=layout:normal+format:modern+lang:en+frame:2003',
                          csv_name=''):
@@ -74,24 +78,25 @@
     if not os.path.exists(out_dir):
         os.makedirs(out_dir)
     img_name = '%s/%s_%s.png' % (out_dir, row['collector_number'], get_valid_filename(row['name']))
-    request.urlretrieve(png_url, filename=img_name)
-    print(img_name)
+    if not os.path.isfile(img_name):
+        request.urlretrieve(png_url, filename=img_name)
+        print(img_name)
 
 
 def main():
-    for set_name in ['mrd', 'dst', '5dn', 'chk', 'bok', 'sok', 'rav', 'gpt', 'dis', 'csp', 'tsp', 'plc', 'fut', 'lrw',
-                     'mor', 'shm', 'eve', 'ala', 'con', 'arb', 'zen', 'wwk', 'roe', 'som', 'mbs', 'nph', 'isd', 'dka',
-                     'avr', 'rtr', 'gtc', 'dgm', 'ths', 'bng', 'jou', '8ed', '9ed', '10e', 'm10', 'm11', 'm12', 'm13',
-                     'm14']:
+    '''
+    for set_name in all_set_list:
         csv_name = 'data/csv/%s.csv' % set_name
         if not os.path.isfile(csv_name):
-            df = fetch_all_cards_text(url='https://api.scryfall.com/cards/search?q=layout:normal+set:%s+lang:en' % set_name,
-                                      csv_name=csv_name)
+            df = fetch_all_cards_text(url='https://api.scryfall.com/cards/search?q=layout:normal+set:%s+lang:en+frame:2003'
+                                          % set_name, csv_name=csv_name)
         else:
             df = load_all_cards_text(csv_name)
         print(csv_name)
-        if not os.path.exists('data/png/%s' % set_name):
-            fetch_all_cards_image(df)
+        fetch_all_cards_image(df, out_dir='../usb/data/png/%s' % set_name)
+    '''
+    df = fetch_all_cards_text(url='https://api.scryfall.com/cards/search?q=layout:normal+lang:en+frame:2003',
+                              csv_name='data/csv/all.csv')
     pass
 
 

--
Gitblit v1.10.0