From 19acfdc97107b94d41865746d5e4ccf01fbc402e Mon Sep 17 00:00:00 2001
From: Constantin Wenger <constantin.wenger@googlemail.com>
Date: Tue, 01 Feb 2022 22:47:23 +0000
Subject: [PATCH] changed order of output in detect.txt to match scryglass import in magicassistant
---
fetch_data.py | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/fetch_data.py b/fetch_data.py
index 00bf592..a43cb68 100644
--- a/fetch_data.py
+++ b/fetch_data.py
@@ -81,9 +81,14 @@
# df is a single row of card
fetch_card_image(df, out_dir, size)
else:
+ from concurrent.futures import ThreadPoolExecutor, wait as fwait
+ executor = ThreadPoolExecutor(5)
# df is a dataframe containing list of cards
+ arglist = []
for ind, row in df.iterrows():
- fetch_card_image(row, out_dir, size)
+ arglist.append(executor.submit(fetch_card_image, row, out_dir, size))
+ fwait(arglist)
+ # fetch_card_image(row, out_dir, size)
def fetch_card_image(row, out_dir=None, size='png'):
@@ -95,7 +100,10 @@
:return:
"""
if out_dir is None:
- out_dir = '%s/card_img/%s/%s' % (Config.data_dir, size, row['set'])
+ s = row['set']
+ if s == 'con':
+ s = 'con__'
+ out_dir = '%s/card_img/%s/%s' % (Config.data_dir, size, s)
if not os.path.exists(out_dir):
os.makedirs(out_dir)
@@ -127,8 +135,13 @@
def main():
# Query card data by each set, then merge them together
+ if not os.path.exists(os.path.join(Config.data_dir, 'csv')):
+ os.mkdir(os.path.join(Config.data_dir, 'csv'))
for set_name in Config.all_set_list:
- csv_name = '%s/csv/%s.csv' % (Config.data_dir, set_name)
+ set_name_m = set_name
+ if set_name_m == 'con':
+ set_name_m = 'con__'
+ csv_name = '%s/csv/%s.csv' % (Config.data_dir, set_name_m)
print(csv_name)
if not os.path.isfile(csv_name):
df = fetch_all_cards_text(url='https://api.scryfall.com/cards/search?q=set:%s+lang:en' % set_name,
--
Gitblit v1.10.0