github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-16 02:02:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bug where user refresh would fail under certain circumstances.

Browse source 
Move all user functions to it's own class.
This commit is contained in:
Tim 2015-08-16 12:40:32 +02:00
parent fd3daae491
commit c98a8865d6
9 changed files with 522 additions and 500 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plexpy/plexwatch_import.py
View file

@ -15,7 +15,7 @@
import sqlite3
from plexpy import logger, helpers, monitor, datafactory, plextv
from plexpy import logger, helpers, monitor, users, plextv
from xml.dom import minidom
import plexpy
@ -246,7 +246,7 @@ def import_from_plexwatch(database=None, table_name=None, import_ignore_interval
plexpy.schedule_job(monitor.check_active_sessions, 'Check for active sessions', hours=0, minutes=0, seconds=0)
monitor_processing = monitor.MonitorProcessing()
data_factory = datafactory.DataFactory()
user_data = users.Users()
# Get the latest friends list so we can pull user id's
try:
@ -292,8 +292,8 @@ def import_from_plexwatch(database=None, table_name=None, import_ignore_interval
continue
# If the user_id no longer exists in the friends list, pull it from the xml.
if data_factory.get_user_id(user=row['user']):
user_id = data_factory.get_user_id(user=row['user'])
if user_data.get_user_id(user=row['user']):
user_id = user_data.get_user_id(user=row['user'])
else:
user_id = extracted_xml['user_id']