diff --git a/cards_corrections.json b/cards_corrections similarity index 90% rename from cards_corrections.json rename to cards_corrections index 8e099d46..e25ff3a6 100644 --- a/cards_corrections.json +++ b/cards_corrections @@ -1,3 +1,10 @@ +// Objects to be fixed +// "Card Name": { +// "Key": "New Value" +// } +// List of Keys: +// + { "Angel of the God-Pharoh": { "name": "Angel of the God-Pharaoh", diff --git a/cards_delete b/cards_delete new file mode 100644 index 00000000..8186778b --- /dev/null +++ b/cards_delete @@ -0,0 +1,10 @@ +// List of card strings to be removed +// [ +// "Card Name 1", +// "Card Name 2" +// ] +// Case-sensitive + +[ + "Sunset Pyramid (TO DELETE)" +] \ No newline at end of file diff --git a/cards_delete.json b/cards_delete.json deleted file mode 100644 index 5faaf342..00000000 --- a/cards_delete.json +++ /dev/null @@ -1 +0,0 @@ -["Sunset Pyramid (TO DELETE)"] diff --git a/cards_manual.json b/cards_manual similarity index 100% rename from cards_manual.json rename to cards_manual diff --git a/main.py b/main.py index ed4791b9..4f4d0295 100644 --- a/main.py +++ b/main.py @@ -1,11 +1,8 @@ # -*- coding: utf-8 -*- import spoilers -import sys import os -import shutil -#import configparser +import commentjson import json -#import urllib presets = { "isfullspoil": False, #when full spoil comes around, we only want to use WOTC images @@ -16,18 +13,18 @@ presets = { } } -with open('set_info.json') as data_file: - setinfos = json.load(data_file) +with open('set_info') as data_file: + setinfos = commentjson.load(data_file) -with open('cards_manual.json') as data_file: - manual_sets = json.load(data_file) +with open('cards_manual') as data_file: + manual_sets = commentjson.load(data_file) #manual_cards = manual_cards['cards'] -with open('cards_corrections.json') as data_file: - card_corrections = json.load(data_file) +with open('cards_corrections') as data_file: + card_corrections = commentjson.load(data_file) -with open('cards_delete.json') as data_file: - delete_cards = json.load(data_file) +with open('cards_delete') as data_file: + delete_cards = commentjson.load(data_file) errorlog = [] @@ -115,4 +112,4 @@ if __name__ == '__main__': save_xml(spoilers.pretty_xml('out/spoiler.xml'), 'out/spoiler.xml') save_errorlog(errorlog) save_allsets(AllSets) - #save_setjson(mtgjson) + #save_setjson(mtgjson) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index f053885b..09b173ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,5 @@ feedparser lxml Pillow datetime -beautifulsoup4 \ No newline at end of file +beautifulsoup4 +commentjson \ No newline at end of file diff --git a/set_info.json b/set_info similarity index 100% rename from set_info.json rename to set_info