added new icon for TheTVDB series provider

switched anonymous referrer to anonym.to
fixed local variable 'refresh_token' referenced before assignment in cache offline token migration

package.json

@@ -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"
  }
 }

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

@@ -27,23 +27,24 @@ 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']
-
- try:
- session = sickrage.app.config.db.session()
- general = session.query(ConfigDB.General).one()
- general.sso_api_key = apikey
- session.commit()
- except orm.exc.NoResultFound:
- pass
+ if refresh_token:
+ certs = sickrage.app.auth_server.certs()
+ 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']
+
+ try:
+ session = sickrage.app.config.db.session()
+ general = session.query(ConfigDB.General).one()
+ general.sso_api_key = apikey
+ session.commit()
+ except orm.exc.NoResultFound:
+ pass
 
  if conn.engine.dialect.has_table(conn.engine, 'oauth2_token'):
  op.drop_table('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>

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