Commit 47a91385 authored by echel0n's avatar echel0n

Merge branch 'release/9.1.52'

parents 0b218f26 c5143b6a
# Changelog
- * 29d554a - 2017-10-24: updated readme logo
- * 0399ce3 - 2017-10-24: Release v9.1.52
- * 7772474 - 2017-10-24: Updated url to favicon for notifications
- * 68ee394 - 2017-10-24: Updated url to favicon for notifications
- * 9b6fd8b - 2017-10-24: Added MISSED labeling to show display view
- * 036fc03 - 2017-10-24: Refactoring requirements.txt
- * 2a15a42 - 2017-10-24: Refactoring requirements.txt
- * c7de2b3 - 2017-10-24: Refactoring requirements.txt
- * 3df51c0 - 2017-10-24: Refactoring requirements.txt
- * dfdaf49 - 2017-10-24: Fixed setup import errors for babel
- * 0b218f2 - 2017-10-24: updated readme logo
- * 9ca9dc4 - 2017-10-24: Release v9.1.51
- * e94d370 - 2017-10-24: Release v9.1.50
- * 151fb91 - 2017-10-24: Changed urls for network timezones and scene exceptions to use our new CDN server address
......
......@@ -961,13 +961,18 @@ ul.tags li a {
}
.wanted {
background-color: #ffb0b0;
background-color: #ff9f38;
}
.snatched {
background-color: #ebc1ea;
}
.missed {
background-color: #ffb0b0;
}
span.unaired {
color: #584b20;
border: 1px solid #584b20;
......@@ -989,8 +994,8 @@ span.qual {
}
span.wanted {
color: #890000;
border: 1px solid #890000;
color: #894305;
border: 1px solid #894305;
}
span.snatched {
......@@ -998,11 +1003,17 @@ span.snatched {
border: 1px solid #652164;
}
span.missed {
color: #890000;
border: 1px solid #890000;
}
span.unaired b,
span.skipped b,
span.good b,
span.qual b,
span.wanted b,
span.missed b,
span.snatched b {
color: #000000;
font-weight: 800;
......
......@@ -29,7 +29,7 @@ jQuery(document).ready(function ($) {
},
notify: function (type, title, message) {
var myDesktop = {'desktop': true, 'icon': SICKRAGE.srWebRoot + '/images/ico/favicon-96x96.png'};
var myDesktop = {'desktop': true, 'icon': SICKRAGE.srWebRoot + '/images/favicon.png'};
var myStack = {'dir1': 'up', 'dir2': 'left', 'firstpos1': 25, 'firstpos2': 25};
PNotify.desktop.permission();
......
......@@ -16,7 +16,6 @@ Mako == 1.0.7
markdown2 == 2.3.3
oauth2 == 1.9.0.post1
profilehooks == 1.9.0
requests_futures == 0.9.7
Send2Trash == 1.3.0
six == 1.10.0
subliminal == 2.0.5
......@@ -28,7 +27,6 @@ python_dateutil == 2.6.0
pynzb == 0.1.0
futures == 3.0.5
gi == 1.2
PyGithub == 1.33.0
gntp == 1.0.3
google_api_python_client == 1.5.1
python_twitter == 3.2.1
......
......@@ -7,21 +7,21 @@ universal = 1
[extract_messages]
width = 80
charset = utf-8
output-file = sickrage/locale/messages.pot
output_file = sickrage/locale/messages.pot
keywords = gt
copyright-holder = SiCKRAGE
msgid-bugs-address = [email protected]
add-comments = TRANSLATORS:
copyright_holder = SiCKRAGE
msgid_bugs_address = [email protected]
add_comments = TRANSLATORS:
[compile_catalog]
directory = sickrage/locale
[init_catalog]
output-dir = sickrage/locale
input-file = sickrage/locale/messages.pot
output_dir = sickrage/locale
input_file = sickrage/locale/messages.pot
[update_catalog]
output-dir = sickrage/locale
input-file = sickrage/locale/messages.pot
ignore-obsolete = true
output_dir = sickrage/locale
input_file = sickrage/locale/messages.pot
ignore_obsolete = true
previous = true
\ No newline at end of file
......@@ -3,7 +3,6 @@ import io
import os
import shutil
from babel.messages import frontend as babel
from setuptools import setup, Command
# Get the version number
......@@ -33,6 +32,22 @@ class CleanCommand(Command):
shutil.rmtree(os.path.abspath(os.path.join(os.path.dirname(__file__), 'sickrage.egg-info')), ignore_errors=True)
[os.remove(f) for f in glob.glob("dist/sickrage-*")]
cmd_class = {'clean': CleanCommand}
# Check for Babel availability
try:
from babel.messages.frontend import compile_catalog, extract_messages, init_catalog, update_catalog
cmd_class.update(dict(
compile_catalog=compile_catalog,
extract_messages=extract_messages,
init_catalog=init_catalog,
update_catalog=update_catalog
))
except ImportError:
pass
setup(
name='sickrage',
version=version,
......@@ -48,13 +63,7 @@ setup(
platforms='any',
zip_safe=False,
test_suite='tests',
cmdclass={
'clean': CleanCommand,
'compile_catalog': babel.compile_catalog,
'extract_messages': babel.extract_messages,
'init_catalog': babel.init_catalog,
'update_catalog': babel.update_catalog
},
cmdclass=cmd_class,
entry_points={
"console_scripts": [
"sickrage=sickrage:main"
......
......@@ -612,6 +612,7 @@ class Overview(object):
WANTED = WANTED # 3
GOOD = 4
SKIPPED = SKIPPED # 5
MISSED = 6 # 6
# For both snatched statuses. Note: SNATCHED/QUAL have same value and break dict.
SNATCHED = SNATCHED_PROPER = SNATCHED_BEST # 9
......@@ -621,7 +622,8 @@ class Overview(object):
QUAL: "qual",
GOOD: "good",
UNAIRED: "unaired",
SNATCHED: "snatched"}
SNATCHED: "snatched",
MISSED: "missed"}
def get_quality_string(quality):
......
......@@ -342,18 +342,6 @@ class UpdateManager(object):
def get_update_url():
return "{}/home/update/?pid={}".format(sickrage.srCore.srConfig.WEB_ROOT, sickrage.srCore.PID)
@staticmethod
def github():
import github
try:
return github.Github(
login_or_token=sickrage.srCore.srConfig.GIT_USERNAME,
password=sickrage.srCore.srConfig.GIT_PASSWORD,
user_agent="SiCKRAGE")
except Exception:
return github.Github(user_agent="SiCKRAGE")
def install_requirements(self):
__, __, exit_status = self._pip_cmd(self._pip_path,
'install --no-cache-dir --user -r {}'.format(sickrage.REQS_FILE))
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -801,11 +801,14 @@ ul.tags li a {
background-color: #ffda8a; }
.wanted {
background-color: #ffb0b0; }
background-color: #ff9f38; }
.snatched {
background-color: #ebc1ea; }
.missed {
background-color: #ffb0b0; }
span.unaired {
color: #584b20;
border: 1px solid #584b20; }
......@@ -823,18 +826,23 @@ span.qual {
border: 1px solid #765100; }
span.wanted {
color: #890000;
border: 1px solid #890000; }
color: #894305;
border: 1px solid #894305; }
span.snatched {
color: #652164;
border: 1px solid #652164; }
span.missed {
color: #890000;
border: 1px solid #890000; }
span.unaired b,
span.skipped b,
span.good b,
span.qual b,
span.wanted b,
span.missed b,
span.snatched b {
color: #000000;
font-weight: 800; }
......
......@@ -61,6 +61,7 @@ from sickrage.core.helpers import argToBool, backupSR, chmodAsParent, findCertai
clean_hosts
from sickrage.core.helpers.browser import foldersAtPath
from sickrage.core.helpers.compat import cmp
from sickrage.core.helpers.srdatetime import srDateTime
from sickrage.core.imdb_popular import imdbPopular
from sickrage.core.media.util import indexerImage
from sickrage.core.nameparser import validator
......@@ -1161,7 +1162,6 @@ class Home(WebHandler):
return self.redirect('/' + sickrage.srCore.srConfig.DEFAULT_PAGE + '/')
def displayShow(self, show=None):
if show is None:
return self._genericMessage(_("Error"), _("Invalid show ID"))
else:
......@@ -1244,9 +1244,20 @@ class Home(WebHandler):
epCounts[Overview.GOOD] = 0
epCounts[Overview.UNAIRED] = 0
epCounts[Overview.SNATCHED] = 0
epCounts[Overview.MISSED] = 0
for curEp in episodeResults:
curEpCat = showObj.getOverview(int(curEp['status'] or -1))
if curEp['airdate'] != 1:
today = datetime.datetime.now().replace(tzinfo=tz_updater.sr_timezone)
airDate = datetime.datetime.fromordinal(curEp['airdate'])
if airDate.year >= 1970 or showObj.network:
airDate = srDateTime.convert_to_setting(
tz_updater.parse_date_time(airDate, showObj.airs, showObj.network))
if curEpCat == Overview.WANTED and airDate < today:
curEpCat = Overview.MISSED
if curEpCat:
epCats[str(curEp['season']) + "x" + str(curEp['episode'])] = curEpCat
epCounts[curEpCat] += 1
......
......@@ -415,6 +415,12 @@
<div class="col-md-6 pull-right">
<div class="pull-right" id="checkboxControls">
<div>
<label class="pull-right" for="missed" style="padding-bottom: 5px;">
<span class="missed">
<input type="checkbox" id="missed" checked/>
${_('Missed:')} <b>${epCounts[Overview.MISSED]}</b>
</span>
</label>
<label class="pull-right" for="wanted" style="padding-bottom: 5px;">
<span class="wanted">
<input type="checkbox" id="wanted" checked/>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -121,7 +121,7 @@ class LibnotifyNotifier(srNotifiers):
# Can't make this a global constant because PROG_DIR isn't available
# when the module is imported.
icon_path = os.path.join(sickrage.srCore.srConfig.GUI_STATIC_DIR, 'images', 'ico', 'favicon-96x96.png')
icon_path = os.path.join(sickrage.srCore.srConfig.GUI_STATIC_DIR, 'images', 'favicon.png')
# If the session bus can't be acquired here a bunch of warning messages
# will be printed but the call to show() will still return True.
......
9.1.51
\ No newline at end of file
9.1.52
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment