mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 02:38:02 +00:00
Fix executable permissions. reprintSetInfo now takes a parameter for the set instead of it being hardcoded
This commit is contained in:
jendave
6
.gitattributes
vendored
6
.gitattributes
vendored
@@ -20,7 +20,7 @@ build/support/template.applescript -text
|
||||
/forge.properties svneol=native#text/plain
|
||||
/pom.xml svneol=native#text/xml
|
||||
res/AllTokens.txt -text svneol=native#text/plain
|
||||
res/PerSetTracking.py -text svneol=native#text/x-python
|
||||
res/PerSetTracking.py svneol=native#text/x-python
|
||||
res/blockdata/blocks.txt svneol=native#text/plain
|
||||
res/blockdata/setdata.txt svneol=native#text/plain
|
||||
res/booster-decks -text svneol=unset#unset
|
||||
@@ -8919,8 +8919,8 @@ res/quest/themes/White.thm -text
|
||||
res/quest/themes/Wolves[!!-~]WG.thm -text
|
||||
res/quest/themes/Zombies[!!-~]B.thm -text
|
||||
res/quest/veryhard.txt -text svneol=native#text/plain
|
||||
res/reprintSetInfo.py -text svneol=native#text/x-python
|
||||
res/setInfoScript.py -text svneol=native#text/x-python
|
||||
res/reprintSetInfo.py svneol=native#text/x-python
|
||||
res/setInfoScript.py svneol=native#text/x-python
|
||||
res/sound/tap.mp3 -text svneol=unset#audio/mpeg
|
||||
src/arcane/ui/CardArea.java svneol=native#text/plain
|
||||
src/arcane/ui/CardPanel.java svneol=native#text/plain
|
||||
|
||||
8
res/PerSetTracking.py
Normal file → Executable file
8
res/PerSetTracking.py
Normal file → Executable file
@@ -1,3 +1,5 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
pathToMtgData = "mtg-data.txt"
|
||||
|
||||
############IMPLEMENTATION FOLLOWS############
|
||||
@@ -60,7 +62,6 @@ for file in forgeFolderFiles :
|
||||
tmpname = tmpname.rstrip()
|
||||
forgeCards.append(tmpname)
|
||||
|
||||
|
||||
#Compare datasets and output results
|
||||
print("Comparing datasets and outputting results.")
|
||||
totalData = {}
|
||||
@@ -89,9 +90,8 @@ for currentSet in setCodes :
|
||||
percentage = 0
|
||||
if total > 0 :
|
||||
percentage = (float(len(currentImplemented))/float(total))*100
|
||||
|
||||
currentMissing.sort()
|
||||
currentImplemented.sort()
|
||||
currentMissing.sort()
|
||||
currentImplemented.sort()
|
||||
|
||||
with open(sys.path[0] + os.sep + "PerSetTracking Results" + os.sep + "set_" + currentSet + ".txt", "w") as output :
|
||||
output.write("Implemented (" + str(len(currentImplemented)) + "):\n")
|
||||
|
||||
0
res/mtg-data.txt
Executable file → Normal file
0
res/mtg-data.txt
Executable file → Normal file
119
res/reprintSetInfo.py
Normal file → Executable file
119
res/reprintSetInfo.py
Normal file → Executable file
@@ -1,3 +1,5 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
# This script grabs the list of all cards in a set and clears out the setInfo
|
||||
# After running this script, re-run setInfoScript to fill in the slots
|
||||
# MAKE SURE THE setAbbr VARIABLE IS UPDATED TO THE SET YOU WANT TO CLEAR OUT
|
||||
@@ -5,54 +7,56 @@
|
||||
from httplib import HTTP
|
||||
from urlparse import urlparse
|
||||
from urllib import urlopen
|
||||
import sys
|
||||
import os
|
||||
|
||||
class SetInfo:
|
||||
def __init__(self, set, rarity, image):
|
||||
self.set = set
|
||||
self.rarity = rarity
|
||||
self.image = image
|
||||
def __init__(self, set, rarity, image):
|
||||
self.set = set
|
||||
self.rarity = rarity
|
||||
self.image = image
|
||||
|
||||
class Card:
|
||||
def __init__(self, name, cleanName):
|
||||
self.name = name
|
||||
self.cleanName = cleanName
|
||||
self.hasSet = False
|
||||
self.sets = {}
|
||||
def __init__(self, name, cleanName):
|
||||
self.name = name
|
||||
self.cleanName = cleanName
|
||||
self.hasSet = False
|
||||
self.sets = {}
|
||||
|
||||
def clean(name):
|
||||
return name.replace(' ','_').replace('\'','').replace('-','_').replace('"','').replace(',','').lower()
|
||||
return name.replace(' ','_').replace('\'','').replace('-','_').replace('"','').replace(',','').lower()
|
||||
|
||||
def getCardsInSet():
|
||||
html = urlopen('http://magiccards.info/query?q=e:'+setAbbr+'&v=olist').read()
|
||||
html = urlopen('http://magiccards.info/query?q=e:'+setAbbr+'&v=olist').read()
|
||||
|
||||
start = html.find('<th><b>Card name</b></th>')
|
||||
end = html.find('</table>', start)
|
||||
block = html[start:end]
|
||||
start = html.find('<th><b>Card name</b></th>')
|
||||
end = html.find('</table>', start)
|
||||
block = html[start:end]
|
||||
|
||||
while True:
|
||||
nameIndex = block.find('.html">')
|
||||
while True:
|
||||
nameIndex = block.find('.html">')
|
||||
|
||||
if nameIndex == -1:
|
||||
break
|
||||
if nameIndex == -1:
|
||||
break
|
||||
|
||||
nameEnd = block.find('<',nameIndex)
|
||||
nameEnd = block.find('<',nameIndex)
|
||||
|
||||
name = block[nameIndex+7:nameEnd]
|
||||
name = block[nameIndex+7:nameEnd]
|
||||
|
||||
# Add name to array
|
||||
nameList.append(clean(name)+'.txt')
|
||||
# Add name to array
|
||||
nameList.append(clean(name)+'.txt')
|
||||
|
||||
block = block[nameEnd:]
|
||||
block = block[nameEnd:]
|
||||
|
||||
return
|
||||
return
|
||||
|
||||
folder = "cardsfolder"
|
||||
err = open('reprintSetInfo.log','w')
|
||||
|
||||
# THIS NEEDS TO BE UPDATED TO THE SET YOU WANT TO UPDATE
|
||||
# SOME ARE THREE LETTER ABBR. BUT SOME ARE JUST TWO. CHECK BEFORE YOU RUN!
|
||||
setAbbr = 'mbs'
|
||||
print "Using Set: " + sys.argv[1]
|
||||
setAbbr = sys.argv[1]
|
||||
|
||||
cardDict = {}
|
||||
setStr = 'SetInfo:'
|
||||
@@ -60,49 +64,48 @@ nameList = []
|
||||
getCardsInSet()
|
||||
|
||||
for fileName in nameList:
|
||||
# if file doesn't exist continue
|
||||
filePath = os.path.join(folder, fileName)
|
||||
# if file doesn't exist continue
|
||||
filePath = os.path.join(folder, fileName)
|
||||
print filePath
|
||||
|
||||
print filePath
|
||||
if os.path.isfile(filePath) == False:
|
||||
continue
|
||||
|
||||
if os.path.isfile(filePath) == False:
|
||||
continue
|
||||
file = open(filePath)
|
||||
cleanName = fileName.replace('.txt', '')
|
||||
|
||||
file = open(filePath)
|
||||
cleanName = fileName.replace('.txt', '')
|
||||
line = file.readline().strip()
|
||||
# Handle name and creation
|
||||
name = line.replace('Name:','')
|
||||
|
||||
line = file.readline().strip()
|
||||
# Handle name and creation
|
||||
name = line.replace('Name:','')
|
||||
card = Card(name, cleanName)
|
||||
cardDict[cleanName] = card
|
||||
card.lines = line + '\n'
|
||||
|
||||
card = Card(name, cleanName)
|
||||
cardDict[cleanName] = card
|
||||
card.lines = line + '\n'
|
||||
# Start parsing the rest of the data file
|
||||
line = file.readline().strip()
|
||||
|
||||
# Start parsing the rest of the data file
|
||||
line = file.readline().strip()
|
||||
while line != 'End':
|
||||
# Skip empty lines
|
||||
if line == '':
|
||||
line = file.readline().strip()
|
||||
continue
|
||||
|
||||
while line != 'End':
|
||||
# Skip empty lines
|
||||
if line == '':
|
||||
line = file.readline().strip()
|
||||
continue
|
||||
# We really shouldn
|
||||
if line == 'End':
|
||||
break
|
||||
|
||||
# We really shouldn
|
||||
if line == 'End':
|
||||
break
|
||||
# Skip SetInfo lines
|
||||
if line.find(setStr) == -1:
|
||||
card.lines += line +'\n'
|
||||
|
||||
# Skip SetInfo lines
|
||||
if line.find(setStr) == -1:
|
||||
card.lines += line +'\n'
|
||||
line = file.readline().strip()
|
||||
|
||||
line = file.readline().strip()
|
||||
file = open(os.path.join(folder, fileName), 'w')
|
||||
file.write(card.lines)
|
||||
|
||||
file = open(os.path.join(folder, fileName), 'w')
|
||||
file.write(card.lines)
|
||||
|
||||
file.write('End')
|
||||
file.close()
|
||||
err.write(card.name + '... Updated\n')
|
||||
file.write('End')
|
||||
file.close()
|
||||
err.write(card.name + '... Updated\n')
|
||||
|
||||
err.close()
|
||||
366
res/setInfoScript.py
Normal file → Executable file
366
res/setInfoScript.py
Normal file → Executable file
@@ -1,3 +1,5 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
# This python script is designed to handle the following: individual cards located in /res/cardsfolder
|
||||
# Insert of SetInfo data into data files from magiccards.info
|
||||
|
||||
@@ -7,189 +9,189 @@ from urllib import urlopen
|
||||
import os
|
||||
|
||||
def getURL(url):
|
||||
return urlopen(url).read()
|
||||
return urlopen(url).read()
|
||||
|
||||
class SetInfo:
|
||||
def __init__(self, set, rarity, image):
|
||||
self.set = set
|
||||
self.rarity = rarity
|
||||
self.image = image
|
||||
def __init__(self, set, rarity, image):
|
||||
self.set = set
|
||||
self.rarity = rarity
|
||||
self.image = image
|
||||
|
||||
class Card:
|
||||
def __init__(self, name, cleanName):
|
||||
self.name = name
|
||||
self.cleanName = cleanName
|
||||
self.hasSet = False
|
||||
self.sets = {}
|
||||
def __init__(self, name, cleanName):
|
||||
self.name = name
|
||||
self.cleanName = cleanName
|
||||
self.hasSet = False
|
||||
self.sets = {}
|
||||
|
||||
def initSets():
|
||||
# Base Sets
|
||||
allSets['Limited Edition Alpha'] = 'LEA'
|
||||
allSets['Limited Edition Beta'] = 'LEB'
|
||||
allSets['Unlimited Edition'] = '2ED'
|
||||
allSets['Revised Edition'] = '3ED'
|
||||
allSets['Fourth Edition'] = '4ED'
|
||||
allSets['Fifth Edition'] = '5ED'
|
||||
allSets['Classic Sixth Edition'] = '6ED'
|
||||
allSets['Seventh Edition'] = '7ED'
|
||||
allSets['Eighth Edition'] = '8ED'
|
||||
allSets['Ninth Edition'] = '9ED'
|
||||
allSets['Tenth Edition'] = '10E'
|
||||
allSets['Magic 2010'] = 'M10'
|
||||
allSets['Magic 2011'] = 'M11'
|
||||
#allSets['Magic 2012'] = 'M12'
|
||||
# Base Sets
|
||||
allSets['Limited Edition Alpha'] = 'LEA'
|
||||
allSets['Limited Edition Beta'] = 'LEB'
|
||||
allSets['Unlimited Edition'] = '2ED'
|
||||
allSets['Revised Edition'] = '3ED'
|
||||
allSets['Fourth Edition'] = '4ED'
|
||||
allSets['Fifth Edition'] = '5ED'
|
||||
allSets['Classic Sixth Edition'] = '6ED'
|
||||
allSets['Seventh Edition'] = '7ED'
|
||||
allSets['Eighth Edition'] = '8ED'
|
||||
allSets['Ninth Edition'] = '9ED'
|
||||
allSets['Tenth Edition'] = '10E'
|
||||
allSets['Magic 2010'] = 'M10'
|
||||
allSets['Magic 2011'] = 'M11'
|
||||
#allSets['Magic 2012'] = 'M12'
|
||||
|
||||
# Portal
|
||||
allSets['Portal'] = 'POR'
|
||||
allSets['Portal Second Age'] = 'PO2'
|
||||
allSets['Portal Three Kingdoms'] = 'PTK'
|
||||
# Portal
|
||||
allSets['Portal'] = 'POR'
|
||||
allSets['Portal Second Age'] = 'PO2'
|
||||
allSets['Portal Three Kingdoms'] = 'PTK'
|
||||
|
||||
# Starter
|
||||
allSets['Starter 1999'] = 'S99'
|
||||
allSets['Starter 2000'] = 'S00'
|
||||
# Starter
|
||||
allSets['Starter 1999'] = 'S99'
|
||||
allSets['Starter 2000'] = 'S00'
|
||||
|
||||
# Early Sets
|
||||
allSets['Arabian Nights'] = 'ARN'
|
||||
allSets['Antiquities'] = 'ATQ'
|
||||
allSets['Legends'] = 'LEG'
|
||||
allSets['The Dark'] = 'DRK'
|
||||
allSets['Fallen Empires'] = 'FEM'
|
||||
allSets['Homelands'] = 'HML'
|
||||
# Early Sets
|
||||
allSets['Arabian Nights'] = 'ARN'
|
||||
allSets['Antiquities'] = 'ATQ'
|
||||
allSets['Legends'] = 'LEG'
|
||||
allSets['The Dark'] = 'DRK'
|
||||
allSets['Fallen Empires'] = 'FEM'
|
||||
allSets['Homelands'] = 'HML'
|
||||
|
||||
# Ice Age
|
||||
allSets['Ice Age'] = 'ICE'
|
||||
allSets['Alliances'] = 'ALL'
|
||||
allSets['Coldsnap'] = 'CSP'
|
||||
# Ice Age
|
||||
allSets['Ice Age'] = 'ICE'
|
||||
allSets['Alliances'] = 'ALL'
|
||||
allSets['Coldsnap'] = 'CSP'
|
||||
|
||||
# Mirage
|
||||
allSets['Mirage'] = 'MIR'
|
||||
allSets['Visions'] = 'VIS'
|
||||
allSets['Weatherlight'] = 'WTH'
|
||||
# Mirage
|
||||
allSets['Mirage'] = 'MIR'
|
||||
allSets['Visions'] = 'VIS'
|
||||
allSets['Weatherlight'] = 'WTH'
|
||||
|
||||
# Rath Cycle
|
||||
allSets['Tempest'] = 'TMP'
|
||||
allSets['Stronghold'] = 'STH'
|
||||
allSets['Exodus'] = 'EXO'
|
||||
# Rath Cycle
|
||||
allSets['Tempest'] = 'TMP'
|
||||
allSets['Stronghold'] = 'STH'
|
||||
allSets['Exodus'] = 'EXO'
|
||||
|
||||
# Artifacts Cycle
|
||||
allSets['Urza\'s Saga'] = 'USG'
|
||||
allSets['Urza\'s Legacy'] = 'ULG'
|
||||
allSets['Urza\'s Destiny'] = 'UDS'
|
||||
# Artifacts Cycle
|
||||
allSets['Urza\'s Saga'] = 'USG'
|
||||
allSets['Urza\'s Legacy'] = 'ULG'
|
||||
allSets['Urza\'s Destiny'] = 'UDS'
|
||||
|
||||
# Masques
|
||||
allSets['Mercadian Masques'] = 'MMQ'
|
||||
allSets['Nemesis'] = 'NMS'
|
||||
allSets['Prophecy'] = 'PCY'
|
||||
# Masques
|
||||
allSets['Mercadian Masques'] = 'MMQ'
|
||||
allSets['Nemesis'] = 'NMS'
|
||||
allSets['Prophecy'] = 'PCY'
|
||||
|
||||
# Invasion
|
||||
allSets['Invasion'] = 'INV'
|
||||
allSets['Planeshift'] = 'PLS'
|
||||
allSets['Apocalypse'] = 'APC'
|
||||
# Invasion
|
||||
allSets['Invasion'] = 'INV'
|
||||
allSets['Planeshift'] = 'PLS'
|
||||
allSets['Apocalypse'] = 'APC'
|
||||
|
||||
# Odyssey
|
||||
allSets['Odyssey'] = 'ODY'
|
||||
allSets['Torment'] = 'TOR'
|
||||
allSets['Judgment'] = 'JUD'
|
||||
# Odyssey
|
||||
allSets['Odyssey'] = 'ODY'
|
||||
allSets['Torment'] = 'TOR'
|
||||
allSets['Judgment'] = 'JUD'
|
||||
|
||||
# Onslaught
|
||||
allSets['Onslaught'] = 'ONS'
|
||||
allSets['Legions'] = 'LGN'
|
||||
allSets['Scourge'] = 'SCG'
|
||||
# Onslaught
|
||||
allSets['Onslaught'] = 'ONS'
|
||||
allSets['Legions'] = 'LGN'
|
||||
allSets['Scourge'] = 'SCG'
|
||||
|
||||
# Mirrodin
|
||||
allSets['Mirrodin'] = 'MRD'
|
||||
allSets['Darksteel'] = 'DST'
|
||||
allSets['Fifth Dawn'] = '5DN'
|
||||
# Mirrodin
|
||||
allSets['Mirrodin'] = 'MRD'
|
||||
allSets['Darksteel'] = 'DST'
|
||||
allSets['Fifth Dawn'] = '5DN'
|
||||
|
||||
# Kamigawa
|
||||
allSets['Champions of Kamigawa'] = 'CHK'
|
||||
allSets['Betrayers of Kamigawa'] = 'BOK'
|
||||
allSets['Saviors of Kamigawa'] = 'SOK'
|
||||
# Kamigawa
|
||||
allSets['Champions of Kamigawa'] = 'CHK'
|
||||
allSets['Betrayers of Kamigawa'] = 'BOK'
|
||||
allSets['Saviors of Kamigawa'] = 'SOK'
|
||||
|
||||
# Ravnica
|
||||
allSets['Ravnica: City of Guilds'] = 'RAV'
|
||||
allSets['Guildpact'] = 'GPT'
|
||||
allSets['Dissension'] = 'DIS'
|
||||
# Ravnica
|
||||
allSets['Ravnica: City of Guilds'] = 'RAV'
|
||||
allSets['Guildpact'] = 'GPT'
|
||||
allSets['Dissension'] = 'DIS'
|
||||
|
||||
# Time Spiral
|
||||
allSets['Time Spiral'] = 'TSP'
|
||||
allSets['Time Spiral "Timeshifted"'] = 'TSB'
|
||||
allSets['Planar Chaos'] = 'PLC'
|
||||
allSets['Future Sight'] = 'FUT'
|
||||
# Time Spiral
|
||||
allSets['Time Spiral'] = 'TSP'
|
||||
allSets['Time Spiral "Timeshifted"'] = 'TSB'
|
||||
allSets['Planar Chaos'] = 'PLC'
|
||||
allSets['Future Sight'] = 'FUT'
|
||||
|
||||
# Lorwyn
|
||||
allSets['Lorwyn'] = 'LRW'
|
||||
allSets['Morningtide'] = 'MOR'
|
||||
# Lorwyn
|
||||
allSets['Lorwyn'] = 'LRW'
|
||||
allSets['Morningtide'] = 'MOR'
|
||||
|
||||
# Shadowmoor
|
||||
allSets['Shadowmoor'] = 'SHM'
|
||||
allSets['Eventide'] = 'EVE'
|
||||
# Shadowmoor
|
||||
allSets['Shadowmoor'] = 'SHM'
|
||||
allSets['Eventide'] = 'EVE'
|
||||
|
||||
# Alara
|
||||
allSets['Shards of Alara'] = 'ALA'
|
||||
allSets['Conflux'] = 'CFX'
|
||||
allSets['Alara Reborn'] = 'ARB'
|
||||
# Alara
|
||||
allSets['Shards of Alara'] = 'ALA'
|
||||
allSets['Conflux'] = 'CFX'
|
||||
allSets['Alara Reborn'] = 'ARB'
|
||||
|
||||
# Zendikar
|
||||
allSets['Zendikar'] = 'ZEN'
|
||||
allSets['Worldwake'] = 'WWK'
|
||||
allSets['Rise of the Eldrazi'] = 'ROE'
|
||||
# Zendikar
|
||||
allSets['Zendikar'] = 'ZEN'
|
||||
allSets['Worldwake'] = 'WWK'
|
||||
allSets['Rise of the Eldrazi'] = 'ROE'
|
||||
|
||||
# Scars of Mirrodin
|
||||
allSets['Scars of Mirrodin'] = 'SOM'
|
||||
allSets['Mirrodin Besieged'] = 'MBS'
|
||||
allSets['New Phyrexia'] = 'NPH'
|
||||
# Scars of Mirrodin
|
||||
allSets['Scars of Mirrodin'] = 'SOM'
|
||||
allSets['Mirrodin Besieged'] = 'MBS'
|
||||
allSets['New Phyrexia'] = 'NPH'
|
||||
|
||||
def addSets(card):
|
||||
html = getURL('http://magiccards.info/query?q=!'+card.name)
|
||||
start = html.find('<br><u><b>Editions:</b></u><br>')
|
||||
end = html.find('<br><u><b>Languages:</b></u><br>', start)
|
||||
block = html[start:end]
|
||||
html = getURL('http://magiccards.info/query?q=!'+card.name)
|
||||
start = html.find('<br><u><b>Editions:</b></u><br>')
|
||||
end = html.find('<br><u><b>Languages:</b></u><br>', start)
|
||||
block = html[start:end]
|
||||
|
||||
print card.name
|
||||
print card.name
|
||||
|
||||
for edition in allSets.keys():
|
||||
edIndex = block.find('>'+edition+'<') # Portal/Mirrodin issue
|
||||
for edition in allSets.keys():
|
||||
edIndex = block.find('>'+edition+'<') # Portal/Mirrodin issue
|
||||
|
||||
if edIndex == -1:
|
||||
edIndex = block.find('>'+edition+' (') # Single set issue
|
||||
if edIndex == -1:
|
||||
continue
|
||||
if edIndex == -1:
|
||||
edIndex = block.find('>'+edition+' (') # Single set issue
|
||||
if edIndex == -1:
|
||||
continue
|
||||
|
||||
# Scrape rarity
|
||||
rarityIndex = block.find('(',edIndex)
|
||||
rarity = block[rarityIndex+1:block.find(')',rarityIndex)]
|
||||
raritySpace = rarity.find(' ')
|
||||
if raritySpace != -1:
|
||||
rarity = rarity[0:raritySpace] # For older cards
|
||||
# Scrape rarity
|
||||
rarityIndex = block.find('(',edIndex)
|
||||
rarity = block[rarityIndex+1:block.find(')',rarityIndex)]
|
||||
raritySpace = rarity.find(' ')
|
||||
if raritySpace != -1:
|
||||
rarity = rarity[0:raritySpace] # For older cards
|
||||
|
||||
# What to do with TimeShifted cards?
|
||||
if rarity == 'Special' and edition != 'Time Spiral "Timeshifted"':
|
||||
continue
|
||||
# What to do with TimeShifted cards?
|
||||
if rarity == 'Special' and edition != 'Time Spiral "Timeshifted"':
|
||||
continue
|
||||
|
||||
# Get setAbbreviation and setNumber
|
||||
dataIndex = block.rfind('"/',0,edIndex)
|
||||
data = block[dataIndex+2:edIndex-1] # 1 instead of 2 because of Portal/Mirrodin Issue
|
||||
# Get setAbbreviation and setNumber
|
||||
dataIndex = block.rfind('"/',0,edIndex)
|
||||
data = block[dataIndex+2:edIndex-1] # 1 instead of 2 because of Portal/Mirrodin Issue
|
||||
|
||||
splitData = data.split('/')
|
||||
setAbbr = splitData[0]
|
||||
setNum = splitData[2].replace('.html', '')
|
||||
splitData = data.split('/')
|
||||
setAbbr = splitData[0]
|
||||
setNum = splitData[2].replace('.html', '')
|
||||
|
||||
if len(setNum) > 4:
|
||||
# Setnum not available here for most recent set. Switch to the .jpg used on page
|
||||
jpgIndex = html.find('.jpg')
|
||||
data = html[html.rfind('scans/en/', 0, jpgIndex):jpgIndex]
|
||||
if len(setNum) > 4:
|
||||
# Setnum not available here for most recent set. Switch to the .jpg used on page
|
||||
jpgIndex = html.find('.jpg')
|
||||
data = html[html.rfind('scans/en/', 0, jpgIndex):jpgIndex]
|
||||
|
||||
# data = scans/en/[set]/[num]
|
||||
splitData = data.split('/')
|
||||
setAbbr = splitData[2]
|
||||
setNum = splitData[3]
|
||||
# data = scans/en/[set]/[num]
|
||||
splitData = data.split('/')
|
||||
setAbbr = splitData[2]
|
||||
setNum = splitData[3]
|
||||
|
||||
image = 'http://magiccards.info/scans/en/' + setAbbr + '/' + setNum + '.jpg'
|
||||
image = 'http://magiccards.info/scans/en/' + setAbbr + '/' + setNum + '.jpg'
|
||||
|
||||
card.sets[allSets[edition]] = SetInfo(allSets[edition], rarity, image)
|
||||
card.sets[allSets[edition]] = SetInfo(allSets[edition], rarity, image)
|
||||
|
||||
return
|
||||
return
|
||||
|
||||
|
||||
#get master card list and drop into a dictionary
|
||||
@@ -201,57 +203,57 @@ cardDict = {}
|
||||
setStr = 'SetInfo:'
|
||||
|
||||
for fileName in os.listdir(folder):
|
||||
if fileName.startswith('.'):
|
||||
continue
|
||||
if fileName.startswith('.'):
|
||||
continue
|
||||
|
||||
# parse cardsfolder for Card Lines and Rarity/Picture SVars. Filling in any gaps
|
||||
file = open(folder + os.sep + fileName)
|
||||
cleanName = fileName.replace('.txt', '')
|
||||
file = open(folder + os.sep + fileName)
|
||||
cleanName = fileName.replace('.txt', '')
|
||||
|
||||
line = file.readline().strip()
|
||||
# Handle name and creation
|
||||
name = line.replace('Name:','')
|
||||
line = file.readline().strip()
|
||||
# Handle name and creation
|
||||
name = line.replace('Name:','')
|
||||
|
||||
card = Card(name.replace(' ','+'), cleanName) #This makes it work on Mac OS X. Will test Windows and FreeBSD when I can.
|
||||
cardDict[cleanName] = card
|
||||
card.lines = line + '\n'
|
||||
card = Card(name.replace(' ','+'), cleanName) #This makes it work on Mac OS X. Will test Windows and FreeBSD when I can.
|
||||
cardDict[cleanName] = card
|
||||
card.lines = line + '\n'
|
||||
|
||||
# Start parsing the rest of the data file
|
||||
line = file.readline().strip()
|
||||
# Start parsing the rest of the data file
|
||||
line = file.readline().strip()
|
||||
|
||||
while line != 'End':
|
||||
# Skip empty lines
|
||||
if line == '':
|
||||
line = file.readline().strip()
|
||||
continue
|
||||
while line != 'End':
|
||||
# Skip empty lines
|
||||
if line == '':
|
||||
line = file.readline().strip()
|
||||
continue
|
||||
|
||||
# We really shouldn't
|
||||
if line == 'End':
|
||||
break
|
||||
# We really shouldn't
|
||||
if line == 'End':
|
||||
break
|
||||
|
||||
if line.find(setStr) != -1:
|
||||
info = line.replace('SetInfo:','')
|
||||
parts = info.split('|')
|
||||
if line.find(setStr) != -1:
|
||||
info = line.replace('SetInfo:','')
|
||||
parts = info.split('|')
|
||||
|
||||
card.hasSet = True
|
||||
card.sets[parts[0]] = SetInfo(parts[0], parts[1], parts[2])
|
||||
else:
|
||||
card.lines += line +'\n'
|
||||
card.hasSet = True
|
||||
card.sets[parts[0]] = SetInfo(parts[0], parts[1], parts[2])
|
||||
else:
|
||||
card.lines += line +'\n'
|
||||
|
||||
line = file.readline().strip()
|
||||
line = file.readline().strip()
|
||||
|
||||
if not card.hasSet:
|
||||
addSets(card)
|
||||
card.hasSet = True
|
||||
if not card.hasSet:
|
||||
addSets(card)
|
||||
card.hasSet = True
|
||||
|
||||
file = open(folder + os.sep + fileName, 'w')
|
||||
file.write(card.lines)
|
||||
if card.hasSet:
|
||||
for s in card.sets.values():
|
||||
file.write('SetInfo:'+ s.set + '|' + s.rarity + '|' + s.image + '\n')
|
||||
file = open(folder + os.sep + fileName, 'w')
|
||||
file.write(card.lines)
|
||||
if card.hasSet:
|
||||
for s in card.sets.values():
|
||||
file.write('SetInfo:'+ s.set + '|' + s.rarity + '|' + s.image + '\n')
|
||||
|
||||
file.write('End')
|
||||
file.close()
|
||||
err.write(card.name + '... Updated\n')
|
||||
file.write('End')
|
||||
file.close()
|
||||
err.write(card.name + '... Updated\n')
|
||||
|
||||
err.close()
|
||||
Reference in New Issue
Block a user