diff --git a/new.py b/new.py
index e278bf5..3ffc7cf 100644
--- a/new.py
+++ b/new.py
@@ -839,7 +839,20 @@ def crayonlog(colour,event):
crayonstring = str(crayonno) + " " + crayonrend
return crayonstring
-print("Building index page")
+def showdupes():
+ dupeslist = []
+ previouscard = ""
+ for card in cardlist:
+ try:
+ if card["name"] == previouscard["name"]:
+ dupeslist.append(card["name"])
+ except:
+ pass
+ previouscard = card
+ return dupeslist
+
+if __name__ == "__main__":
+ print("Building index page")
def indexgen():
if os.path.exists("build/index.html"):
@@ -1103,9 +1116,9 @@ def indexgen():
content.close()
footerwrite(thefile)
-indexgen()
-
-print("Building levels page")
+if __name__ == "__main__":
+ indexgen()
+ print("Building levels page")
def levelsgen():
if not os.path.isdir("build/levels"):
@@ -1343,9 +1356,9 @@ def levelsgen():
content.close()
footerwrite(thefile)
-levelsgen()
-
-print("Building portfolios page")
+if __name__ == "__main__":
+ levelsgen()
+ print("Building portfolios page")
def portfoliosgen(colour=False):
if not os.path.isdir("build/portfolios"):
@@ -1381,9 +1394,9 @@ def portfoliosgen(colour=False):
content.close()
footerwrite(thefile)
-portfoliosgen()
-
-print("Building collecting page")
+if __name__ == "__main__":
+ portfoliosgen()
+ print("Building collecting page")
def collectinggen(colour=False):
if not os.path.isdir("build/collecting"):
@@ -1431,9 +1444,9 @@ def collectingall():
for thevalue in values:
collectinggen(thevalue)
-collectingall()
-
-print("Building mass collecting pages")
+if __name__ == "__main__":
+ collectingall()
+ print("Building mass collecting pages")
masslist = sorted(list(variables.masscollect.keys()))
@@ -1490,9 +1503,9 @@ def massall():
massseriesgen(series,massindex)
massindex += 1
-massall()
-
-print("Building mastered page")
+if __name__ == "__main__":
+ massall()
+ print("Building mastered page")
def masteredgen(colour=False):
if not os.path.isdir("build/mastered"):
@@ -1524,9 +1537,9 @@ def masteredall():
for thevalue in values:
masteredgen(thevalue)
-masteredall()
-
-print("Building trading page")
+if __name__ == "__main__":
+ masteredall()
+ print("Building trading page")
tradelist = []
sigtradelist = []
@@ -1584,9 +1597,9 @@ def tradeall():
tradegen(thevalue)
tradegen("sig")
-tradeall()
-
-print("Building wanted page")
+if __name__ == "__main__":
+ tradeall()
+ print("Building wanted page")
def wantedgen():
if not os.path.isdir("build/wanted"):
@@ -1648,9 +1661,9 @@ def wantedgen():
content.close()
footerwrite(thefile)
-wantedgen()
-
-print("Building search page")
+if __name__ == "__main__":
+ wantedgen()
+ print("Building search page")
def searchgen():
if not os.path.isdir("build/search"):
@@ -1711,9 +1724,9 @@ def searchgen():
content.write("];\n const searchstring = document.getElementById('cardinput').value;\n const searcharray = searchstring.replaceAll(' ','').replaceAll('\\n',',').replaceAll('\\r',',').toLowerCase().split(',');\n const hpwfound = [];\n const mpwfound = [];\n const lpwfound = [];\n const hptfound = [];\n const mptfound = [];\n const lptfound = [];\n for (const element of searcharray) {\n let cardend = element.substring(element.length, element.length - 2);\n if (!(thecards.includes(cardend))) {\n for (const ending of thecards) {\n searcharray.push(element + ending);\n };\n };\n };\n for (const element of searcharray) {\n if (hpw.includes(element)) {\n hpwfound.push(element);\n } else if (mpw.includes(element)) {\n mpwfound.push(element);\n } else if (lpw.includes(element)) {\n lpwfound.push(element);\n } else if (hpt.includes(element)) {\n hptfound.push(element);\n } else if (mpt.includes(element)) {\n mptfound.push(element);\n } else if (lpt.includes(element)) {\n lptfound.push(element);\n };\n };\n if ((hpwfound.length) > 0) {\n document.getElementById('hpwfound').innerHTML = 'Wanted (high priority): ' + hpwfound.join(', ') + '';\n } else {\n document.getElementById('hpwfound').innerHTML = '';\n };\n if ((mpwfound.length) > 0) {\n document.getElementById('mpwfound').innerHTML = 'Wanted (medium priority): ' + mpwfound.join(', ') + '';\n } else {\n document.getElementById('mpwfound').innerHTML = '';\n };\n if ((lpwfound.length) > 0) {\n document.getElementById('lpwfound').innerHTML = 'Wanted (low priority): ' + lpwfound.join(', ') + '';\n } else {\n document.getElementById('lpwfound').innerHTML = '';\n };\n if ((hptfound.length) > 0) {\n document.getElementById('hptfound').innerHTML = 'Will trade out for high priority cards only: ' + hptfound.join(', ') + '';\n } else {\n document.getElementById('hptfound').innerHTML = '';\n };\n if ((mptfound.length) > 0) {\n document.getElementById('mptfound').innerHTML = 'Will trade out for high or medium priority cards: ' + mptfound.join(', ') + '';\n } else {\n document.getElementById('mptfound').innerHTML = '';\n };\n if ((lptfound.length) > 0) {\n document.getElementById('lptfound').innerHTML = 'Will trade out for any wanted card: ' + lptfound.join(', ') + '';\n } else {\n document.getElementById('lptfound').innerHTML = '';\n };\n if ((hpwfound.length) + (mpwfound.length) + (lpwfound.length) + (hptfound.length) + (mptfound.length) + (lptfound.length) == 0) {\n document.getElementById('nothing').innerHTML = 'No results';\n } else {\n document.getElementById('nothing').innerHTML = '';\n }\n }\n\n \n