diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html index adb77e45..33cd290c 100644 --- a/data/interfaces/default/welcome.html +++ b/data/interfaces/default/welcome.html @@ -229,24 +229,6 @@
- - - - - - - - - - - - - - - - - -
diff --git a/plexpy/config.py b/plexpy/config.py index 6f36f55e..42a1ce8a 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -116,7 +116,7 @@ _CONFIG_DEFINITIONS = { 'GROUP_HISTORY_TABLES': (int, 'General', 1), 'HISTORY_TABLE_ACTIVITY': (int, 'General', 1), 'HOME_SECTIONS': (list, 'General', ['current_activity', 'watch_stats', 'library_stats', 'recently_added']), - 'HOME_LIBRARY_CARDS': (list, 'General', ['first_run']), + 'HOME_LIBRARY_CARDS': (list, 'General', []), 'HOME_STATS_CARDS': (list, 'General', ['top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music', 'popular_music', 'last_watched', 'top_libraries', 'top_users', 'top_platforms', 'most_concurrent']), 'HOME_REFRESH_INTERVAL': (int, 'General', 10), @@ -601,14 +601,6 @@ class Config(object): self.CONFIG_VERSION = 4 if self.CONFIG_VERSION == 4: - if not len(self.HOME_STATS_CARDS) and 'watch_stats' in self.HOME_SECTIONS: - home_sections = self.HOME_SECTIONS - home_sections.remove('watch_stats') - self.HOME_SECTIONS = home_sections - if not len(self.HOME_LIBRARY_CARDS) and 'library_stats' in self.HOME_SECTIONS: - home_sections = self.HOME_SECTIONS - home_sections.remove('library_stats') - self.HOME_SECTIONS = home_sections self.CONFIG_VERSION = 5 diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index c05224a2..031c125c 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -988,9 +988,6 @@ class DataFactory(object): if session.get_session_shared_libraries(): library_cards = session.get_session_shared_libraries() - if 'first_run_wizard' in library_cards: - return None - library_stats = [] try: diff --git a/plexpy/libraries.py b/plexpy/libraries.py index 985ec0f7..011f8201 100644 --- a/plexpy/libraries.py +++ b/plexpy/libraries.py @@ -99,13 +99,9 @@ def refresh_libraries(): 'section_id NOT IN ({})'.format(', '.join(['?'] * len(section_ids))) monitor_db.action(query=query, args=[plexpy.CONFIG.PMS_IDENTIFIER] + section_ids) - if plexpy.CONFIG.HOME_LIBRARY_CARDS == ['first_run_wizard']: - plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', library_keys) - plexpy.CONFIG.write() - else: - new_keys = plexpy.CONFIG.HOME_LIBRARY_CARDS + new_keys - plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', new_keys) - plexpy.CONFIG.write() + new_keys = plexpy.CONFIG.HOME_LIBRARY_CARDS + new_keys + plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', new_keys) + plexpy.CONFIG.write() logger.info("Tautulli Libraries :: Libraries list refreshed.") return True diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 76a4d600..63952807 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -3171,14 +3171,16 @@ class WebInterface(object): # First run from the setup wizard if kwargs.pop('first_run', None): first_run = True + server_changed = True - for checked_config in config.CHECKED_SETTINGS: - checked_config = checked_config.lower() - if checked_config not in kwargs: - # checked items should be zero or one. if they were not sent then the item was not checked - kwargs[checked_config] = 0 - else: - kwargs[checked_config] = 1 + if not first_run: + for checked_config in config.CHECKED_SETTINGS: + checked_config = checked_config.lower() + if checked_config not in kwargs: + # checked items should be zero or one. if they were not sent then the item was not checked + kwargs[checked_config] = 0 + else: + kwargs[checked_config] = 1 # If http password exists in config, do not overwrite when blank value received if kwargs.get('http_password') == ' ': @@ -3237,9 +3239,6 @@ class WebInterface(object): del kwargs[k] kwargs['home_stats_cards'] = kwargs['home_stats_cards'].split(',') - if kwargs['home_stats_cards'] == ['first_run_wizard']: - kwargs['home_stats_cards'] = plexpy.CONFIG.HOME_STATS_CARDS - # Remove config with 'hlcard-' prefix and change home_library_cards to list if kwargs.get('home_library_cards'): for k in list(kwargs.keys()): @@ -3247,11 +3246,8 @@ class WebInterface(object): del kwargs[k] kwargs['home_library_cards'] = kwargs['home_library_cards'].split(',') - if kwargs['home_library_cards'] == ['first_run_wizard']: - refresh_libraries = True - # If we change the server, make sure we grab the new url and refresh libraries and users lists. - if kwargs.pop('server_changed', None): + if kwargs.pop('server_changed', None) or server_changed: server_changed = True refresh_users = True refresh_libraries = True