Commit ef8d2291 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.55'

parents 17029f99 59ecf5a5
......@@ -2,8 +2,15 @@
 
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
#### [10.0.55](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.54...10.0.55)
- Bumped babelfish requirement [`2dfe7dd`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/2dfe7dd41721812859e68b36a9c17c745b517655)
- Bumped lxml [`a750b74`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/a750b748c96df323c23d4d04b6741c68ca2bfbfa)
#### [10.0.54](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.53...10.0.54)
 
> 17 March 2022
- Bumped PyYaml [`81c2da3`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/81c2da37b21bd2c4775171394009440a0235f83c)
 
#### [10.0.53](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.52...10.0.53)
......
{
"name": "sickrage",
"version": "10.0.54",
"version": "10.0.55",
"private": true,
"repository": {
"type": "git",
......
......@@ -6,9 +6,8 @@ appdirs==1.4.4
APScheduler==3.6.3
arrow==0.15.8
asn1crypto==1.4.0
attrdict==2.0.1
attrs==19.3.0
babelfish==0.5.5
babelfish==0.6.0
beautifulsoup4==4.10.0
bencode3==0.1.0
bleach==3.3.0
......@@ -16,6 +15,7 @@ CacheControl==0.12.6
certifi==2021.5.30
cffi==1.14.1
chardet==3.0.4
cleverdict==1.9.2
click==7.1.2
cloudscraper==1.2.46
configobj==5.0.6
......@@ -40,7 +40,7 @@ importlib-metadata==4.11.3
ipaddress==1.0.23
knowit==0.2.4
lockfile==0.12.2
lxml==4.6.1
lxml==4.8.0
Mako==1.1.3
markdown2==2.3.9
MarkupSafe==1.1.1
......
[bumpversion]
current_version = 10.0.54
current_version = 10.0.55
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
......
......@@ -19,7 +19,7 @@
# along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
# ##############################################################################
__version__ = "10.0.54"
__version__ = "10.0.55"
__install_type__ = ""
import argparse
......
This diff is collapsed.
......@@ -1218,7 +1218,7 @@ class Config(object):
self.nma.notify_on_subtitle_download = self._get_config_file_value(config_object, 'NMA', 'nma_notify_onsubtitledownload',
default=self.nma.notify_on_subtitle_download, field_type=bool)
self.nma.api_keys = self._get_config_file_value(config_object, 'NMA', 'nma_api', default=self.nma.api_keys, field_type=str)
self.nma.priority = self._get_config_file_value(config_object, 'NMA', 'nma_priority', default=self.nma.priority, field_type=str)
self.nma.priority = self._get_config_file_value(config_object, 'NMA', 'nma_priority', default=self.nma.priority, field_type=int)
# PUSHALOT SETTINGS
self.pushalot.enable = self._get_config_file_value(config_object, 'Pushalot', 'use_pushalot', default=self.pushalot.enable, field_type=bool)
......@@ -1416,7 +1416,7 @@ class Config(object):
if not field_type:
field_type = str
if not default:
if default is None:
default = field_type() if field_type is not str.upper else str()
if section in config_object:
......@@ -1424,7 +1424,7 @@ class Config(object):
if key in section_object:
try:
value = self.convert_value(section_object.get(key), field_type)
if not value:
if value is None:
return default
return value
except Exception:
......
......@@ -29,7 +29,7 @@ import alembic.script
import sqlalchemy
from alembic.runtime.migration import MigrationContext
from alembic.script import ScriptDirectory
from attrdict import AttrDict
from cleverdict import CleverDict
from sqlalchemy import create_engine, event, inspect, MetaData, Index, TypeDecorator
from sqlalchemy.engine import Engine, reflection, Row
from sqlalchemy.exc import OperationalError
......@@ -123,10 +123,10 @@ class ContextSession(sqlalchemy.orm.Session):
class SRDatabaseBase(object):
def as_dict(self):
return {c.name: getattr(self, c.name) for c in self.__table__.columns}
return {c.key: getattr(self, c.key) for c in inspect(self).mapper.column_attrs}
def as_attrdict(self):
return AttrDict(self.as_dict())
return CleverDict(self.as_dict())
def update(self, **kwargs):
primary_keys = [pk.name for pk in self.__table__.primary_key]
......
"""Initial migration
Revision ID: 7
Revises:
Create Date: 2017-12-29 14:39:27.854291
"""
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision = '7'
down_revision = '6'
def upgrade():
conn = op.get_bind()
meta = sa.MetaData(bind=conn)
nma = sa.Table('nma', meta, autoload=True)
for row in conn.execute(nma.select()):
priority = row.priority
if isinstance(priority, str):
try:
priority = int(priority or 0)
except ValueError:
priority = 0
conn.execute(f'UPDATE nma SET priority = {priority} WHERE nma.id = {row.id}')
def downgrade():
pass
......@@ -42,10 +42,17 @@ import unicodedata
import uuid
import webbrowser
import zipfile
from collections import OrderedDict, Iterable
from collections import OrderedDict
from contextlib import contextmanager
from urllib.parse import uses_netloc, urlsplit, urlunsplit, urljoin
try:
# Python <= 3.9
from collections import Iterable
except ImportError:
# Python > 3.9
from collections.abc import Iterable
import errno
import rarfile
import requests
......
......@@ -81729,7 +81729,7 @@ var debugs = {};
var debugEnviron;
exports.debuglog = function(set) {
if (isUndefined(debugEnviron))
debugEnviron = Object({"SENTRY_DSN":'https://[email protected]/2',"PACKAGE_VERSION":"10.0.54"}).NODE_DEBUG || '';
debugEnviron = Object({"SENTRY_DSN":'https://[email protected]/2',"PACKAGE_VERSION":"10.0.55"}).NODE_DEBUG || '';
set = set.toUpperCase();
if (!debugs[set]) {
if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
......@@ -82538,7 +82538,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
Sentry.init({
dsn: 'https://[email protected]/2',
release: "10.0.54",
release: "10.0.55",
beforeSend: function beforeSend(event, hint) {
if (event.exception) {
event.exception.values[0].stacktrace.frames.forEach(function (frame) {
......@@ -51,13 +51,8 @@
% else:
% for cur_result in popular_shows:
% if not cur_result['imdb_tt'] in imdb_tt:
% if 'rating' in cur_result and cur_result['rating']:
<% cur_rating = cur_result['rating'] %>
<% cur_votes = cur_result['votes'] %>
% else:
<% cur_rating = '0' %>
<% cur_votes = '0' %>
% endif
<% cur_rating = cur_result.get('rating') or '0' %>
<% cur_votes = cur_result.get('votes') or '0' %>
<div class="show-container" data-name="${cur_result['name']}"
data-rating="${cur_rating}"
......
10.0.54
\ No newline at end of file
10.0.55
\ No newline at end of file
Supports Markdown
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