Update logic to fill defaults into config instance

Author: glensc

plexapi/config.py

@@ -42,39 +42,47 @@ def get(self, key, default=None, cast=None):
     def _asDict(self):
         """ Returns all configuration values as a dictionary. """
         config = defaultdict(dict)
+        config.update(self._defaults())
         for section in self._sections:
             for name, value in self._sections[section].items():
                 if name != '__name__':
                     config[section.lower()][name.lower()] = value
         return dict(config)
 
+    def _defaults(self):
+        from uuid import getnode
+        from platform import uname
+        from plexapi import PROJECT, VERSION
 
-def reset_base_headers():
-    """ Convenience function returns a dict of all base X-Plex-* headers for session requests. """
-    from platform import uname
-    from uuid import getnode
+        platform_name, device_name, platform_version = uname()[0:3]
+
+        return {
+            'header': {
+                'provides': 'controller',
+                'platform': platform_name,
+                'platform_version': platform_version,
+                'product': PROJECT,
+                'version': VERSION,
+                'device': platform_name,
+                'device_name': device_name,
+                'identifier': str(hex(getnode())),
+            }
+        }
 
-    from plexapi import CONFIG, PROJECT, VERSION
 
-    # Plex Header Configuration
-    X_PLEX_PROVIDES = CONFIG.get('header.provides', 'controller')
-    X_PLEX_PLATFORM = CONFIG.get('header.platform', CONFIG.get('header.platorm', uname()[0]))
-    X_PLEX_PLATFORM_VERSION = CONFIG.get('header.platform_version', uname()[2])
-    X_PLEX_PRODUCT = CONFIG.get('header.product', PROJECT)
-    X_PLEX_VERSION = CONFIG.get('header.version', VERSION)
-    X_PLEX_DEVICE = CONFIG.get('header.device', X_PLEX_PLATFORM)
-    X_PLEX_DEVICE_NAME = CONFIG.get('header.device_name', uname()[1])
-    X_PLEX_IDENTIFIER = CONFIG.get('header.identifier', str(hex(getnode())))
+def reset_base_headers():
+    """ Convenience function returns a dict of all base X-Plex-* headers for session requests. """
+    from plexapi import CONFIG
 
     return {
-        'X-Plex-Platform': X_PLEX_PLATFORM,
-        'X-Plex-Platform-Version': X_PLEX_PLATFORM_VERSION,
-        'X-Plex-Provides': X_PLEX_PROVIDES,
-        'X-Plex-Product': X_PLEX_PRODUCT,
-        'X-Plex-Version': X_PLEX_VERSION,
-        'X-Plex-Device': X_PLEX_DEVICE,
-        'X-Plex-Device-Name': X_PLEX_DEVICE_NAME,
-        'X-Plex-Client-Identifier': X_PLEX_IDENTIFIER,
+        'X-Plex-Platform': CONFIG.get('header.platorm', CONFIG.get('header.platform')),
+        'X-Plex-Platform-Version': CONFIG.get('header.platform_version'),
+        'X-Plex-Provides': CONFIG.get('header.provides'),
+        'X-Plex-Product': CONFIG.get('header.product'),
+        'X-Plex-Version': CONFIG.get('header.version'),
+        'X-Plex-Device': CONFIG.get('header.device'),
+        'X-Plex-Device-Name': CONFIG.get('header.device_name'),
+        'X-Plex-Client-Identifier': CONFIG.get('header.identifier'),
         'X-Plex-Sync-Version': '2',
         'X-Plex-Features': 'external-media',
     }