anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed some facebook stuff, maybe adding it back later

Browse Source
This commit is contained in:
Giovanni Harting
2021-02-05 18:16:12 +01:00
parent 1df28243c3
commit 91e28df1a5
13 changed files with 219 additions and 1481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
jellypy/webserve.py
View File

@@ -25,6 +25,7 @@ import sys
import threading
import zipfile
from io import open, BytesIO
from urllib.parse import urlencode
import cherrypy
import mako.exceptions
@@ -32,7 +33,6 @@ import mako.template
import websocket
from cherrypy import NotFound
from cherrypy.lib.static import serve_file, serve_fileobj, serve_download
from hashing_passwords import make_hash
from mako.lookup import TemplateLookup
import jellypy
@@ -48,14 +48,12 @@ from jellypy import http_handler
from jellypy import libraries
from jellypy import log_reader
from jellypy import logger
from jellypy import mobile_app
from jellypy import newsletter_handler
from jellypy import newsletters
from jellypy import mobile_app
from jellypy import notification_handler
from jellypy import notifiers
from jellypy import plextv
from jellypy import plexivity_import
from jellypy import plexwatch_import
from jellypy import pmsconnect
from jellypy import users
from jellypy import versioncheck
@@ -63,6 +61,7 @@ from jellypy import web_socket
from jellypy import webstart
from jellypy.api2 import API2
from jellypy.helpers import checked, addtoapi, get_ip, create_https_certificates, build_datatables_json, sanitize_out
from jellypy.password import make_hash
from jellypy.session import get_session_info, get_session_user_id, allow_session_user, allow_session_library
from jellypy.webauth import AuthController, requireAuth, member_of, check_auth
@@ -3881,37 +3880,6 @@ class WebInterface(object):
if database_file:
helpers.delete_file(database_path)
return {'result': 'error', 'message': db_check_msg}
elif app.lower() == 'plexwatch':
db_check_msg = plexwatch_import.validate_database(database_file=database_path,
table_name=table_name)
if db_check_msg == 'success':
threading.Thread(target=plexwatch_import.import_from_plexwatch,
kwargs={'database_file': database_path,
'table_name': table_name,
'import_ignore_interval': import_ignore_interval}).start()
return {'result': 'success',
'message': 'Database import has started. Check the logs to monitor any problems.'}
else:
if database_file:
helpers.delete_file(database_path)
return {'result': 'error', 'message': db_check_msg}
elif app.lower() == 'plexivity':
db_check_msg = plexivity_import.validate_database(database_file=database_path,
table_name=table_name)
if db_check_msg == 'success':
threading.Thread(target=plexivity_import.import_from_plexivity,
kwargs={'database_file': database_path,
'table_name': table_name,
'import_ignore_interval': import_ignore_interval}).start()
return {'result': 'success',
'message': 'Database import has started. Check the logs to monitor any problems.'}
else:
if database_file:
helpers.delete_file(database_path)
return {'result': 'error', 'message': db_check_msg}
else:
return {'result': 'error', 'message': 'App not recognized for import'}