From c69c68648b7eafde8344e2d3d28c5649966ecd29 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 16 Jul 2015 21:18:12 +0200
Subject: [PATCH] core: Add a [core] config section

I deemed it better to make core an extension (that cannot be disabled)
rather than add a special case throughout the config handling to make
it possible to have config section that doesn't belong to an extension.

This change is needed for #997.

Until #997 is completed, Mopidy will complain that core has now config
schema (because it is empty) and claim that core is disabled. This of
course has no practical effects.
---
 mopidy/core/__init__.py |  1 +
 mopidy/core/ext.conf    |  1 +
 mopidy/core/ext.py      | 25 +++++++++++++++++++++++++
 setup.py                |  1 +
 4 files changed, 28 insertions(+)
 create mode 100644 mopidy/core/ext.conf
 create mode 100644 mopidy/core/ext.py

diff --git a/mopidy/core/__init__.py b/mopidy/core/__init__.py
index 720f9c38..912856d0 100644
--- a/mopidy/core/__init__.py
+++ b/mopidy/core/__init__.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 # flake8: noqa
 from .actor import Core
+from .ext import Extension
 from .history import HistoryController
 from .library import LibraryController
 from .listener import CoreListener
diff --git a/mopidy/core/ext.conf b/mopidy/core/ext.conf
new file mode 100644
index 00000000..94b2ad54
--- /dev/null
+++ b/mopidy/core/ext.conf
@@ -0,0 +1 @@
+[core]
diff --git a/mopidy/core/ext.py b/mopidy/core/ext.py
new file mode 100644
index 00000000..7a610244
--- /dev/null
+++ b/mopidy/core/ext.py
@@ -0,0 +1,25 @@
+from __future__ import absolute_import, unicode_literals
+
+import os
+
+import mopidy
+from mopidy import config, ext
+
+
+class Extension(ext.Extension):
+
+    dist_name = 'Mopidy-Core'
+    ext_name = 'core'
+    version = mopidy.__version__
+
+    def get_default_config(self):
+        conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf')
+        return config.read(conf_file)
+
+    def get_config_schema(self):
+        schema = super(Extension, self).get_config_schema()
+        del schema['enabled']  # core cannot be disabled
+        return schema
+
+    def setup(self, registry):
+        pass  # core has nothing to register
diff --git a/setup.py b/setup.py
index ca121f74..394431fc 100644
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,7 @@ setup(
             'mopidy = mopidy.__main__:main',
         ],
         'mopidy.ext': [
+            'core = mopidy.core:Extension',
             'http = mopidy.http:Extension',
             'local = mopidy.local:Extension',
             'file = mopidy.file:Extension',