mirror
/
mylar
mirror of https://github.com/evilhero/mylar
1
0
Fork 0
Code Issues Releases Wiki Activity

Added Paused status to weekly pull list to show series that are in a Paused status, but would have been marked as Wanted otherwise

This commit is contained in:
evilhero 2017-11-18 14:32:30 -05:00
parent e4541708b8
commit a6ee85c9ae
4 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/interfaces/default/css/data_table.css
View File

@ -341,6 +341,14 @@ table.display tr.odd.gradeZ {
table.display tr.even.gradeZ {
background-color: white;
}
table.display tr.odd.gradeT {
background-color: #F9CBE6;
}
table.display tr.even.gradeT {
background-color: #F9CBE6;
}
table.display tr.gradeL #status {
background: url("../images/loader_black.gif") no-repeat scroll 15px center transparent;
font-size: 11px;
@ -355,6 +363,7 @@ table.display tr.gradeX td,
table.display tr.gradeU td,
table.display tr.gradeP td,
table.display tr.gradeD td,
table.display tr.gradeT td,
table.display tr.gradeZ td {border-bottom: 1px solid #FFF;}
table.display tr:last-child td {
border-bottom: 1px solid #eee;
@ -433,6 +442,18 @@ table.display_no_select tr.odd.gradeD {
background-color: #C7EFC7;
}
table.display_no_select tr.even.gradeD {
background-color: #C7EFC7;
}
table.display_no_select tr.odd.gradeT {
background-color: #F9CBE6;
}
table.display_no_select tr.even.gradeT {
background-color: #F9CBE6;
}
table.display_no_select tr.odd.gradeZ {
background-color: #FAFAFA;
}
@ -454,6 +475,7 @@ table.display_no_select tr.gradeX td,
table.display_no_select tr.gradeU td,
table.display_no_select tr.gradeP td,
table.display_no_select tr.gradeD td,
table.display_no_select tr.gradeT td,
table.display_no_select tr.gradeZ td {border-bottom: 1px solid #FFF;}
table.display_no_select tr:last-child td {
border-bottom: 1px solid #eee;

4
data/interfaces/default/weeklypull.html
View File

@ -76,8 +76,8 @@
grade = 'C'
elif weekly['STATUS'] == 'Downloaded':
grade = 'D'
else:
grade = 'A'
elif weekly['STATUS'] == 'Paused':
grade = 'T'
if weekly['AUTOWANT'] == True:
grade = 'H'

14
mylar/helpers.py
View File

@ -1822,15 +1822,13 @@ def listLibrary():
import db
library = {}
myDB = db.DBConnection()
# Get individual comics
list = myDB.select("SELECT ComicId FROM Comics")
list = myDB.select("SELECT a.comicid, b.releasecomicid, a.status FROM Comics AS a LEFT JOIN annuals AS b on a.comicid=b.comicid group by a.comicid")
for row in list:
library[row['ComicID']] = row['ComicID']
# Add the annuals
if mylar.CONFIG.ANNUALS_ON:
list = myDB.select("SELECT ReleaseComicId,ComicID FROM Annuals")
for row in list:
library[row['ReleaseComicId']] = row['ComicID']
library[row['ComicID']] = {'comicid': row['ComicID'],
'status': row['Status']}
if row['ReleaseComicID'] is not None:
library[row['ReleaseComicID']] = {'comicid': row['ComicID'],
'status': row['Status']}
return library
def listStoryArcs():

8
mylar/webserve.py
View File

@ -1528,14 +1528,16 @@ class WebInterface(object):
xfound = False
tmp_status = weekly['Status']
if weekly['ComicID'] in watchlibrary:
haveit = watchlibrary[weekly['ComicID']]
haveit = watchlibrary[weekly['ComicID']]['comicid']
if weekinfo['weeknumber']:
if any([week >= int(weekinfo['weeknumber']), week is None]) and all([mylar.CONFIG.AUTOWANT_UPCOMING, tmp_status == 'Skipped']):
if watchlibrary[weekly['ComicID']]['status'] == 'Paused':
tmp_status = 'Paused'
elif any([week >= int(weekinfo['weeknumber']), week is None]) and all([mylar.CONFIG.AUTOWANT_UPCOMING, tmp_status == 'Skipped']):
tmp_status = 'Wanted'
for x in issueLibrary:
if weekly['IssueID'] == x['IssueID']:
if weekly['IssueID'] == x['IssueID'] and tmp_status != 'Paused':
xfound = True
tmp_status = x['Status']
break