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

Clear session metadata cache on startup

Browse Source
This commit is contained in:
JonnyWong16
2018-02-03 09:06:05 -08:00
parent 3e723d4373
commit 56dc28eed3
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plexpy/__init__.py
View File

@@ -15,6 +15,7 @@
import os import os
from Queue import Queue from Queue import Queue
import shutil
import sqlite3 import sqlite3
import sys import sys
import subprocess import subprocess
@@ -156,6 +157,16 @@ def initialize(config_file):
except OSError as e: except OSError as e:
logger.error(u"Could not create cache dir '%s': %s" % (CONFIG.CACHE_DIR, e)) logger.error(u"Could not create cache dir '%s': %s" % (CONFIG.CACHE_DIR, e))
if CONFIG.CACHE_DIR:
session_metadata_folder = os.path.join(CONFIG.CACHE_DIR, 'session_metadata')
try:
shutil.rmtree(session_metadata_folder, ignore_errors=True)
except OSError as e:
pass
if not os.path.exists(session_metadata_folder):
os.mkdir(session_metadata_folder)
# Initialize the database # Initialize the database
logger.info(u"Checking if the database upgrades are required...") logger.info(u"Checking if the database upgrades are required...")
try: try:

2
plexpy/activity_handler.py
View File

@@ -546,7 +546,7 @@ def on_created(rating_key, **kwargs):
def delete_metadata_cache(session_key): def delete_metadata_cache(session_key):
try: try:
os.remove(os.path.join(plexpy.CONFIG.CACHE_DIR, 'metadata-sessionKey-%s.json' % session_key)) os.remove(os.path.join(plexpy.CONFIG.CACHE_DIR, 'session_metadata/metadata-sessionKey-%s.json' % session_key))
except IOError as e: except IOError as e:
logger.error(u"Tautulli ActivityHandler :: Failed to remove metadata cache file (sessionKey %s): %s" logger.error(u"Tautulli ActivityHandler :: Failed to remove metadata cache file (sessionKey %s): %s"
% (session_key, e)) % (session_key, e))

4
plexpy/pmsconnect.py
View File

@@ -533,7 +533,7 @@ class PmsConnect(object):
metadata = {} metadata = {}
if cache_key: if cache_key:
in_file_path = os.path.join(plexpy.CONFIG.CACHE_DIR, 'metadata-sessionKey-%s.json' % cache_key) in_file_path = os.path.join(plexpy.CONFIG.CACHE_DIR, 'session_metadata/metadata-sessionKey-%s.json' % cache_key)
try: try:
with open(in_file_path, 'r') as inFile: with open(in_file_path, 'r') as inFile:
metadata = json.load(inFile) metadata = json.load(inFile)
@@ -1179,7 +1179,7 @@ class PmsConnect(object):
if cache_key: if cache_key:
metadata['_cache_time'] = int(time.time()) metadata['_cache_time'] = int(time.time())
out_file_path = os.path.join(plexpy.CONFIG.CACHE_DIR, 'metadata-sessionKey-%s.json' % cache_key) out_file_path = os.path.join(plexpy.CONFIG.CACHE_DIR, 'session_metadata/metadata-sessionKey-%s.json' % cache_key)
try: try:
with open(out_file_path, 'w') as outFile: with open(out_file_path, 'w') as outFile:
json.dump(metadata, outFile) json.dump(metadata, outFile)