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

Update setup wizard

Browse Source
This commit is contained in:
JonnyWong16
2017-12-16 12:43:14 -08:00
parent c586fe1d07
commit abab2f3f6b
4 changed files with 136 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

269
data/interfaces/default/welcome.html
View File

@@ -14,9 +14,9 @@
<meta name="author" content=""> <meta name="author" content="">
<link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet"> <link href="${http_root}css/bootstrap3/bootstrap.css" rel="stylesheet">
<link href="${http_root}css/bootstrap-wizard.css" rel="stylesheet"> <link href="${http_root}css/bootstrap-wizard.css" rel="stylesheet">
<link href="${http_root}css/plexpy.css" rel="stylesheet"> <link href="${http_root}css/plexpy.css${cache_param}" rel="stylesheet">
<link href="${http_root}css/selectize.bootstrap3.css" rel="stylesheet"> <link href="${http_root}css/selectize.bootstrap3.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css"> <link href="${http_root}css/opensans.min.css" rel="stylesheet">
<link href="${http_root}css/font-awesome.min.css" rel="stylesheet"> <link href="${http_root}css/font-awesome.min.css" rel="stylesheet">
<link rel="icon" type="image/x-icon" href="${http_root}images/favicon.ico"/> <link rel="icon" type="image/x-icon" href="${http_root}images/favicon.ico"/>
<link rel="shortcut icon" href="${http_root}images/favicon.ico"> <link rel="shortcut icon" href="${http_root}images/favicon.ico">
@@ -26,159 +26,134 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="wizard" id="some-wizard" data-title="PlexPy Setup Wizard"> <div class="wizard" id="some-wizard" data-title="PlexPy Setup Wizard">
<div class="wizard-card" data-cardname="card1"> <form>
<div style="float: right;"> <div class="wizard-card" data-cardname="card1">
<img src="${http_root}images/logo-plexpy.png"/> <div style="float: right;">
</div> <img src="${http_root}images/logo-plexpy.png" />
<h3 style="line-height: 50px;">Welcome!</h3> </div>
<br/> <h3 style="line-height: 50px;">Welcome!</h3>
<div> <br />
Thanks for taking the time to try out PlexPy. Hope you find it useful. <div>
<br/><br/> Thanks for taking the time to try out PlexPy. Hope you find it useful.
PlexPy requires a permanent internet connection to ensure a reliable experience. <br /><br />
<br/><br/> PlexPy requires a permanent internet connection to ensure a reliable experience.
This wizard will help you get set up, to continue press Next. <br /><br />
</div> This wizard will help you get set up, to continue press Next.
</div>
<div class="wizard-card" data-cardname="card2">
<h3>Plex Authentication</h3>
<p class="help-block">Enter your Plex.tv username and password. PlexPy does not store your username or password.</p>
<div class="wizard-input-section">
<label for="pms_username">Plex.tv Username</label>
<div class="row">
<div class="col-xs-8">
<input type="text" class="form-control pms-auth" id="pms_username" placeholder="" required>
</div>
</div> </div>
</div> </div>
<div class="wizard-input-section"> <div class="wizard-card" data-cardname="card2">
<label for="pms_password">Plex.tv Password</label> <h3>Plex Authentication</h3>
<div class="row"> <p class="help-block">Enter your Plex.tv username and password. PlexPy does not store your username or password.</p>
<div class="col-xs-8"> <div class="wizard-input-section">
<input type="password" class="form-control pms-auth" id="pms_password" placeholder="" required> <label for="pms_username">Plex.tv Username</label>
<div class="row">
<div class="col-xs-8">
<input type="text" class="form-control pms-auth" id="pms_username" placeholder="" required>
</div>
</div> </div>
</div> </div>
<div class="wizard-input-section">
<label for="pms_password">Plex.tv Password</label>
<div class="row">
<div class="col-xs-8">
<input type="password" class="form-control pms-auth" id="pms_password" placeholder="" required>
</div>
</div>
</div>
<input type="hidden" class="form-control pms-auth" name="pms_token" id="pms_token" value="${config['pms_token']}" data-validate="validatePMStoken">
<a class="btn btn-dark" id="pms-authenticate" href="#" role="button">Authenticate</a><span style="margin-left: 10px; display: none;" id="pms-token-status"></span>
</div> </div>
<input type="hidden" class="form-control pms-auth" name="pms_token" id="pms_token" value="${config['pms_token']}" data-validate="validatePMStoken"> <div class="wizard-card" data-cardname="card3">
<a class="btn btn-dark" id="pms-authenticate" href="#" role="button">Authenticate</a><span style="margin-left: 10px; display: none;" id="pms-token-status"></span> <h3>Plex Media Server</h3>
</div>
<div class="wizard-card" data-cardname="card3">
<h3>Plex Media Server</h3>
<form>
<p class="help-block">Enter your Plex Server details and then click the Verify button to make sure PlexPy can reach the server.</p> <p class="help-block">Enter your Plex Server details and then click the Verify button to make sure PlexPy can reach the server.</p>
<div class="wizard-input-section"> <div class="wizard-input-section">
<label for="pms_ip">Plex IP or Hostname</label> <label for="pms_ip">Plex IP or Hostname</label>
<div class="row"> <div class="row">
<div class="col-xs-8"> <div class="col-xs-8">
<select id="pms_ip" name="pms_ip"></select> <select id="pms_ip" name="pms_ip"></select>
</div>
</div>
</div>
<div class="wizard-input-section">
<label for="pms_port">Port Number</label>
<div class="row">
<div class="col-xs-3">
<input type="text" class="form-control pms_settings" name="pms_port" id="pms_port" placeholder="32400" value="${config['pms_port']}" required>
</div>
<div class="col-xs-4">
<div class="checkbox">
<label>
<input type="checkbox" id="pms_ssl" name="pms_ssl" value="1"> Use SSL
</label>
</div>
</div>
<div class="col-xs-4">
<div class="checkbox">
<label>
<input type="checkbox" id="pms_is_remote" name="pms_is_remote" value="1"> Remote Server
</label>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="wizard-input-section">
<input type="hidden" class="form-control pms-settings" id="pms_valid" data-validate="validatePMSip" value=""> <label for="pms_port">Port Number</label>
<input type="hidden" class="form-control pms-settings" id="pms_identifier" name="pms_identifier" value="${config['pms_identifier']}"> <div class="row">
<a class="btn btn-dark" id="verify-plex-server" href="#" role="button">Verify</a><span style="margin-left: 10px; display: none;" id="pms-verify-status"></span> <div class="col-xs-3">
</div> <input type="text" class="form-control pms_settings" name="pms_port" id="pms_port" placeholder="32400" value="${config['pms_port']}" required>
</div>
<div class="col-xs-4">
<div class="wizard-card" data-cardname="card4"> <div class="checkbox">
<h3>Monitoring</h3> <label>
<p class="help-block">Keep records of all movie, TV show, or music items played from your Plex Media Server.</p> <input type="checkbox" id="pms_ssl" name="pms_ssl" value="1"> Use SSL
<div class="wizard-input-section"> </label>
<input type="checkbox" id="movie_logging_enable" name="movie_logging_enable" value="1" ${config['movie_logging_enable']}> Enable Movie Logging </div>
</div> </div>
<div class="wizard-input-section"> <div class="col-xs-4">
<input type="checkbox" id="tv_logging_enable" name="tv_logging_enable" value="1" ${config['tv_logging_enable']}> Enable TV Show Logging <div class="checkbox">
</div> <label>
<div class="wizard-input-section"> <input type="checkbox" id="pms_is_remote" name="pms_is_remote" value="1"> Remote Server
<input type="checkbox" id="music_logging_enable" name="music_logging_enable" value="1" ${config['music_logging_enable']}> Enable Music Logging </label>
</div> </div>
<div class="wizard-input-section"> </div>
<label for="logging_ignore_interval">Ignore Interval</label>
<div class="row">
<div class="col-xs-4">
<input type="text" class="form-control pms-monitoring" id="logging_ignore_interval" name="logging_ignore_interval" placeholder="120" value="${config['logging_ignore_interval']}" data-validate="validateIgnoreInterval" required>
</div>
<span style="margin-left: 10px; line-height: 35px; display: none;" id="ignore-int-status"></span>
</div>
<p class="help-block">The interval (in seconds) PlexPy will wait for a video item to be active before logging it. 0 to disable.</p>
</div>
</div>
<div class="wizard-card" data-cardname="card5">
<h3>Notifications</h3>
<p class="help-block">PlexPy supports a wide variety of notification options. To set up a notification agent configure this in <strong>Settings -> Notification Agents</strong>
after you have completed this setup wizard.</p><br/>
<div class="wizard-input-section">
<input type="checkbox" name="movie_notify_enable" id="movie_notify_enable" value="1" ${config['movie_notify_enable']}> Enable notifications on Movie playback
</div>
<div class="wizard-input-section">
<input type="checkbox" name="tv_notify_enable" id="tv_notify_enable" value="1" ${config['tv_notify_enable']}> Enable notifications on TV Show playback
</div>
<div class="wizard-input-section">
<input type="checkbox" name="music_notify_enable" id="music_notify_enable" value="1" ${config['music_notify_enable']}> Enable notifications on Music playback
</div>
</div>
<div class="wizard-card" data-cardname="card6">
<h3>Database Import</h3>
<p class="help-block">If you have an existing PlexWatch/Plexivity database, you can import the data into PlexPy.</p>
<p class="help-block">
When you complete this wizard navigate to the settings menu and to the Extra Settings tab. You will find an import tool there
which will convert your PlexWatch/Plexivity database into a format that PlexPy can read.
</p>
<!-- Figure out best way to get friends list refreshed before adding this back
You can skip this and do it later if you wish.</p>
<p class="help-block">Enter the path and file name where your
plexWatch database file is located and hit Import. The import will run in the background so you can safely finish the wizard when the
Import status below changes to "Started"</p>
<div class="wizard-input-section">
<label for="db_location">Database full Path and Filename</label>
<div class="row">
<div class="col-xs-8">
<input type="text" class="form-control plexwatch-import" id="db_location" value="">
</div>
<div class="col-xs-4">
<a class="btn btn-default btn-sm" id="plexwatch-import" style="margin-top: 4px;" href="#" role="button">Import</a>
</div> </div>
</div> </div>
<input type="hidden" class="form-control pms-settings" id="pms_valid" data-validate="validatePMSip" value="">
<input type="hidden" class="form-control pms-settings" id="pms_identifier" name="pms_identifier" value="${config['pms_identifier']}">
<a class="btn btn-dark" id="verify-plex-server" href="#" role="button">Verify</a><span style="margin-left: 10px; display: none;" id="pms-verify-status"></span>
</div> </div>
<span>Import status: </span><strong><span id="plexwatch-import-status">Idle</span></strong>
--> <div class="wizard-card" data-cardname="card4">
<div style="display: none;"> <h3>Activity Logging</h3>
<input type="checkbox" name="launch_browser" id="launch_browser" value="1" ${config['launch_browser']}> <p class="help-block">PlexPy will keep a history of all streaming activity on your Plex server.</p>
<input type="checkbox" name="refresh_users_on_startup" id="refresh_users_on_startup" value="1" ${config['refresh_users_on_startup']}>
<input type="checkbox" name="refresh_libraries_on_startup" id="refresh_libraries_on_startup" value="1" ${config['refresh_libraries_on_startup']}> <div class="wizard-input-section">
<input type="checkbox" name="check_github" id="check_github" value="1" ${config['check_github']}> <label for="logging_ignore_interval">Ignore Interval</label>
<input type="checkbox" name="log_blacklist" id="log_blacklist" value="1" ${config['log_blacklist']}> <div class="row">
<input type="checkbox" name="cache_images" id="cache_images" value="1" ${config['cache_images']}> <div class="col-xs-4">
<input type="checkbox" name="server_changed" id="server_changed" value="1" checked> <input type="text" class="form-control pms-monitoring" id="logging_ignore_interval" name="logging_ignore_interval" placeholder="120" value="${config['logging_ignore_interval']}" data-validate="validateIgnoreInterval" required>
<input type="checkbox" name="first_run_complete" id="first_run_complete" value="1" checked> </div>
<input type="text" name="home_stats_cards" id="home_stats_cards" value="first_run_wizard"> <span style="margin-left: 10px; line-height: 35px; display: none;" id="ignore-int-status"></span>
<input type="text" name="home_library_cards" id="home_library_cards" value="first_run_wizard"> </div>
<p class="help-block">The interval (in seconds) an item must be in a playing state before logging it. 0 to disable.</p>
</div>
<p class="help-block">
Additional options to disable history logging for certain libraries or users can be found by editing them
on the <strong>Libraries</strong> or <strong>Users</strong> pages.
</p>
</div>
<div class="wizard-card" data-cardname="card4">
<h3>Notifications</h3>
<p class="help-block">PlexPy can send a wide variety of notification to alert you of activity on your Plex server.</p>
<p class="help-block">
To set up a notification agent, navigate to the <strong>Settings</strong> page
and to the <strong>Notification Agents</strong> tab after you have completed this setup wizard.
</p>
</div>
<div class="wizard-card" data-cardname="card5">
<h3>Database Import</h3>
<p class="help-block">If you have an existing PlexWatch/Plexivity database, you can import the data into PlexPy.</p>
<p class="help-block">
To import a database, navigate to the <strong>Settings</strong> page
and to the <strong>Import & Backups</strong> tab after you have completed this setup wizard.
</p>
<!-- Required fields but hidden -->
<div style="display: none;">
<input type="checkbox" name="launch_browser" id="launch_browser" value="1" ${config['launch_browser']}>
<input type="checkbox" name="refresh_users_on_startup" id="refresh_users_on_startup" value="1" ${config['refresh_users_on_startup']}>
<input type="checkbox" name="refresh_libraries_on_startup" id="refresh_libraries_on_startup" value="1" ${config['refresh_libraries_on_startup']}>
<input type="checkbox" name="check_github" id="check_github" value="1" ${config['check_github']}>
<input type="checkbox" name="log_blacklist" id="log_blacklist" value="1" ${config['log_blacklist']}>
<input type="checkbox" name="cache_images" id="cache_images" value="1" ${config['cache_images']}>
<input type="checkbox" name="server_changed" id="server_changed" value="1" checked>
<input type="checkbox" name="first_run_complete" id="first_run_complete" value="1" checked>
<input type="text" name="home_stats_cards" id="home_stats_cards" value="first_run_wizard">
<input type="text" name="home_library_cards" id="home_library_cards" value="first_run_wizard">
</div>
</div> </div>
</div>
<!-- Required fields but hidden -->
</form> </form>
<div class="wizard-success"> <div class="wizard-success">
@@ -186,7 +161,7 @@
<br/> <br/>
<p>Setup is now complete. For more configuration options please visit the Settings menu on the home page.</p> <p>Setup is now complete. For more configuration options please visit the Settings menu on the home page.</p>
<br/> <br/>
<i class="fa fa-refresh fa-spin"></i>&nbspWaiting 5 seconds to ensure authentication token is registered... <i class="fa fa-refresh fa-spin"></i>&nbspWaiting <span class="countdown">5</span> seconds to ensure authentication token is registered...
</div> </div>
</div> </div>
@@ -196,7 +171,7 @@
<script src="${http_root}js/jquery-2.1.4.min.js"></script> <script src="${http_root}js/jquery-2.1.4.min.js"></script>
<script src="${http_root}js/bootstrap.min.js"></script> <script src="${http_root}js/bootstrap.min.js"></script>
<script src="${http_root}js/selectize.min.js"></script> <script src="${http_root}js/selectize.min.js"></script>
<script src="${http_root}js/script.js"></script> <script src="${http_root}js/script.js${cache_param}"></script>
<script src="${http_root}js/bootstrap-wizard.min.js"></script> <script src="${http_root}js/bootstrap-wizard.min.js"></script>
<script> <script>
@@ -224,9 +199,7 @@
data: wizard.serialize(), data: wizard.serialize(),
dataType: "json", dataType: "json",
complete: function (data) { complete: function (data) {
setTimeout(function(){ $(".countdown").countdown(function () { location.reload(); }, 5, "");
location.reload();
}, 5000);
} }
}) })
}); });
@@ -470,7 +443,7 @@
function getServerOptions(token) { function getServerOptions(token) {
/* Set token and returns server options */ /* Set token and returns server options */
$.ajax({ $.ajax({
url: "discover/" + token, url: "discover/" + token + '?include_cloud=false',
success: function (result) { success: function (result) {
$('#pms_ip').html("") $('#pms_ip').html("")
// Add all servers to the "combobox" // Add all servers to the "combobox"

6
plexpy/plextv.py
View File

@@ -638,7 +638,7 @@ class PlexTV(object):
return server_times return server_times
def discover(self): def discover(self, include_cloud=True):
""" Query plex for all servers online. Returns the ones you own in a selectize format """ """ Query plex for all servers online. Returns the ones you own in a selectize format """
servers = self.get_plextv_resources(include_https=True, output_format='xml') servers = self.get_plextv_resources(include_https=True, output_format='xml')
clean_servers = [] clean_servers = []
@@ -661,6 +661,10 @@ class PlexTV(object):
if helpers.get_xml_attr(d, 'presence') == '1' and \ if helpers.get_xml_attr(d, 'presence') == '1' and \
helpers.get_xml_attr(d, 'owned') == '1' and \ helpers.get_xml_attr(d, 'owned') == '1' and \
helpers.get_xml_attr(d, 'provides') == 'server': helpers.get_xml_attr(d, 'provides') == 'server':
if not include_cloud and helpers.get_xml_attr(d, 'platform').lower() == 'cloud':
continue
connections = d.getElementsByTagName('Connection') connections = d.getElementsByTagName('Connection')
for c in connections: for c in connections:

12
plexpy/pmsconnect.py
View File

@@ -93,13 +93,13 @@ def refresh_libraries():
plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', new_keys) plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', new_keys)
plexpy.CONFIG.write() plexpy.CONFIG.write()
if plexpy.CONFIG.UPDATE_SECTION_IDS == 1 or plexpy.CONFIG.UPDATE_SECTION_IDS == -1: #if plexpy.CONFIG.UPDATE_SECTION_IDS == 1 or plexpy.CONFIG.UPDATE_SECTION_IDS == -1:
# Start library section_id update on it's own thread # # Start library section_id update on it's own thread
threading.Thread(target=libraries.update_section_ids).start() # threading.Thread(target=libraries.update_section_ids).start()
if plexpy.CONFIG.UPDATE_LABELS == 1 or plexpy.CONFIG.UPDATE_LABELS == -1: #if plexpy.CONFIG.UPDATE_LABELS == 1 or plexpy.CONFIG.UPDATE_LABELS == -1:
# Start library labels update on it's own thread # # Start library labels update on it's own thread
threading.Thread(target=libraries.update_labels).start() # threading.Thread(target=libraries.update_labels).start()
logger.info(u"PlexPy Pmsconnect :: Libraries list refreshed.") logger.info(u"PlexPy Pmsconnect :: Libraries list refreshed.")
return True return True

6
plexpy/webserve.py
View File

@@ -131,7 +131,7 @@ class WebInterface(object):
@cherrypy.tools.json_out() @cherrypy.tools.json_out()
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))
@addtoapi("get_server_list") @addtoapi("get_server_list")
def discover(self, token=None, **kwargs): def discover(self, token=None, include_cloud=True, **kwargs):
""" Get all your servers that are published to Plex.tv. """ Get all your servers that are published to Plex.tv.
``` ```
@@ -161,8 +161,10 @@ class WebInterface(object):
plexpy.CONFIG.__setattr__('PMS_TOKEN', token) plexpy.CONFIG.__setattr__('PMS_TOKEN', token)
plexpy.CONFIG.write() plexpy.CONFIG.write()
include_cloud = not (include_cloud == 'false')
plex_tv = plextv.PlexTV() plex_tv = plextv.PlexTV()
servers = plex_tv.discover() servers = plex_tv.discover(include_cloud=include_cloud)
if servers: if servers:
return servers return servers