mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into development

This commit is contained in:
Louis Vézina 2019-10-19 16:37:53 -04:00
parent 55037cfde2 a9c26691a2
commit bd824eb5b4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bazarr/database.py
View File

@ -63,6 +63,7 @@ class TableShows(BaseModel):
class TableEpisodes(BaseModel): class TableEpisodes(BaseModel):
rowid = IntegerField()
audio_codec = TextField(null=True) audio_codec = TextField(null=True)
episode = IntegerField(null=False) episode = IntegerField(null=False)
failed_attempts = TextField(column_name='failedAttempts', null=True) failed_attempts = TextField(column_name='failedAttempts', null=True)
@ -86,6 +87,7 @@ class TableEpisodes(BaseModel):
class TableMovies(BaseModel): class TableMovies(BaseModel):
rowid = IntegerField()
alternative_titles = TextField(column_name='alternativeTitles', null=True) alternative_titles = TextField(column_name='alternativeTitles', null=True)
audio_codec = TextField(null=True) audio_codec = TextField(null=True)
audio_language = TextField(null=True) audio_language = TextField(null=True)

4
bazarr/main.py
View File

@ -1392,7 +1392,7 @@ def wantedseries():
).where( ).where(
reduce(operator.and_, missing_subtitles_clause) reduce(operator.and_, missing_subtitles_clause)
).order_by( ).order_by(
TableEpisodes.sonarr_episode_id.desc() TableEpisodes.rowid.desc()
).paginate( ).paginate(
int(page), int(page),
page_size page_size
@ -1436,7 +1436,7 @@ def wantedmovies():
).where( ).where(
reduce(operator.and_, missing_subtitles_clause) reduce(operator.and_, missing_subtitles_clause)
).order_by( ).order_by(
TableMovies.radarr_id.desc() TableMovies.rowid.desc()
).paginate( ).paginate(
int(page), int(page),
page_size page_size