mirror of https://github.com/morpheus65535/bazarr
Merge fixes
This commit is contained in:
parent
c7a8e83982
commit
3250f23720
|
@ -69,7 +69,7 @@ class ProviderEpisodes(Resource):
|
||||||
try:
|
try:
|
||||||
result = manual_download_subtitle(episodePath, language, audio_language, hi, forced, subtitle,
|
result = manual_download_subtitle(episodePath, language, audio_language, hi, forced, subtitle,
|
||||||
selected_provider, providers_auth, title, 'series',
|
selected_provider, providers_auth, title, 'series',
|
||||||
profile_id=get_profile_id(episode_id=sonarrEpisodeId))
|
profile_id=get_profile_id(episode_id=episodeId))
|
||||||
if result is not None:
|
if result is not None:
|
||||||
message = result[0]
|
message = result[0]
|
||||||
path = result[1]
|
path = result[1]
|
||||||
|
|
|
@ -70,7 +70,7 @@ class ProviderMovies(Resource):
|
||||||
try:
|
try:
|
||||||
result = manual_download_subtitle(moviePath, language, audio_language, hi, forced, subtitle,
|
result = manual_download_subtitle(moviePath, language, audio_language, hi, forced, subtitle,
|
||||||
selected_provider, providers_auth, title, 'movie',
|
selected_provider, providers_auth, title, 'movie',
|
||||||
profile_id=get_profile_id(movie_id=radarrId))
|
profile_id=get_profile_id(movie_id=movieId))
|
||||||
if result is not None:
|
if result is not None:
|
||||||
message = result[0]
|
message = result[0]
|
||||||
path = result[1]
|
path = result[1]
|
||||||
|
|
|
@ -37,5 +37,4 @@ class Searches(Resource):
|
||||||
movies = list(movies)
|
movies = list(movies)
|
||||||
search_list += movies
|
search_list += movies
|
||||||
|
|
||||||
|
|
||||||
return jsonify(search_list)
|
return jsonify(search_list)
|
||||||
|
|
|
@ -48,6 +48,8 @@ class TableLanguagesProfiles(BaseModel):
|
||||||
items = TextField(null=False)
|
items = TextField(null=False)
|
||||||
name = TextField(null=False)
|
name = TextField(null=False)
|
||||||
profileId = AutoIncrementField()
|
profileId = AutoIncrementField()
|
||||||
|
mustContain = TextField(null=True)
|
||||||
|
mustNotContain = TextField(null=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
table_name = 'table_languages_profiles'
|
table_name = 'table_languages_profiles'
|
||||||
|
@ -138,15 +140,6 @@ class TableBlacklist(BaseModel):
|
||||||
table_name = 'table_blacklist'
|
table_name = 'table_blacklist'
|
||||||
|
|
||||||
|
|
||||||
class TableLanguagesProfiles(BaseModel):
|
|
||||||
cutoff = IntegerField(null=True)
|
|
||||||
items = TextField()
|
|
||||||
name = TextField()
|
|
||||||
profileId = AutoField()
|
|
||||||
mustContain = TextField(null=True)
|
|
||||||
mustNotContain = TextField(null=True)
|
|
||||||
|
|
||||||
|
|
||||||
class TableMoviesRootfolder(BaseModel):
|
class TableMoviesRootfolder(BaseModel):
|
||||||
accessible = IntegerField(null=True)
|
accessible = IntegerField(null=True)
|
||||||
error = TextField(null=True)
|
error = TextField(null=True)
|
||||||
|
@ -302,7 +295,7 @@ def init_db():
|
||||||
|
|
||||||
def migrate_db():
|
def migrate_db():
|
||||||
migrate(
|
migrate(
|
||||||
migrator.add_column('table_shows', 'monitored', TextField(null=True))
|
migrator.add_column('table_shows', 'monitored', TextField(null=True)),
|
||||||
migrator.add_column('table_languages_profiles', 'mustContain', TextField(null=True)),
|
migrator.add_column('table_languages_profiles', 'mustContain', TextField(null=True)),
|
||||||
migrator.add_column('table_languages_profiles', 'mustNotContain', TextField(null=True)),
|
migrator.add_column('table_languages_profiles', 'mustNotContain', TextField(null=True)),
|
||||||
)
|
)
|
||||||
|
@ -450,14 +443,14 @@ def get_audio_profile_languages(series_id=None, episode_id=None, movie_id=None):
|
||||||
|
|
||||||
def get_profile_id(series_id=None, episode_id=None, movie_id=None):
|
def get_profile_id(series_id=None, episode_id=None, movie_id=None):
|
||||||
if series_id:
|
if series_id:
|
||||||
profileId = TableShows.get(TableShows.sonarrSeriesId == series_id).profileId
|
profileId = TableShows.get(TableShows.seriesId == series_id).profileId
|
||||||
elif episode_id:
|
elif episode_id:
|
||||||
profileId = TableShows.select(TableShows.profileId)\
|
profileId = TableShows.select(TableShows.profileId)\
|
||||||
.join(TableEpisodes, on=(TableShows.sonarrSeriesId == TableEpisodes.sonarrSeriesId))\
|
.join(TableEpisodes)\
|
||||||
.where(TableEpisodes.sonarrEpisodeId == episode_id)\
|
.where(TableEpisodes.episodeId == episode_id)\
|
||||||
.get().profileId
|
.get().profileId
|
||||||
elif movie_id:
|
elif movie_id:
|
||||||
profileId = TableMovies.get(TableMovies.radarrId == movie_id).profileId
|
profileId = TableMovies.get(TableMovies.movieId == movie_id).profileId
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
|
@ -330,7 +330,7 @@ def get_throttled_providers():
|
||||||
with open(os.path.normpath(os.path.join(args.config_dir, 'config', 'throttled_providers.dat')), 'r') as \
|
with open(os.path.normpath(os.path.join(args.config_dir, 'config', 'throttled_providers.dat')), 'r') as \
|
||||||
handle:
|
handle:
|
||||||
providers = eval(handle.read())
|
providers = eval(handle.read())
|
||||||
except:
|
except (OSError, ValueError, NameError, SyntaxError):
|
||||||
# set empty content in throttled_providers.dat
|
# set empty content in throttled_providers.dat
|
||||||
logging.error("Invalid content in throttled_providers.dat. Resetting")
|
logging.error("Invalid content in throttled_providers.dat. Resetting")
|
||||||
set_throttled_providers(providers)
|
set_throttled_providers(providers)
|
||||||
|
|
|
@ -5,7 +5,6 @@ import sys
|
||||||
import ast
|
import ast
|
||||||
import logging
|
import logging
|
||||||
import subprocess
|
import subprocess
|
||||||
import time
|
|
||||||
import pickle
|
import pickle
|
||||||
import codecs
|
import codecs
|
||||||
import re
|
import re
|
||||||
|
|
Loading…
Reference in New Issue