Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-11-10 04:06:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Replaced debug output of json.dumps with an indirection to lazy __str__."

Browse source 
This reverts commit 78fda95853.

Committed on the wrong branch.
This commit is contained in:
Chuddah 2020-02-16 22:22:23 +00:00
parent 78fda95853
commit b9817a5617
5 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
jellyfin_kodi/entrypoint/default.py
View file

@ -15,7 +15,7 @@ import client
from database import reset, get_sync, Database, jellyfin_db, get_credentials
from objects import Objects, Actions
from downloader import TheVoid
from helper import translate, event, settings, window, dialog, api, JSONRPC, debug
from helper import translate, event, settings, window, dialog, api, JSONRPC
#################################################################################################
@ -45,7 +45,7 @@ class Events(object):
if server == 'None':
server = None
LOG.info("path: %s params: %s", path, debug.JsonDebugPrinter(params))
LOG.info("path: %s params: %s", path, json.dumps(params, indent=4))
if '/extrafanart' in base_url:

4
jellyfin_kodi/entrypoint/service.py
View file

@ -20,7 +20,7 @@ import library
import setup
import monitor
from views import Views, verify_kodi_defaults
from helper import translate, window, settings, event, dialog, debug
from helper import translate, window, settings, event, dialog
from jellyfin import Jellyfin
#################################################################################################
@ -171,7 +171,7 @@ class Service(xbmc.Monitor):
data = json.loads(data)
LOG.debug("[ %s: %s ] %s", sender, method, debug.JsonDebugPrinter(data))
LOG.debug("[ %s: %s ] %s", sender, method, json.dumps(data, indent=4))
if method == 'ServerOnline':
if data.get('ServerId') is None:

15
jellyfin_kodi/helper/debug.py
View file

@ -1,15 +0,0 @@
# -*- coding: utf-8 -*-
##################################################################################################
import json
##################################################################################################
class JsonDebugPrinter(object):
def __init__(self, json):
self.json = json
def __str__(self):
return json.dumps(self.json, indent=4)

5
jellyfin_kodi/jellyfin/http.py
View file

@ -11,7 +11,6 @@ import requests
from six import string_types
from .exceptions import HTTPException
from helper import debug
#################################################################################################
@ -81,7 +80,7 @@ class HTTP(object):
raise AttributeError("Request cannot be empty")
data = self._request(data)
LOG.debug("--->[ http ] %s", debug.JsonDebugPrinter(data))
LOG.debug("--->[ http ] %s", json.dumps(data, indent=4))
retry = data.pop('retry', 5)
while True:
@ -163,7 +162,7 @@ class HTTP(object):
elapsed = int(r.elapsed.total_seconds() * 1000)
response = r.json()
LOG.debug("---<[ http ][%s ms]", elapsed)
LOG.debug(debug.JsonDebugPrinter(response))
LOG.debug(json.dumps(response, indent=4))
return response
except ValueError:

4
jellyfin_kodi/monitor.py
View file

@ -15,7 +15,7 @@ import downloader
import player
from client import get_device_id
from objects import PlaylistWorker, on_play, on_update, special_listener
from helper import translate, settings, window, dialog, api, JSONRPC, debug
from helper import translate, settings, window, dialog, api, JSONRPC
from jellyfin import Jellyfin
from webservice import WebService
@ -96,7 +96,7 @@ class Monitor(xbmc.Monitor):
data = json.loads(data)
LOG.debug("[ %s: %s ] %s", sender, method, debug.JsonDebugPrinter(data))
LOG.debug("[ %s: %s ] %s", sender, method, json.dumps(data, indent=4))
if self.sleep:
LOG.info("System.OnSleep detected, ignore monitor request.")