Commit a4055ed8 authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/10.0.37'

parents 63872148 206c862d
...@@ -2,8 +2,14 @@ ...@@ -2,8 +2,14 @@
   
All notable changes to this project will be documented in this file. Dates are displayed in UTC. All notable changes to this project will be documented in this file. Dates are displayed in UTC.
   
#### [10.0.37](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.36...10.0.37)
- Fixed cache database migration issues related to oauth2 and announcements tables [`d239c77`](https://git.sickrage.ca/SiCKRAGE/sickrage/commit/d239c773feb2eb41459451f1aaba95caf66816eb)
#### [10.0.36](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.35...10.0.36) #### [10.0.36](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.35...10.0.36)
   
> 28 August 2021
#### [10.0.35](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.34...10.0.35) #### [10.0.35](https://git.sickrage.ca/SiCKRAGE/sickrage/compare/10.0.34...10.0.35)
   
> 27 August 2021 > 27 August 2021
......
{ {
"name": "sickrage", "name": "sickrage",
"version": "10.0.36", "version": "10.0.37",
"private": true, "private": true,
"repository": { "repository": {
"type": "git", "type": "git",
......
[bumpversion] [bumpversion]
current_version = 10.0.36 current_version = 10.0.37
commit = False commit = False
tag = False tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))? parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
# along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>. # along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
# ############################################################################## # ##############################################################################
__version__ = "10.0.36" __version__ = "10.0.37"
__install_type__ = "" __install_type__ = ""
import argparse import argparse
......
sickrage/version.txt = 1d36f7bc522bafaf229557519d512741 sickrage/version.txt = 105e1738aafc22cbb0dbd516e2343fc5
sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e sickrage/checksums.md5 = d41d8cd98f00b204e9800998ecf8427e
sickrage/__init__.py = 9bbb58db99a98f23ee36e30a688c71e1 sickrage/__init__.py = 99f9285df4f66fd05243ab3c25304237
sickrage/autoProcessTV/mediaToSiCKRAGE.py = f88a6679a211b1f97126c116e2c33b9c sickrage/autoProcessTV/mediaToSiCKRAGE.py = f88a6679a211b1f97126c116e2c33b9c
sickrage/autoProcessTV/hellaToSiCKRAGE.py = 9bc477abfd456aaba8d6bf46f2c59b1f sickrage/autoProcessTV/hellaToSiCKRAGE.py = 9bc477abfd456aaba8d6bf46f2c59b1f
sickrage/autoProcessTV/__init__.py = bfa892dee586740a3a618d3c1955156c sickrage/autoProcessTV/__init__.py = bfa892dee586740a3a618d3c1955156c
...@@ -256,7 +256,7 @@ sickrage/core/enums.py = 5a8fac089e8c4451a1d6b28c1762e684 ...@@ -256,7 +256,7 @@ sickrage/core/enums.py = 5a8fac089e8c4451a1d6b28c1762e684
sickrage/core/scene_numbering.py = e517e5232d3b9ca186fe8b33578abd4b sickrage/core/scene_numbering.py = e517e5232d3b9ca186fe8b33578abd4b
sickrage/core/announcements.py = 6c3ed44e7ae50c281383ab5f278102c6 sickrage/core/announcements.py = 6c3ed44e7ae50c281383ab5f278102c6
sickrage/core/imdb_popular.py = 4739028ad8dac20901db175ef9df5875 sickrage/core/imdb_popular.py = 4739028ad8dac20901db175ef9df5875
sickrage/core/version_updater.py = ae9f96fefa51f8827b34b93430b1d288 sickrage/core/version_updater.py = 5ca6ed7001d796a1f1e27be18522c840
sickrage/core/traktapi.py = e30a23461b7e5d3af7619ad3e229bc40 sickrage/core/traktapi.py = e30a23461b7e5d3af7619ad3e229bc40
sickrage/core/search.py = bcb6d5972f5808d7ab9570a8a39b2d02 sickrage/core/search.py = bcb6d5972f5808d7ab9570a8a39b2d02
sickrage/core/nzbSplitter.py = 8bb813262916d2208e905fb53e575284 sickrage/core/nzbSplitter.py = 8bb813262916d2208e905fb53e575284
...@@ -264,7 +264,7 @@ sickrage/core/ui.py = bc530df3dcdf73126f22b7c5719641be ...@@ -264,7 +264,7 @@ sickrage/core/ui.py = bc530df3dcdf73126f22b7c5719641be
sickrage/core/classes.py = ca0d7c07b684b8fe22788346dc755fd8 sickrage/core/classes.py = ca0d7c07b684b8fe22788346dc755fd8
sickrage/core/blackandwhitelist.py = 9d0a8e2aae2353a842306730c2690c2c sickrage/core/blackandwhitelist.py = 9d0a8e2aae2353a842306730c2690c2c
sickrage/core/common.py = 8eca84658272c806858b105179285693 sickrage/core/common.py = 8eca84658272c806858b105179285693
sickrage/core/__init__.py = 069022fb8ca52fd605039f024397cfb5 sickrage/core/__init__.py = 8251e573ba25be4105a7a27d0669ae34
sickrage/core/upnp.py = 51eb609bd1f59baa3c0c346d5ac19787 sickrage/core/upnp.py = 51eb609bd1f59baa3c0c346d5ac19787
sickrage/core/google_drive.py = 0129b53b8a649fa7c55bfe0c5ad11bdb sickrage/core/google_drive.py = 0129b53b8a649fa7c55bfe0c5ad11bdb
sickrage/core/media/fanart.py = e9a4232ff01ef3473e628e3eecf80e6c sickrage/core/media/fanart.py = e9a4232ff01ef3473e628e3eecf80e6c
...@@ -341,8 +341,8 @@ sickrage/core/webserver/static/fonts/fa-regular-400.ttf = 1a78af4105d4d56e6c34f7 ...@@ -341,8 +341,8 @@ sickrage/core/webserver/static/fonts/fa-regular-400.ttf = 1a78af4105d4d56e6c34f7
sickrage/core/webserver/static/fonts/fa-brands-400.eot = 0fabb6606be4c45acfeedd115d0caca4 sickrage/core/webserver/static/fonts/fa-brands-400.eot = 0fabb6606be4c45acfeedd115d0caca4
sickrage/core/webserver/static/fonts/fa-solid-900.svg = 03ba7cb710104df27f1c9c46d64bee4e sickrage/core/webserver/static/fonts/fa-solid-900.svg = 03ba7cb710104df27f1c9c46d64bee4e
sickrage/core/webserver/static/css/core.min.css = 05ca1e9c48f013d71d97ecec458b9f76 sickrage/core/webserver/static/css/core.min.css = 05ca1e9c48f013d71d97ecec458b9f76
sickrage/core/webserver/static/js/core.js.map = 2c09db7a34cbd874a6c175b9718637d8 sickrage/core/webserver/static/js/core.js.map = ab0c04a0c7095da9e6d1e0e708e8dc60
sickrage/core/webserver/static/js/core.min.js = b3239b478ff6f9cee14e63a7776d9800 sickrage/core/webserver/static/js/core.min.js = 0b743c5776013b68123b9a410e98e3c4
sickrage/core/webserver/views/schedule.mako = 1492940accef5afe80d9cbd14be1c078 sickrage/core/webserver/views/schedule.mako = 1492940accef5afe80d9cbd14be1c078
sickrage/core/webserver/views/history.mako = a90a54341918b398eb652d186a636952 sickrage/core/webserver/views/history.mako = a90a54341918b398eb652d186a636952
sickrage/core/webserver/views/generic_message.mako = 20ba53fc129c1b69d5b8ccc960233757 sickrage/core/webserver/views/generic_message.mako = 20ba53fc129c1b69d5b8ccc960233757
...@@ -503,8 +503,8 @@ sickrage/core/databases/cache/migrations/versions/002_Remove_ID_Column_From_Last ...@@ -503,8 +503,8 @@ sickrage/core/databases/cache/migrations/versions/002_Remove_ID_Column_From_Last
sickrage/core/databases/cache/migrations/versions/007_Add_Token_Type_Column_To_OAuth2Token_Table.py = 122b771b45c28a889c97f93ac7d2a5ce sickrage/core/databases/cache/migrations/versions/007_Add_Token_Type_Column_To_OAuth2Token_Table.py = 122b771b45c28a889c97f93ac7d2a5ce
sickrage/core/databases/cache/migrations/versions/006_Add_Session_State_Column_To_OAuth2Token_Table.py = 1ec44e448315a95b5ca825c13f9326e5 sickrage/core/databases/cache/migrations/versions/006_Add_Session_State_Column_To_OAuth2Token_Table.py = 1ec44e448315a95b5ca825c13f9326e5
sickrage/core/databases/cache/migrations/versions/001_Add_Initial_Tables.py = 6416c418e06ad47834a3f6bdfe8ca4f1 sickrage/core/databases/cache/migrations/versions/001_Add_Initial_Tables.py = 6416c418e06ad47834a3f6bdfe8ca4f1
sickrage/core/databases/cache/migrations/versions/004_Add_OAuth2Token_Table.py = 60b501b624a129efbeefdae30ff79626 sickrage/core/databases/cache/migrations/versions/004_Add_OAuth2Token_Table.py = caca51f0c9069e59b9e4b430a842ddb7
sickrage/core/databases/cache/migrations/versions/005_Add_Announcements_Table.py = 134e67c4a85e9cd2a517fee65f2f81d2 sickrage/core/databases/cache/migrations/versions/005_Add_Announcements_Table.py = 7c30fba57abfa28ae6da0d4ba60035eb
sickrage/core/caches/tv_cache.py = 9b4d289ac83882d5b682df97b89d5fd3 sickrage/core/caches/tv_cache.py = 9b4d289ac83882d5b682df97b89d5fd3
sickrage/core/caches/image_cache.py = e97a0b7f9d95ad22813b9c2b5f1f9ffd sickrage/core/caches/image_cache.py = e97a0b7f9d95ad22813b9c2b5f1f9ffd
sickrage/core/caches/name_cache.py = 8cceca1983838af2e581c6187912b2cc sickrage/core/caches/name_cache.py = 8cceca1983838af2e581c6187912b2cc
......
...@@ -548,6 +548,9 @@ class Core(object): ...@@ -548,6 +548,9 @@ class Core(object):
# load shows # load shows
IOLoop.current().add_callback(self.load_shows) IOLoop.current().add_callback(self.load_shows)
# perform version update check
IOLoop.current().spawn_callback(self.version_updater.check_for_update)
# load network timezones # load network timezones
IOLoop.current().spawn_callback(self.tz_updater.update_network_timezones) IOLoop.current().spawn_callback(self.tz_updater.update_network_timezones)
......
...@@ -22,6 +22,19 @@ down_revision = '3' ...@@ -22,6 +22,19 @@ down_revision = '3'
def upgrade(): def upgrade():
conn = op.get_bind() conn = op.get_bind()
meta = sa.MetaData(bind=conn) meta = sa.MetaData(bind=conn)
op.create_table(
'oauth2_token',
sa.Column('id', sa.Integer, primary_key=True),
sa.Column('access_token', sa.String(255), unique=True, nullable=False),
sa.Column('refresh_token', sa.String(255), index=True),
sa.Column('expires_in', sa.Integer, nullable=False, default=0),
sa.Column('expires_at', sa.Integer, nullable=False, default=0),
sa.Column('scope', sa.Text, default=""),
sa.Column('session_state', sa.Text, default=""),
sa.Column('token_type', sa.Text, default="bearer"),
)
oauth2_token = sa.Table('oauth2_token', meta, autoload=True) oauth2_token = sa.Table('oauth2_token', meta, autoload=True)
token_file = os.path.abspath(os.path.join(sickrage.app.data_dir, 'token.json')) token_file = os.path.abspath(os.path.join(sickrage.app.data_dir, 'token.json'))
...@@ -45,4 +58,4 @@ def upgrade(): ...@@ -45,4 +58,4 @@ def upgrade():
def downgrade(): def downgrade():
# Operations to reverse the above upgrade go here. # Operations to reverse the above upgrade go here.
pass pass
\ No newline at end of file
...@@ -15,7 +15,12 @@ down_revision = '4' ...@@ -15,7 +15,12 @@ down_revision = '4'
def upgrade(): def upgrade():
pass op.create_table(
'announcements',
sa.Column('id', sa.Integer, primary_key=True),
sa.Column('hash', sa.String(255), unique=True, nullable=False),
sa.Column('seen', sa.Boolean, default=False)
)
def downgrade(): def downgrade():
......
...@@ -158,9 +158,14 @@ class VersionUpdater(object): ...@@ -158,9 +158,14 @@ class VersionUpdater(object):
if sickrage.app.disable_updates: if sickrage.app.disable_updates:
return False return False
sickrage.app.log.info('Checking for SiCKRAGE server updates')
if not self.updater.need_update(): if not self.updater.need_update():
sickrage.app.log.info('SiCKRAGE server is up to date')
return False return False
sickrage.app.log.info('New SiCKRAGE server update is available!')
self.updater.set_latest_version() self.updater.set_latest_version()
return True return True
......
10.0.36 10.0.37
\ No newline at end of file \ 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