dockeruser
/
CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Rename XBMC labels to Kodi

old/redesign
Ruud 10 years ago
parent
a4b062d8dc
commit
a6946df820
1 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      couchpotato/core/notifications/xbmc.py

28
couchpotato/core/notifications/xbmc.py
View File

@ -83,7 +83,7 @@ class XBMC(Notification):
# v6 (as of XBMC v12(Frodo)) is required to send notifications # v6 (as of XBMC v12(Frodo)) is required to send notifications
xbmc_rpc_version = str(result['result']['version']) xbmc_rpc_version = str(result['result']['version'])
log.debug('XBMC JSON-RPC Version: %s ; Notifications by JSON-RPC only supported for v6 [as of XBMC v12(Frodo)]', xbmc_rpc_version) log.debug('Kodi JSON-RPC Version: %s ; Notifications by JSON-RPC only supported for v6 [as of XBMC v12(Frodo)]', xbmc_rpc_version)
# disable JSON use # disable JSON use
self.use_json_notifications[host] = False self.use_json_notifications[host] = False
@ -96,7 +96,7 @@ class XBMC(Notification):
success = True success = True
break break
elif r.get('error'): elif r.get('error'):
log.error('XBMC error; %s: %s (%s)', (r['id'], r['error']['message'], r['error']['code'])) log.error('Kodi error; %s: %s (%s)', (r['id'], r['error']['message'], r['error']['code']))
break break
elif result.get('result') and type(result['result']['version']).__name__ == 'dict': elif result.get('result') and type(result['result']['version']).__name__ == 'dict':
@ -106,7 +106,7 @@ class XBMC(Notification):
xbmc_rpc_version += '.' + str(result['result']['version']['minor']) xbmc_rpc_version += '.' + str(result['result']['version']['minor'])
xbmc_rpc_version += '.' + str(result['result']['version']['patch']) xbmc_rpc_version += '.' + str(result['result']['version']['patch'])
log.debug('XBMC JSON-RPC Version: %s', xbmc_rpc_version) log.debug('Kodie JSON-RPC Version: %s', xbmc_rpc_version)
# ok, XBMC version is supported # ok, XBMC version is supported
self.use_json_notifications[host] = True self.use_json_notifications[host] = True
@ -119,12 +119,12 @@ class XBMC(Notification):
success = True success = True
break break
elif r.get('error'): elif r.get('error'):
log.error('XBMC error; %s: %s (%s)', (r['id'], r['error']['message'], r['error']['code'])) log.error('Kodi error; %s: %s (%s)', (r['id'], r['error']['message'], r['error']['code']))
break break
# error getting version info (we do have contact with XBMC though) # error getting version info (we do have contact with XBMC though)
elif result.get('error'): elif result.get('error'):
log.error('XBMC error; %s: %s (%s)', (result['id'], result['error']['message'], result['error']['code'])) log.error('Kodi error; %s: %s (%s)', (result['id'], result['error']['message'], result['error']['code']))
log.debug('Use JSON notifications: %s ', self.use_json_notifications) log.debug('Use JSON notifications: %s ', self.use_json_notifications)
@ -173,10 +173,10 @@ class XBMC(Notification):
return [{'result': 'Error'}] return [{'result': 'Error'}]
except (MaxRetryError, Timeout, ConnectionError): except (MaxRetryError, Timeout, ConnectionError):
log.info2('Couldn\'t send request to XBMC, assuming it\'s turned off') log.info2('Couldn\'t send request to Kodi, assuming it\'s turned off')
return [{'result': 'Error'}] return [{'result': 'Error'}]
except: except:
log.error('Failed sending non-JSON-type request to XBMC: %s', traceback.format_exc()) log.error('Failed sending non-JSON-type request to Kodi: %s', traceback.format_exc())
return [{'result': 'Error'}] return [{'result': 'Error'}]
def request(self, host, do_requests): def request(self, host, do_requests):
@ -209,10 +209,10 @@ class XBMC(Notification):
return response return response
except (MaxRetryError, Timeout, ConnectionError): except (MaxRetryError, Timeout, ConnectionError):
log.info2('Couldn\'t send request to XBMC, assuming it\'s turned off') log.info2('Couldn\'t send request to Kodi, assuming it\'s turned off')
return [] return []
except: except:
log.error('Failed sending request to XBMC: %s', traceback.format_exc()) log.error('Failed sending request to Kodi: %s', traceback.format_exc())
return [] return []
@ -223,8 +223,8 @@ config = [{
'tab': 'notifications', 'tab': 'notifications',
'list': 'notification_providers', 'list': 'notification_providers',
'name': 'xbmc', 'name': 'xbmc',
'label': 'XBMC', 'label': 'Kodi',
'description': 'v11 (Eden), v12 (Frodo), v13 (Gotham)', 'description': 'v14 (Helix), v15 (Isengard)',
'options': [ 'options': [
{ {
'name': 'enabled', 'name': 'enabled',
@ -249,7 +249,7 @@ config = [{
'default': 0, 'default': 0,
'type': 'bool', 'type': 'bool',
'advanced': True, 'advanced': True,
'description': 'Only update the first host when movie snatched, useful for synced XBMC', 'description': 'Only update the first host when movie snatched, useful for synced Kodi',
}, },
{ {
'name': 'remote_dir_scan', 'name': 'remote_dir_scan',
@ -257,7 +257,7 @@ config = [{
'default': 0, 'default': 0,
'type': 'bool', 'type': 'bool',
'advanced': True, 'advanced': True,
'description': ('Only scan new movie folder at remote XBMC servers.', 'Useful if the XBMC path is different from the path CPS uses.'), 'description': ('Only scan new movie folder at remote Kodi servers.', 'Useful if the Kodi path is different from the path CPS uses.'),
}, },
{ {
'name': 'force_full_scan', 'name': 'force_full_scan',
@ -265,7 +265,7 @@ config = [{
'default': 0, 'default': 0,
'type': 'bool', 'type': 'bool',
'advanced': True, 'advanced': True,
'description': ('Do a full scan instead of only the new movie.', 'Useful if the XBMC path is different from the path CPS uses.'), 'description': ('Do a full scan instead of only the new movie.', 'Useful if the Kodi path is different from the path CPS uses.'),
}, },
{ {
'name': 'on_snatch', 'name': 'on_snatch',

Write Preview
Loading…
Cancel
Save