Merge branch 'release/10.0.41'

CHANGELOG.md

@@ -2,8 +2,17 @@
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
+#### [10.0.41](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.40...10.0.41)
+
+- cleaned up oauth2 offline token migration code [`f0db748`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/f0db74855dc5c3f6e466aee2dc0aa4b5fb4f4a91)
+- cleaned up oauth2 offline token migration code [`2f2a708`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/2f2a7080e171b0852124a96758968de2b05dd812)
+- skip search cache results if series provider id is none [`45ef300`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/45ef300f168a1942b2efb61941d13482956e1f53)
+- updated package.json [`d42b20d`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/d42b20d0d49422ac82d70df1d3f4f6d70ecf83b7)
+
 #### [10.0.40](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.39...10.0.40)
+> 2 October 2021
+
 - removed import of pycountry, not needed [`9fac4ea`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/9fac4ea0e6e2680a9519cf48231f75aeb5c71951)
 #### [10.0.39](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.38...10.0.39)

package.json

 {
  "name": "sickrage",
- "version": "10.0.40",
+ "version": "10.0.41",
  "private": true,
  "repository": {
  "type": "git",
@@ -11,7 +11,7 @@
  },
  "homepage": "https://www.sickrage.ca",
  "scripts": {
- "build": "webpack --config webpack.config.js -p"
+ "build": "webpack --config webpack.config.js"
  },
  "devDependencies": {
  "@fortawesome/fontawesome-free": "~5.14.0",
@@ -59,11 +59,12 @@
  "tooltipster": "~4.2.6",
  "ttag": "~1.7.22",
  "underscore": "~1.9.1",
- "webpack": "~4.44.0",
- "webpack-cli": "~3.3.11",
+ "webpack": "^4.44.2",
+ "webpack-cli": "^4.8.0",
  "webpack-spritesmith": "~1.1.0"
  },
  "dependencies": {
- "auto-changelog": "~2.2.1"
+ "auto-changelog": "~2.2.1",
+ "yarn": "^1.22.15"
  }
 }

setup.cfg

 [bumpversion]
-current_version = 10.0.40
+current_version = 10.0.41
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?

sickrage/__init__.py

@@ -19,7 +19,7 @@
 # along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
 # ##############################################################################
 
-__version__ = "10.0.40"
+__version__ = "10.0.41"
 __install_type__ = ""
 
 import argparse

sickrage/checksums.md5

-sickrage/__init__.py = 4b174ecfe77228d6b6425b1e5f673a67
+sickrage/__init__.py = 2f310a7771c8ff288a91d6e8f0fd6e01
 sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
-sickrage/version.txt = 56c4a3137ad1f84f09548f0904837557
+sickrage/version.txt = 860f984eb337f131c9f46cba7a971408
 sickrage/autoProcessTV/hellaToSiCKRAGE.py = 9bc477abfd456aaba8d6bf46f2c59b1f
 sickrage/autoProcessTV/__init__.py = bfa892dee586740a3a618d3c1955156c
 sickrage/autoProcessTV/mediaToSiCKRAGE.py = f88a6679a211b1f97126c116e2c33b9c
@@ -60,7 +60,7 @@ sickrage/core/announcements.py = 6c3ed44e7ae50c281383ab5f278102c6
 sickrage/core/google_drive.py = 0129b53b8a649fa7c55bfe0c5ad11bdb
 sickrage/core/__init__.py = 8251e573ba25be4105a7a27d0669ae34
 sickrage/core/process_tv.py = 192c68108d5b5d1d0c84c7865209e21d
-sickrage/core/enums.py = 98b3f298adbb0a78fd4a36f251ff1d44
+sickrage/core/enums.py = 5a8fac089e8c4451a1d6b28c1762e684
 sickrage/core/classes.py = ca0d7c07b684b8fe22788346dc755fd8
 sickrage/core/blackandwhitelist.py = 9d0a8e2aae2353a842306730c2690c2c
 sickrage/core/search.py = bcb6d5972f5808d7ab9570a8a39b2d02
@@ -132,10 +132,11 @@ sickrage/core/webserver/handlers/api/v2/postprocess/__init__.py = 0c2bf1754d86ee
 sickrage/core/webserver/handlers/api/v2/postprocess/schemas.py = 994d368e0a2321b8311700d613695563
 sickrage/core/webserver/handlers/api/v2/series/__init__.py = b6a2057bf7bdcca9f95a16baec36d63c
 sickrage/core/webserver/handlers/api/v2/series/schemas.py = b5159b40ee6d67aa04a85de7c7810284
-sickrage/core/webserver/static/css/core.min.css = 05ca1e9c48f013d71d97ecec458b9f76
+sickrage/core/webserver/static/css/core.min.css = cb7b1d9bbd30ae087976c1eff3c5926f
 sickrage/core/webserver/static/images/ui-icons_555555_256x240.png = 971364734f3b603e5d363a2634898b42
 sickrage/core/webserver/static/images/ui-icons_777777_256x240.png = 73a1fd052c9d84c0ee0bea3ee85892ed
 sickrage/core/webserver/static/images/favicon.ico = 6627b9f36868075dd46e5886d3a55a8c
+sickrage/core/webserver/static/images/sickrage-series-providers.png = c4ed039c33c8bb16b9479b1e17fde852
 sickrage/core/webserver/static/images/sickrage-subtitles.png = adc2bc36d6ce96731911947cabb3bf78
 sickrage/core/webserver/static/images/sickrage-flags.png = 91c59b13f0279a89ed7e46bc02e1a788
 sickrage/core/webserver/static/images/sickrage-search-providers.png = e0ef1ebbd7256966261d4fe759da18ab
@@ -144,7 +145,7 @@ sickrage/core/webserver/static/images/sickrage-notification-providers.png = d75f
 sickrage/core/webserver/static/images/bootstrap-formhelpers-countries.flags.png = 8404ee935503dfec7a38ffe093f73e05
 sickrage/core/webserver/static/images/banner.png = 56232ad7614dbd0dbbd478d7f5179cda
 sickrage/core/webserver/static/images/ui-icons_ffffff_256x240.png = bf27228a7d3957983584fa7698121ea1
-sickrage/core/webserver/static/images/sickrage-core.png = 5f11bf28c7d98760cc49ce9ed907dc85
+sickrage/core/webserver/static/images/sickrage-core.png = 3e6c0e4f4d8a037fffed2b5ad511d1cb
 sickrage/core/webserver/static/images/ui-icons_777620_256x240.png = 208a290102a4ada58a04de354a1354d7
 sickrage/core/webserver/static/images/logo.png = 538f988fc423c21e1447018e4b699b5a
 sickrage/core/webserver/static/images/logo-badge.png = 920d5019038a2d684fe95f05a9872158
@@ -165,8 +166,8 @@ sickrage/core/webserver/static/images/backdrops/manage.jpg = 2e49098c0ed9aacf602
 sickrage/core/webserver/static/images/backdrops/addshows.jpg = 7f3e186790208b63dadda09d6b91d334
 sickrage/core/webserver/static/images/backdrops/home.jpg = 804dfc976638bbf45df310a3627e2d5c
 sickrage/core/webserver/static/images/backdrops/schedule.jpg = 0c0e5f4dcee42bfcfb73de100f1d3015
-sickrage/core/webserver/static/js/core.js.map = 73b7eaf0f33b30114100ec4829cae652
-sickrage/core/webserver/static/js/core.min.js = 778f45372ac1251a2802c6b81f9479ef
+sickrage/core/webserver/static/js/core.js.map = be33ec5ca974c15445ede6dfa1d62594
+sickrage/core/webserver/static/js/core.min.js = 1802c2aabe8a7d6f41ff2c3143542e9d
 sickrage/core/webserver/static/fonts/fa-solid-900.eot = 89bd2e38475e441a5cd70f663f921d61
 sickrage/core/webserver/static/fonts/fa-regular-400.eot = ad3a7c0d77e09602f4ab73db3660ffd8
 sickrage/core/webserver/static/fonts/fa-brands-400.eot = 0fabb6606be4c45acfeedd115d0caca4
@@ -193,7 +194,7 @@ sickrage/core/webserver/views/home/test_renaming.mako = d0295056378d687b18c70502
 sickrage/core/webserver/views/home/trakt_shows.mako = 09a95e4badea76e427946773a6cfa650
 sickrage/core/webserver/views/home/new_show.mako = df46b30a58792d3fe63cd6b7389e36cc
 sickrage/core/webserver/views/home/server_status.mako = 35c73890074a64a60f2c761d9503a138
-sickrage/core/webserver/views/home/display_show.mako = 6a6d97706df547c8409627d16c304c68
+sickrage/core/webserver/views/home/display_show.mako = 586f8316f7d818de5346a5b74e2b7ccf
 sickrage/core/webserver/views/home/add_shows.mako = 388debd9471602a25e302a6fb202f587
 sickrage/core/webserver/views/home/imdb_shows.mako = 46f8df797cf0c4dd03d9d61a55ad5bf0
 sickrage/core/webserver/views/home/mass_add_table.mako = f5ddb3d4d96a536f5f58fc5c4daeb104
@@ -253,13 +254,13 @@ sickrage/core/helpers/anidb.py = 69f80b887bc822499ecefbd5ec52ef5c
 sickrage/core/helpers/encryption.py = 8a74f080644fcfe249e56e8a31c2f62e
 sickrage/core/helpers/srdatetime.py = 1ec93b21792f45dbcd8a574c02db4d34
 sickrage/core/caches/image_cache.py = 9cb69a640aa8ca10f7718f36b9a2884e
-sickrage/core/caches/tv_cache.py = 77a4b9bb85c0333e95a503001671dc25
+sickrage/core/caches/tv_cache.py = f8ce584c2fdd44681b6f79b662fdcfbe
 sickrage/core/caches/__init__.py = bf0bdb641ddd7af015537ca503e49977
 sickrage/core/caches/name_cache.py = 8cceca1983838af2e581c6187912b2cc
 sickrage/core/amqp/__init__.py = d64bec8a41b2f2d393b309eb2f33f5f0
 sickrage/core/amqp/consumer.py = 8c7d9aaf2f084c41c7fb1b35394adbed
 sickrage/core/databases/__init__.py = b232e45d8996a662866178c2d6d6169b
-sickrage/core/databases/config/__init__.py = fa5ccb040e3898e526eb4d3c56872ea7
+sickrage/core/databases/config/__init__.py = 6c49d7f57b071683dd92f5534d3ad41f
 sickrage/core/databases/config/schemas.py = fb5ab0a7e0b851bb5fef6f4a7cd55912
 sickrage/core/databases/config/migrations/env.py = 5cdd195b4adf08a9eda769316ffcc57d
 sickrage/core/databases/config/migrations/script.py.mako = 55bff267625bd1f0799d24848df6c3e8
@@ -279,7 +280,7 @@ sickrage/core/databases/cache/migrations/versions/008_Drop_QuickSearch_Tables.py
 sickrage/core/databases/cache/migrations/versions/003_Rename_IndexerID_To_SeriesID_On_Provider_Table.py = ad113c83b459f0ebf82fefaaf6750f84
 sickrage/core/databases/cache/migrations/versions/006_Add_Session_State_Column_To_OAuth2Token_Table.py = 1ec44e448315a95b5ca825c13f9326e5
 sickrage/core/databases/cache/migrations/versions/004_Add_OAuth2Token_Table.py = caca51f0c9069e59b9e4b430a842ddb7
-sickrage/core/databases/cache/migrations/versions/010_Remove_OAuth2Token_Table.py = b83de6e437da11db7f899083ad071870
+sickrage/core/databases/cache/migrations/versions/010_Remove_OAuth2Token_Table.py = 349f969a2aec5e5acfea584e6fbbd2ee
 sickrage/core/databases/main/__init__.py = e99217a8bcc3e5ef41741aebb789e751
 sickrage/core/databases/main/schemas.py = 7264494b24575ea1dcab57f0b3edc01d
 sickrage/core/databases/main/migrations/env.py = 5cdd195b4adf08a9eda769316ffcc57d

sickrage/core/caches/tv_cache.py

@@ -286,6 +286,10 @@ class TVCache(object):
  result.series_id = int(curResult["series_id"])
  result.series_provider_id = curResult["series_provider_id"]
 
+ # skip if series provider id is not set
+ if not curResult["series_provider_id"]:
+ continue
+
  # convert to series provider id enum
  if not isinstance(result.series_provider_id, SeriesProviderID):
  result.series_provider_id = SeriesProviderID[curResult["series_provider_id"]]

sickrage/core/databases/cache/migrations/versions/010_Remove_OAuth2Token_Table.py

@@ -11,6 +11,7 @@ from json import JSONDecodeError
 
 import sqlalchemy as sa
 from alembic import op
+from keycloak.exceptions import KeycloakClientError
 from sqlalchemy import orm
 
 import sickrage
@@ -27,22 +28,27 @@ def upgrade():
  meta = sa.MetaData(bind=conn)
  oauth2_token = sa.Table('oauth2_token', meta, autoload=True)
 
- certs = sickrage.app.auth_server.certs()
-
+ refresh_token = None
  with op.get_context().begin_transaction():
  for row in conn.execute(oauth2_token.select()):
  refresh_token = row.refresh_token
-
- new_token = sickrage.app.auth_server.refresh_token(refresh_token)
- decoded_token = sickrage.app.auth_server.decode_token(new_token['access_token'], certs)
- apikey = decoded_token['apikey']
+ if refresh_token:
+ break
 
  try:
- session = sickrage.app.config.db.session()
- general = session.query(ConfigDB.General).one()
- general.sso_api_key = apikey
- session.commit()
- except orm.exc.NoResultFound:
+ if refresh_token:
+ certs = sickrage.app.auth_server.certs()
+ if certs:
+ new_token = sickrage.app.auth_server.refresh_token(refresh_token)
+ if new_token:
+ decoded_token = sickrage.app.auth_server.decode_token(new_token['access_token'], certs)
+ apikey = decoded_token.get('apikey')
+ if apikey:
+ session = sickrage.app.config.db.session()
+ general = session.query(ConfigDB.General).one()
+ general.sso_api_key = apikey
+ session.commit()
+ except (KeycloakClientError, orm.exc.NoResultFound):
  pass
 
  if conn.engine.dialect.has_table(conn.engine, 'oauth2_token'):

sickrage/core/databases/config/__init__.py

@@ -145,7 +145,7 @@ class ConfigDB(SRDatabase):
  https_key = Column(Text, default='server.key')
  https_cert = Column(Text, default='server.crt')
  allow_high_priority = Column(Boolean, default=False)
- anon_redirect = Column(Text, default='http://nullrefer.com/?')
+ anon_redirect = Column(Text, default='https://anonym.to/?')
  series_provider_timeout = Column(Integer, default=20)
  web_use_gzip = Column(Boolean, default=True)
  daily_searcher_freq = Column(Integer, default=40)

sickrage/core/enums.py

@@ -22,20 +22,17 @@ import enum
 
 
 class SeriesProviderID(enum.Enum):
- SICKRAGE = 'sickrage'
  THETVDB = 'thetvdb'
 
  @property
  def _strings(self):
  return {
- self.SICKRAGE.name: 'SiCKRAGE',
  self.THETVDB.name: 'TheTVDB'
  }
 
  @property
  def _slug_strings(self):
  return {
- self.SICKRAGE.name: 'sickrage',
  self.THETVDB.name: 'thetvdb'
  }
 

sickrage/core/webserver/views/home/display_show.mako

@@ -158,8 +158,8 @@
 
  <a href="${anon_url(show.series_provider.show_url, show.series_id)}"
  onclick="window.open(this.href, '_blank'); return false;"
- title="<% show.series_provider.show_url + str(show.series_id) %>">
- <i class="sickrage-core sickrage-core-${show.series_provider.name.lower()}"
+ title="${show.series_provider.show_url}${str(show.series_id)}">
+ <i class="sickrage-series-providers sickrage-series-providers-${show.series_provider.name.lower()}"
  style="margin-top: -1px; vertical-align:middle;"></i>
  </a>
  </div>

sickrage/version.txt

-10.0.40
\ No newline at end of file
+10.0.41
\ No newline at end of file

src/app.js

@@ -4,6 +4,7 @@ require('./spritesmith-generated/sickrage-core.css');
 require('./spritesmith-generated/sickrage-notification-providers.css');
 require('./spritesmith-generated/sickrage-network.css');
 require('./spritesmith-generated/sickrage-search-providers.css');
+require('./spritesmith-generated/sickrage-series-providers.css');
 require('./spritesmith-generated/sickrage-subtitles.css');
 require('./spritesmith-generated/sickrage-flags.css');
 

webpack.config.js

@@ -152,19 +152,20 @@ module.exports = {
  makeSprite('network'),
  makeSprite('notification-providers'),
  makeSprite('search-providers'),
+ makeSprite('series-providers'),
  makeSprite('subtitles'),
  makeSprite('flags')
  ]
 };
 
-if (process.env.ENABLE_SENTRY_RELEASE.toLowerCase() === 'true') {
- module.exports.plugins.push(
- new SentryWebpackPlugin({
- release: version,
- include: path.resolve(__dirname, 'sickrage/core/webserver/static/js'),
- ignoreFile: '.sentrycliignore',
- ignore: ['node_modules', 'webpack.config.js'],
- configFile: 'sentry.properties'
- }),
- )
-}
\ No newline at end of file
+// if (process.env.ENABLE_SENTRY_RELEASE.toLowerCase() === 'true') {
+// module.exports.plugins.push(
+// new SentryWebpackPlugin({
+// release: version,
+// include: path.resolve(__dirname, 'sickrage/core/webserver/static/js'),
+// ignoreFile: '.sentrycliignore',
+// ignore: ['node_modules', 'webpack.config.js'],
+// configFile: 'sentry.properties'
+// }),
+// )
+// }
\ No newline at end of file