remodel config to match jellyfin purpose
This commit is contained in:
@@ -75,7 +75,7 @@ def serve_template(templatename, **kwargs):
|
||||
error_handler=mako_error_handler)
|
||||
|
||||
http_root = jellypy.HTTP_ROOT
|
||||
server_name = jellypy.CONFIG.PMS_NAME
|
||||
server_name = jellypy.CONFIG.JELLYFIN_NAME
|
||||
cache_param = '?' + (jellypy.CURRENT_VERSION or common.RELEASE)
|
||||
|
||||
_session = get_session_info()
|
||||
@@ -153,15 +153,14 @@ class WebInterface(object):
|
||||
@requireAuth(member_of("admin"))
|
||||
def welcome(self, **kwargs):
|
||||
config = {
|
||||
"pms_identifier": jellypy.CONFIG.PMS_IDENTIFIER,
|
||||
"pms_ip": jellypy.CONFIG.PMS_IP,
|
||||
"pms_port": jellypy.CONFIG.PMS_PORT,
|
||||
"pms_is_remote": jellypy.CONFIG.PMS_IS_REMOTE,
|
||||
"pms_ssl": jellypy.CONFIG.PMS_SSL,
|
||||
"pms_is_cloud": jellypy.CONFIG.PMS_IS_CLOUD,
|
||||
"pms_token": jellypy.CONFIG.PMS_TOKEN,
|
||||
"pms_uuid": jellypy.CONFIG.PMS_UUID,
|
||||
"pms_name": jellypy.CONFIG.PMS_NAME,
|
||||
"jellyfin_identifier": jellypy.CONFIG.JELLYFIN_IDENTIFIER,
|
||||
"jellyfin_ip": jellypy.CONFIG.JELLYFIN_IP,
|
||||
"jellyfin_port": jellypy.CONFIG.JELLYFIN_PORT,
|
||||
"jellyfin_is_remote": jellypy.CONFIG.JELLYFIN_IS_REMOTE,
|
||||
"jellyfin_ssl": jellypy.CONFIG.JELLYFIN_SSL,
|
||||
"jellyfin_token": jellypy.CONFIG.JELLYFIN_TOKEN,
|
||||
"jellyfin_uuid": jellypy.CONFIG.JELLYFIN_UUID,
|
||||
"jellyfin_name": jellypy.CONFIG.JELLYFIN_NAME,
|
||||
"logging_ignore_interval": jellypy.CONFIG.LOGGING_IGNORE_INTERVAL
|
||||
}
|
||||
|
||||
@@ -203,7 +202,7 @@ class WebInterface(object):
|
||||
"""
|
||||
if token:
|
||||
# Need to set token so result doesn't return http 401
|
||||
jellypy.CONFIG.__setattr__('PMS_TOKEN', token)
|
||||
jellypy.CONFIG.__setattr__('JELLYFIN_TOKEN', token)
|
||||
jellypy.CONFIG.write()
|
||||
|
||||
include_cloud = not (include_cloud == 'false')
|
||||
@@ -226,8 +225,8 @@ class WebInterface(object):
|
||||
config = {
|
||||
"home_sections": jellypy.CONFIG.HOME_SECTIONS,
|
||||
"home_refresh_interval": jellypy.CONFIG.HOME_REFRESH_INTERVAL,
|
||||
"pms_name": jellypy.CONFIG.PMS_NAME,
|
||||
"pms_is_cloud": jellypy.CONFIG.PMS_IS_CLOUD,
|
||||
"jellyfin_name": jellypy.CONFIG.JELLYFIN_NAME,
|
||||
"jellyfin_is_cloud": jellypy.CONFIG.JELLYFIN_IS_CLOUD,
|
||||
"update_show_changelog": jellypy.CONFIG.UPDATE_SHOW_CHANGELOG,
|
||||
"first_run_complete": jellypy.CONFIG.FIRST_RUN_COMPLETE
|
||||
}
|
||||
@@ -273,7 +272,7 @@ class WebInterface(object):
|
||||
def get_current_activity(self, **kwargs):
|
||||
pass
|
||||
# TODO: Jellyfin
|
||||
# pms_connect = pmsconnect.PmsConnect(token=jellypy.CONFIG.PMS_TOKEN)
|
||||
# pms_connect = pmsconnect.PmsConnect(token=jellypy.CONFIG.JELLYFIN_TOKEN)
|
||||
# result = pms_connect.get_current_activity()
|
||||
#
|
||||
# if result:
|
||||
@@ -287,7 +286,7 @@ class WebInterface(object):
|
||||
def get_current_activity_instance(self, session_key=None, **kwargs):
|
||||
pass
|
||||
# TODO: Jellyfin
|
||||
# pms_connect = pmsconnect.PmsConnect(token=jellypy.CONFIG.PMS_TOKEN)
|
||||
# pms_connect = pmsconnect.PmsConnect(token=jellypy.CONFIG.JELLYFIN_TOKEN)
|
||||
# result = pms_connect.get_current_activity()
|
||||
#
|
||||
# if result:
|
||||
@@ -330,18 +329,18 @@ class WebInterface(object):
|
||||
@cherrypy.tools.json_out()
|
||||
@requireAuth(member_of("admin"))
|
||||
def return_plex_xml_url(self, endpoint='', plextv=False, **kwargs):
|
||||
kwargs['X-Plex-Token'] = jellypy.CONFIG.PMS_TOKEN
|
||||
kwargs['X-Plex-Token'] = jellypy.CONFIG.JELLYFIN_TOKEN
|
||||
|
||||
if helpers.bool_true(plextv):
|
||||
base_url = 'https://plex.tv'
|
||||
else:
|
||||
if jellypy.CONFIG.PMS_URL_OVERRIDE:
|
||||
base_url = jellypy.CONFIG.PMS_URL_OVERRIDE
|
||||
if jellypy.CONFIG.JELLYFIN_URL_OVERRIDE:
|
||||
base_url = jellypy.CONFIG.JELLYFIN_URL_OVERRIDE
|
||||
else:
|
||||
base_url = jellypy.CONFIG.PMS_URL
|
||||
base_url = jellypy.CONFIG.JELLYFIN_URL
|
||||
|
||||
if '{machine_id}' in endpoint:
|
||||
endpoint = endpoint.format(machine_id=jellypy.CONFIG.PMS_IDENTIFIER)
|
||||
endpoint = endpoint.format(machine_id=jellypy.CONFIG.JELLYFIN_IDENTIFIER)
|
||||
|
||||
return base_url + endpoint + '?' + urlencode(kwargs)
|
||||
|
||||
@@ -512,7 +511,7 @@ class WebInterface(object):
|
||||
@sanitize_out()
|
||||
@addtoapi("get_library_names")
|
||||
def get_library_sections(self, **kwargs):
|
||||
""" Get a list of library sections and ids on the PMS.
|
||||
""" Get a list of library sections and ids on the JELLYFIN.
|
||||
|
||||
```
|
||||
Required parameters:
|
||||
@@ -588,7 +587,7 @@ class WebInterface(object):
|
||||
status_message = 'An error occured.'
|
||||
|
||||
return serve_template(templatename="edit_library.html", title="Edit Library",
|
||||
data=result, server_id=jellypy.CONFIG.PMS_IDENTIFIER, status_message=status_message)
|
||||
data=result, server_id=jellypy.CONFIG.JELLYFIN_IDENTIFIER, status_message=status_message)
|
||||
|
||||
@cherrypy.expose
|
||||
@requireAuth(member_of("admin"))
|
||||
@@ -2594,7 +2593,7 @@ class WebInterface(object):
|
||||
user_id = get_session_user_id()
|
||||
|
||||
# TODO: Jellyfin
|
||||
# plex_tv = plextv.PlexTV(token=jellypy.CONFIG.PMS_TOKEN)
|
||||
# plex_tv = plextv.PlexTV(token=jellypy.CONFIG.JELLYFIN_TOKEN)
|
||||
# result = plex_tv.get_synced_items(machine_id=machine_id, user_id_filter=user_id)
|
||||
result = None
|
||||
|
||||
@@ -2711,7 +2710,7 @@ class WebInterface(object):
|
||||
@requireAuth(member_of("admin"))
|
||||
@addtoapi()
|
||||
def get_plex_log(self, **kwargs):
|
||||
""" Get the PMS logs.
|
||||
""" Get the JELLYFIN logs.
|
||||
|
||||
```
|
||||
Required parameters:
|
||||
@@ -2732,7 +2731,7 @@ class WebInterface(object):
|
||||
]
|
||||
```
|
||||
"""
|
||||
window = int(kwargs.get('window', jellypy.CONFIG.PMS_LOGS_LINE_CAP))
|
||||
window = int(kwargs.get('window', jellypy.CONFIG.JELLYFIN_LOGS_LINE_CAP))
|
||||
log_lines = []
|
||||
log_type = kwargs.get('log_type', 'server')
|
||||
|
||||
@@ -3060,25 +3059,25 @@ class WebInterface(object):
|
||||
"check_github": checked(jellypy.CONFIG.CHECK_GITHUB),
|
||||
"interface_list": interface_list,
|
||||
"cache_sizemb": jellypy.CONFIG.CACHE_SIZEMB,
|
||||
"pms_identifier": jellypy.CONFIG.PMS_IDENTIFIER,
|
||||
"pms_ip": jellypy.CONFIG.PMS_IP,
|
||||
"pms_logs_folder": jellypy.CONFIG.PMS_LOGS_FOLDER,
|
||||
"pms_port": jellypy.CONFIG.PMS_PORT,
|
||||
"pms_token": jellypy.CONFIG.PMS_TOKEN,
|
||||
"pms_ssl": jellypy.CONFIG.PMS_SSL,
|
||||
"pms_is_remote": jellypy.CONFIG.PMS_IS_REMOTE,
|
||||
"pms_is_cloud": jellypy.CONFIG.PMS_IS_CLOUD,
|
||||
"pms_url": jellypy.CONFIG.PMS_URL,
|
||||
"pms_url_manual": checked(jellypy.CONFIG.PMS_URL_MANUAL),
|
||||
"pms_uuid": jellypy.CONFIG.PMS_UUID,
|
||||
"pms_web_url": jellypy.CONFIG.PMS_WEB_URL,
|
||||
"pms_name": jellypy.CONFIG.PMS_NAME,
|
||||
"pms_update_check_interval": jellypy.CONFIG.PMS_UPDATE_CHECK_INTERVAL,
|
||||
"jellyfin_identifier": jellypy.CONFIG.JELLYFIN_IDENTIFIER,
|
||||
"jellyfin_ip": jellypy.CONFIG.JELLYFIN_IP,
|
||||
"jellyfin_logs_folder": jellypy.CONFIG.JELLYFIN_LOGS_FOLDER,
|
||||
"jellyfin_port": jellypy.CONFIG.JELLYFIN_PORT,
|
||||
"jellyfin_token": jellypy.CONFIG.JELLYFIN_TOKEN,
|
||||
"jellyfin_ssl": jellypy.CONFIG.JELLYFIN_SSL,
|
||||
"jellyfin_is_remote": jellypy.CONFIG.JELLYFIN_IS_REMOTE,
|
||||
"jellyfin_is_cloud": jellypy.CONFIG.JELLYFIN_IS_CLOUD,
|
||||
"jellyfin_url": jellypy.CONFIG.JELLYFIN_URL,
|
||||
"jellyfin_url_manual": checked(jellypy.CONFIG.JELLYFIN_URL_MANUAL),
|
||||
"jellyfin_uuid": jellypy.CONFIG.JELLYFIN_UUID,
|
||||
"jellyfin_web_url": jellypy.CONFIG.JELLYFIN_WEB_URL,
|
||||
"jellyfin_name": jellypy.CONFIG.JELLYFIN_NAME,
|
||||
"jellyfin_update_check_interval": jellypy.CONFIG.JELLYFIN_UPDATE_CHECK_INTERVAL,
|
||||
"date_format": jellypy.CONFIG.DATE_FORMAT,
|
||||
"time_format": jellypy.CONFIG.TIME_FORMAT,
|
||||
"week_start_monday": checked(jellypy.CONFIG.WEEK_START_MONDAY),
|
||||
"get_file_sizes": checked(jellypy.CONFIG.GET_FILE_SIZES),
|
||||
"monitor_pms_updates": checked(jellypy.CONFIG.MONITOR_PMS_UPDATES),
|
||||
"monitor_jellyfin_updates": checked(jellypy.CONFIG.MONITOR_JELLYFIN_UPDATES),
|
||||
"refresh_libraries_interval": jellypy.CONFIG.REFRESH_LIBRARIES_INTERVAL,
|
||||
"refresh_libraries_on_startup": checked(jellypy.CONFIG.REFRESH_LIBRARIES_ON_STARTUP),
|
||||
"refresh_users_interval": jellypy.CONFIG.REFRESH_USERS_INTERVAL,
|
||||
@@ -3108,7 +3107,7 @@ class WebInterface(object):
|
||||
"cloudinary_api_key": jellypy.CONFIG.CLOUDINARY_API_KEY,
|
||||
"cloudinary_api_secret": jellypy.CONFIG.CLOUDINARY_API_SECRET,
|
||||
"cache_images": checked(jellypy.CONFIG.CACHE_IMAGES),
|
||||
"pms_version": jellypy.CONFIG.PMS_VERSION,
|
||||
"jellyfin_version": jellypy.CONFIG.JELLYFIN_VERSION,
|
||||
"plexpy_auto_update": checked(jellypy.CONFIG.PLEXPY_AUTO_UPDATE),
|
||||
"git_branch": jellypy.CONFIG.GIT_BRANCH,
|
||||
"git_path": jellypy.CONFIG.GIT_PATH,
|
||||
@@ -3154,12 +3153,12 @@ class WebInterface(object):
|
||||
"launch_browser", "launch_startup", "enable_https", "https_create_cert",
|
||||
"api_enabled", "freeze_db", "check_github",
|
||||
"group_history_tables",
|
||||
"pms_url_manual", "week_start_monday",
|
||||
"jellyfin_url_manual", "week_start_monday",
|
||||
"refresh_libraries_on_startup", "refresh_users_on_startup",
|
||||
"notify_consecutive", "notify_recently_added_upgrade",
|
||||
"notify_group_recently_added_grandparent", "notify_group_recently_added_parent",
|
||||
"notify_new_device_initial_only",
|
||||
"monitor_pms_updates", "get_file_sizes", "log_blacklist", "http_hash_password",
|
||||
"monitor_jellyfin_updates", "get_file_sizes", "log_blacklist", "http_hash_password",
|
||||
"allow_guest_access", "cache_images", "http_proxy", "http_basic_auth", "notify_concurrent_by_ip",
|
||||
"history_table_activity", "plexpy_auto_update",
|
||||
"themoviedb_lookup", "tvmaze_lookup", "musicbrainz_lookup", "http_plex_admin",
|
||||
@@ -3210,15 +3209,15 @@ class WebInterface(object):
|
||||
if kwargs.get('check_github') != jellypy.CONFIG.CHECK_GITHUB or \
|
||||
kwargs.get('refresh_libraries_interval') != str(jellypy.CONFIG.REFRESH_LIBRARIES_INTERVAL) or \
|
||||
kwargs.get('refresh_users_interval') != str(jellypy.CONFIG.REFRESH_USERS_INTERVAL) or \
|
||||
kwargs.get('pms_update_check_interval') != str(jellypy.CONFIG.PMS_UPDATE_CHECK_INTERVAL) or \
|
||||
kwargs.get('monitor_pms_updates') != jellypy.CONFIG.MONITOR_PMS_UPDATES or \
|
||||
kwargs.get('pms_url_manual') != jellypy.CONFIG.PMS_URL_MANUAL:
|
||||
kwargs.get('jellyfin_update_check_interval') != str(jellypy.CONFIG.JELLYFIN_UPDATE_CHECK_INTERVAL) or \
|
||||
kwargs.get('monitor_jellyfin_updates') != jellypy.CONFIG.MONITOR_JELLYFIN_UPDATES or \
|
||||
kwargs.get('jellyfin_url_manual') != jellypy.CONFIG.JELLYFIN_URL_MANUAL:
|
||||
reschedule = True
|
||||
|
||||
# If we change the SSL setting for PMS or PMS remote setting, make sure we grab the new url.
|
||||
if kwargs.get('pms_ssl') != str(jellypy.CONFIG.PMS_SSL) or \
|
||||
kwargs.get('pms_is_remote') != str(jellypy.CONFIG.PMS_IS_REMOTE) or \
|
||||
kwargs.get('pms_url_manual') != jellypy.CONFIG.PMS_URL_MANUAL:
|
||||
# If we change the SSL setting for JELLYFIN or JELLYFIN remote setting, make sure we grab the new url.
|
||||
if kwargs.get('jellyfin_ssl') != str(jellypy.CONFIG.JELLYFIN_SSL) or \
|
||||
kwargs.get('jellyfin_is_remote') != str(jellypy.CONFIG.JELLYFIN_IS_REMOTE) or \
|
||||
kwargs.get('jellyfin_url_manual') != jellypy.CONFIG.JELLYFIN_URL_MANUAL:
|
||||
server_changed = True
|
||||
|
||||
# If we change the HTTPS setting, make sure we generate a new certificate.
|
||||
@@ -3357,11 +3356,11 @@ class WebInterface(object):
|
||||
# update_channel = pmsconnect.PmsConnect().get_server_update_channel()
|
||||
#
|
||||
# return {'plexpass': plexpass,
|
||||
# 'pms_platform': common.PMS_PLATFORM_NAME_OVERRIDES.get(
|
||||
# jellypy.CONFIG.PMS_PLATFORM, jellypy.CONFIG.PMS_PLATFORM),
|
||||
# 'pms_update_channel': jellypy.CONFIG.PMS_UPDATE_CHANNEL,
|
||||
# 'pms_update_distro': jellypy.CONFIG.PMS_UPDATE_DISTRO,
|
||||
# 'pms_update_distro_build': jellypy.CONFIG.PMS_UPDATE_DISTRO_BUILD,
|
||||
# 'pms_platform': common.JELLYFIN_PLATFORM_NAME_OVERRIDES.get(
|
||||
# jellypy.CONFIG.JELLYFIN_PLATFORM, jellypy.CONFIG.JELLYFIN_PLATFORM),
|
||||
# 'pms_update_channel': jellypy.CONFIG.JELLYFIN_UPDATE_CHANNEL,
|
||||
# 'pms_update_distro': jellypy.CONFIG.JELLYFIN_UPDATE_DISTRO,
|
||||
# 'pms_update_distro_build': jellypy.CONFIG.JELLYFIN_UPDATE_DISTRO_BUILD,
|
||||
# 'plex_update_channel': 'plexpass' if update_channel == 'beta' else 'public'}
|
||||
|
||||
@cherrypy.expose
|
||||
@@ -3983,7 +3982,7 @@ class WebInterface(object):
|
||||
@cherrypy.tools.json_out()
|
||||
@requireAuth(member_of("admin"))
|
||||
@addtoapi()
|
||||
def get_pms_token(self, username=None, password=None, **kwargs):
|
||||
def get_jellyfin_token(self, username=None, password=None, **kwargs):
|
||||
""" Get the user's Plex token used for Tautulli.
|
||||
|
||||
```
|
||||
@@ -4015,7 +4014,7 @@ class WebInterface(object):
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
@requireAuth(member_of("admin"))
|
||||
def get_plexpy_pms_token(self, username=None, password=None, force=False, **kwargs):
|
||||
def get_plexpy_jellyfin_token(self, username=None, password=None, force=False, **kwargs):
|
||||
""" Fetch a new Plex.tv token for Tautulli """
|
||||
if not username and not password:
|
||||
return None
|
||||
@@ -4038,7 +4037,7 @@ class WebInterface(object):
|
||||
@addtoapi()
|
||||
def get_server_id(self, hostname=None, port=None, identifier=None, ssl=0, remote=0, manual=0,
|
||||
get_url=False, test_websocket=False, **kwargs):
|
||||
""" Get the PMS server identifier.
|
||||
""" Get the JELLYFIN server identifier.
|
||||
|
||||
```
|
||||
Required parameters:
|
||||
@@ -4055,7 +4054,7 @@ class WebInterface(object):
|
||||
```
|
||||
"""
|
||||
# Attempt to get the pms_identifier from plex.tv if the server is published
|
||||
# Works for all PMS SSL settings
|
||||
# Works for all JELLYFIN SSL settings
|
||||
if not identifier and hostname and port:
|
||||
pass
|
||||
# TODO: Jellyfin
|
||||
@@ -4069,7 +4068,7 @@ class WebInterface(object):
|
||||
# break
|
||||
#
|
||||
# # Fallback to checking /identity endpoint if the server is unpublished
|
||||
# # Cannot set SSL settings on the PMS if unpublished so 'http' is okay
|
||||
# # Cannot set SSL settings on the JELLYFIN if unpublished so 'http' is okay
|
||||
# if not identifier:
|
||||
# scheme = 'https' if helpers.cast_to_int(ssl) else 'http'
|
||||
# url = '{scheme}://{hostname}:{port}'.format(scheme=scheme, hostname=hostname, port=port)
|
||||
@@ -4088,19 +4087,19 @@ class WebInterface(object):
|
||||
|
||||
if identifier:
|
||||
if helpers.bool_true(get_url):
|
||||
server = self.get_server_resources(pms_ip=hostname,
|
||||
pms_port=port,
|
||||
pms_ssl=ssl,
|
||||
pms_is_remote=remote,
|
||||
pms_url_manual=manual,
|
||||
pms_identifier=identifier)
|
||||
result['url'] = server['pms_url']
|
||||
server = self.get_server_resources(jellyfin_ip=hostname,
|
||||
jellyfin_port=port,
|
||||
jellyfin_ssl=ssl,
|
||||
jellyfin_is_remote=remote,
|
||||
jellyfin_url_manual=manual,
|
||||
jellyfin_identifier=identifier)
|
||||
result['url'] = server['jellyfin_url']
|
||||
result['ws'] = None
|
||||
|
||||
if helpers.bool_true(test_websocket):
|
||||
# Quick test websocket connection
|
||||
ws_url = result['url'].replace('http', 'ws', 1) + '/:/websockets/notifications'
|
||||
header = ['X-Plex-Token: %s' % jellypy.CONFIG.PMS_TOKEN]
|
||||
header = ['X-Plex-Token: %s' % jellypy.CONFIG.JELLYFIN_TOKEN]
|
||||
|
||||
logger.debug("Testing websocket connection...")
|
||||
try:
|
||||
@@ -4114,7 +4113,7 @@ class WebInterface(object):
|
||||
|
||||
return result
|
||||
else:
|
||||
logger.warn('Unable to retrieve the PMS identifier.')
|
||||
logger.warn('Unable to retrieve the JELLYFIN identifier.')
|
||||
return result
|
||||
|
||||
@cherrypy.expose
|
||||
@@ -4122,7 +4121,7 @@ class WebInterface(object):
|
||||
@requireAuth(member_of("admin"))
|
||||
@addtoapi()
|
||||
def get_server_info(self, **kwargs):
|
||||
""" Get the PMS server information.
|
||||
""" Get the JELLYFIN server information.
|
||||
|
||||
```
|
||||
Required parameters:
|
||||
@@ -4156,7 +4155,7 @@ class WebInterface(object):
|
||||
@requireAuth(member_of("admin"))
|
||||
@addtoapi()
|
||||
def get_server_pref(self, pref=None, **kwargs):
|
||||
""" Get a specified PMS server preference.
|
||||
""" Get a specified JELLYFIN server preference.
|
||||
|
||||
```
|
||||
Required parameters:
|
||||
@@ -4357,8 +4356,8 @@ class WebInterface(object):
|
||||
metadata = None
|
||||
|
||||
config = {
|
||||
"pms_identifier": jellypy.CONFIG.PMS_IDENTIFIER,
|
||||
"pms_web_url": jellypy.CONFIG.PMS_WEB_URL
|
||||
"jellyfin_identifier": jellypy.CONFIG.JELLYFIN_IDENTIFIER,
|
||||
"jellyfin_web_url": jellypy.CONFIG.JELLYFIN_WEB_URL
|
||||
}
|
||||
|
||||
if user_id:
|
||||
@@ -4468,7 +4467,7 @@ class WebInterface(object):
|
||||
# return {'result': 'error', 'message': 'Notification failed.'}
|
||||
|
||||
@cherrypy.expose
|
||||
def pms_image_proxy(self, **kwargs):
|
||||
def jellyfin_image_proxy(self, **kwargs):
|
||||
""" See real_pms_image_proxy docs string"""
|
||||
|
||||
refresh = False
|
||||
@@ -4477,13 +4476,13 @@ class WebInterface(object):
|
||||
|
||||
kwargs['refresh'] = refresh
|
||||
|
||||
return self.real_pms_image_proxy(**kwargs)
|
||||
return self.real_jellyfin_image_proxy(**kwargs)
|
||||
|
||||
@addtoapi('pms_image_proxy')
|
||||
def real_pms_image_proxy(self, img=None, rating_key=None, width=750, height=1000,
|
||||
@addtoapi('jellyfin_image_proxy')
|
||||
def real_jellyfin_image_proxy(self, img=None, rating_key=None, width=750, height=1000,
|
||||
opacity=100, background='000000', blur=0, img_format='png',
|
||||
fallback=None, refresh=False, clip=False, **kwargs):
|
||||
""" Gets an image from the PMS and saves it to the image cache directory.
|
||||
""" Gets an image from the JELLYFIN and saves it to the image cache directory.
|
||||
|
||||
```
|
||||
Required parameters:
|
||||
@@ -4581,7 +4580,7 @@ class WebInterface(object):
|
||||
|
||||
return result[0]
|
||||
else:
|
||||
raise Exception('PMS image request failed')
|
||||
raise Exception('JELLYFIN image request failed')
|
||||
|
||||
except Exception as e:
|
||||
logger.warn("Failed to get image %s, falling back to %s." % (img, fallback))
|
||||
@@ -4613,7 +4612,7 @@ class WebInterface(object):
|
||||
|
||||
if img_info:
|
||||
kwargs.update(img_info)
|
||||
return self.real_pms_image_proxy(refresh=True, **kwargs)
|
||||
return self.real_jellyfin_image_proxy(refresh=True, **kwargs)
|
||||
|
||||
return
|
||||
|
||||
@@ -4678,13 +4677,13 @@ class WebInterface(object):
|
||||
log_type = kwargs.get('log_type', 'server')
|
||||
|
||||
log_file = ""
|
||||
if jellypy.CONFIG.PMS_LOGS_FOLDER:
|
||||
if jellypy.CONFIG.JELLYFIN_LOGS_FOLDER:
|
||||
if log_type == "server":
|
||||
log_file = 'Plex Media Server.log'
|
||||
log_file_path = os.path.join(jellypy.CONFIG.PMS_LOGS_FOLDER, log_file)
|
||||
log_file_path = os.path.join(jellypy.CONFIG.JELLYFIN_LOGS_FOLDER, log_file)
|
||||
elif log_type == "scanner":
|
||||
log_file = 'Plex Media Scanner.log'
|
||||
log_file_path = os.path.join(jellypy.CONFIG.PMS_LOGS_FOLDER, log_file)
|
||||
log_file_path = os.path.join(jellypy.CONFIG.JELLYFIN_LOGS_FOLDER, log_file)
|
||||
else:
|
||||
return "Plex log folder not set in the settings."
|
||||
|
||||
@@ -4807,7 +4806,7 @@ class WebInterface(object):
|
||||
@requireAuth(member_of("admin"))
|
||||
@addtoapi('search')
|
||||
def search_results(self, query='', limit='', **kwargs):
|
||||
""" Get search results from the PMS.
|
||||
""" Get search results from the JELLYFIN.
|
||||
|
||||
```
|
||||
Required parameters:
|
||||
@@ -4928,7 +4927,7 @@ class WebInterface(object):
|
||||
@requireAuth(member_of("admin"))
|
||||
@addtoapi()
|
||||
def get_new_rating_keys(self, rating_key='', media_type='', **kwargs):
|
||||
""" Get a list of new rating keys for the PMS of all of the item's parent/children.
|
||||
""" Get a list of new rating keys for the JELLYFIN of all of the item's parent/children.
|
||||
|
||||
```
|
||||
Required parameters:
|
||||
@@ -4986,7 +4985,7 @@ class WebInterface(object):
|
||||
@cherrypy.expose
|
||||
@cherrypy.tools.json_out()
|
||||
@requireAuth(member_of("admin"))
|
||||
def get_pms_sessions_json(self, **kwargs):
|
||||
def get_jellyfin_sessions_json(self, **kwargs):
|
||||
""" Get all the current sessions. """
|
||||
# TODO: Jellyfin
|
||||
# pms_connect = pmsconnect.PmsConnect()
|
||||
@@ -5311,7 +5310,7 @@ class WebInterface(object):
|
||||
@cherrypy.tools.json_out()
|
||||
@requireAuth(member_of("admin"))
|
||||
def get_sync_lists(self, machine_id='', **kwargs):
|
||||
""" Get all items that are currently synced from the PMS. """
|
||||
""" Get all items that are currently synced from the JELLYFIN. """
|
||||
# TODO: Jellyfin
|
||||
# plex_tv = plextv.PlexTV()
|
||||
# result = plex_tv.get_plextv_sync_lists(machine_id=machine_id, output_format='json')
|
||||
@@ -5340,7 +5339,7 @@ class WebInterface(object):
|
||||
@requireAuth(member_of("admin"))
|
||||
@addtoapi()
|
||||
def get_servers_info(self, **kwargs):
|
||||
""" Get info about the PMS.
|
||||
""" Get info about the JELLYFIN.
|
||||
|
||||
```
|
||||
Required parameters:
|
||||
@@ -5407,7 +5406,7 @@ class WebInterface(object):
|
||||
@requireAuth(member_of("admin"))
|
||||
@addtoapi()
|
||||
def get_server_friendly_name(self, **kwargs):
|
||||
""" Get the name of the PMS.
|
||||
""" Get the name of the JELLYFIN.
|
||||
|
||||
```
|
||||
Required parameters:
|
||||
@@ -5434,7 +5433,7 @@ class WebInterface(object):
|
||||
@requireAuth()
|
||||
@addtoapi()
|
||||
def get_activity(self, session_key=None, session_id=None, **kwargs):
|
||||
""" Get the current activity on the PMS.
|
||||
""" Get the current activity on the JELLYFIN.
|
||||
|
||||
```
|
||||
Required parameters:
|
||||
@@ -5694,7 +5693,7 @@ class WebInterface(object):
|
||||
"""
|
||||
# TODO: Jellyfin
|
||||
# try:
|
||||
# pms_connect = pmsconnect.PmsConnect(token=jellypy.CONFIG.PMS_TOKEN)
|
||||
# pms_connect = pmsconnect.PmsConnect(token=jellypy.CONFIG.JELLYFIN_TOKEN)
|
||||
# result = pms_connect.get_current_activity()
|
||||
#
|
||||
# if result:
|
||||
@@ -5831,11 +5830,11 @@ class WebInterface(object):
|
||||
@sanitize_out()
|
||||
@addtoapi()
|
||||
def get_synced_items(self, machine_id='', user_id='', **kwargs):
|
||||
""" Get a list of synced items on the PMS.
|
||||
""" Get a list of synced items on the JELLYFIN.
|
||||
|
||||
```
|
||||
Required parameters:
|
||||
machine_id (str): The PMS identifier
|
||||
machine_id (str): The JELLYFIN identifier
|
||||
|
||||
Optional parameters:
|
||||
user_id (str): The id of the Plex user
|
||||
@@ -6062,7 +6061,7 @@ class WebInterface(object):
|
||||
@cherrypy.tools.json_out()
|
||||
@requireAuth(member_of("admin"))
|
||||
@addtoapi()
|
||||
def get_pms_update(self, **kwargs):
|
||||
def get_jellyfin_update(self, **kwargs):
|
||||
""" Check for updates to the Plex Media Server.
|
||||
|
||||
```
|
||||
|
Reference in New Issue
Block a user