FrederikBaerentsen/ComicOPDS
1
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

Fixed random

Browse Source
This commit is contained in:
FrederikBaerentsen 2023-05-17 22:42:53 +02:00
parent d7f38882f2
commit 04b2354d51
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main.py
View File

@ -47,7 +47,7 @@ def startpage():
conn = sqlite3.connect('app.db') conn = sqlite3.connect('app.db')
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("create table COMICS (CVDB,ISSUE,SERIES,VOLUME, PUBLISHER, TITLE, FILE,PATH,UPDATED,PRIMARY KEY(CVDB))") cursor.execute("create table COMICS (CVDB,ISSUE,SERIES,VOLUME, YEAR, PUBLISHER, TITLE, FILE,PATH,UPDATED,PRIMARY KEY(CVDB))")
result = cursor.fetchall() result = cursor.fetchall()
conn.close() conn.close()
config._print("Encrypted") config._print("Encrypted")
@ -68,16 +68,17 @@ def startpage():
cursor = conn.cursor() cursor = conn.cursor()
try: try:
cursor.execute("select * from comics LIMIT " + str(config.DEFAULT_SEARCH_NUMBER) + ";") cursor.execute("select * from comics where CVDB in (SELECT CVDB from comics order by RANDOM() LIMIT " + str(config.DEFAULT_SEARCH_NUMBER) + ");")
result = cursor.fetchall() result = cursor.fetchall()
pub_list = ["Marvel", "DC Comics","Dark Horse Comics","Oni Press"] pub_list = ["Marvel", "DC Comics","Dark Horse Comics", "Dynamite Entertainment", "Oni Press"]
count = [] count = []
for i in pub_list: for i in pub_list:
cursor.execute("select count(*) from comics where Publisher = '" + i + "';") cursor.execute("select count(*) from comics where Publisher = '" + i + "';")
count.append(cursor.fetchone()[0]) count.append(cursor.fetchone()[0])
cursor.execute("SELECT volume, COUNT(volume) FROM comics GROUP BY volume ORDER BY volume;") #cursor.execute("SELECT volume, COUNT(volume) FROM comics GROUP BY volume ORDER BY volume;")
cursor.execute("SELECT year, COUNT(year) FROM comics GROUP BY year ORDER BY year;")
volume = cursor.fetchall() volume = cursor.fetchall()
@ -206,6 +207,7 @@ def import2sql():
ISSUE=Bs_data.select('Number')[0].text ISSUE=Bs_data.select('Number')[0].text
SERIES=Bs_data.select('Series')[0].text SERIES=Bs_data.select('Series')[0].text
VOLUME=Bs_data.select('Volume')[0].text VOLUME=Bs_data.select('Volume')[0].text
YEAR=Bs_data.select('Year')[0].text
PUBLISHER=Bs_data.select('Publisher')[0].text PUBLISHER=Bs_data.select('Publisher')[0].text
try: try:
TITLE=Bs_data.select('Title')[0].text TITLE=Bs_data.select('Title')[0].text
@ -226,7 +228,7 @@ def import2sql():
except: except:
savedmodtime = 0 savedmodtime = 0
if savedmodtime < filemodtime: if savedmodtime < filemodtime:
conn.execute("INSERT OR REPLACE INTO COMICS (CVDB,ISSUE,SERIES,VOLUME, PUBLISHER, TITLE, FILE,PATH,UPDATED) VALUES (?,?,?,?,?,?,?,?,?)", (CVDB, ISSUE, SERIES, VOLUME, PUBLISHER, TITLE, file, f, UPDATED)) conn.execute("INSERT OR REPLACE INTO COMICS (CVDB,ISSUE,SERIES,VOLUME, YEAR, PUBLISHER, TITLE, FILE,PATH,UPDATED) VALUES (?,?,?,?,?,?,?,?,?,?)", (CVDB, ISSUE, SERIES, VOLUME, YEAR, PUBLISHER, TITLE, file, f, UPDATED))
conn.commit() conn.commit()
config._print("Adding: " + str(CVDB)) config._print("Adding: " + str(CVDB))
importcount = importcount + 1 importcount = importcount + 1

3
templates/start.html
View File

@ -28,7 +28,7 @@
<script> <script>
var xValues = {{ pub_list | safe }}; var xValues = {{ pub_list | safe }};
var yValues = {{ count }}; var yValues = {{ count }};
var barColors = ["red", "green","blue","orange"]; var barColors = ["red", "green","blue","orange", "purple"];
new Chart("myChart", { new Chart("myChart", {
type: "bar", type: "bar",
@ -76,7 +76,6 @@ new Chart("myChart3", {
<table id="comics"> <table id="comics">
{% for i in result %} {% for i in result %}
<tr> <tr>