Module is a directory instead of file

- Move enabled module symlinks to 'modules/enabled' directory.
- Make all modules properly importable
- Import modules instead of their symlinks

modules/apps.py

@@ -1 +0,0 @@
-installed/apps/apps.py

modules/auth.py

@@ -1 +0,0 @@
-installed/lib/auth.py

modules/auth_page.py

@@ -1 +0,0 @@
-installed/lib/auth_page.py

modules/config.py

@@ -1 +0,0 @@
-installed/config/config.py

modules/diagnostics.py

@@ -1 +0,0 @@
-installed/diagnostics/diagnostics.py

modules/enabled/apps

@@ -0,0 +1 @@
+../installed/apps/

modules/enabled/config

@@ -0,0 +1 @@
+../installed/config/

modules/enabled/diagnostics

@@ -0,0 +1 @@
+../installed/diagnostics/

modules/enabled/expert_mode

@@ -0,0 +1 @@
+../installed/expert_mode/

modules/enabled/firewall

@@ -0,0 +1 @@
+../installed/firewall/

modules/enabled/first_boot

@@ -0,0 +1 @@
+../installed/first_boot/

modules/enabled/help

@@ -0,0 +1 @@
+../installed/help/

modules/enabled/lib

@@ -0,0 +1 @@
+../installed/lib/

modules/enabled/owncloud

@@ -0,0 +1 @@
+../installed/owncloud/

modules/enabled/packages

@@ -0,0 +1 @@
+../installed/packages/

modules/enabled/pagekite

@@ -0,0 +1 @@
+../installed/pagekite/

modules/enabled/system

@@ -0,0 +1 @@
+../installed/system/

modules/enabled/tor

@@ -0,0 +1 @@
+../installed/tor/

modules/enabled/users

@@ -0,0 +1 @@
+../installed/users/

modules/enabled/xmpp

@@ -0,0 +1 @@
+../installed/xmpp/

modules/expert_mode.py

@@ -1 +0,0 @@
-installed/expert_mode/expert_mode.py

modules/firewall.py

@@ -1 +0,0 @@
-installed/firewall/firewall.py

modules/first_boot.py

@@ -1 +0,0 @@
-installed/first_boot/first_boot.py

modules/help.py

@@ -1 +0,0 @@
-installed/help/help.py

modules/installed/apps/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module for apps section page
+"""
+
+from . import apps
+
+
+__all__ = ['apps']

modules/installed/apps/apps.py

@@ -1,6 +1,5 @@
 import cherrypy
 from gettext import gettext as _
-from modules.auth import require
 from plugin_mount import PagePlugin
 import cfg
 import util

modules/installed/config/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module for basic system configuration
+"""
+
+from . import config
+
+
+__all__ = ['config']

modules/installed/config/config.py

@@ -28,7 +28,7 @@ import socket
 
 import actions
 import cfg
-from modules.auth import require
+from ..lib.auth import require
 from plugin_mount import PagePlugin
 import util
 

modules/installed/diagnostics/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module to system diagnostics
+"""
+
+from . import diagnostics
+
+
+__all__ = ['diagnostics']

modules/installed/diagnostics/diagnostics.py

@@ -21,7 +21,7 @@ Plinth module for running diagnostics
 
 import cherrypy
 from gettext import gettext as _
-from auth import require
+from ..lib.auth import require
 from plugin_mount import PagePlugin
 import actions
 import cfg

modules/installed/expert_mode/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module for expert mode configuration
+"""
+
+from . import expert_mode
+
+
+__all__ = ['expert_mode']

modules/installed/expert_mode/expert_mode.py

@@ -1,7 +1,7 @@
 import cherrypy
 from django import forms
 from gettext import gettext as _
-from modules.auth import require
+from ..lib.auth import require
 from plugin_mount import PagePlugin
 import cfg
 import util

modules/installed/firewall/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module to configure a firewall
+"""
+
+from . import firewall
+
+
+__all__ = ['firewall']

modules/installed/firewall/firewall.py

@@ -24,7 +24,7 @@ from gettext import gettext as _
 
 import actions
 import cfg
-from modules.auth import require
+from ..lib.auth import require
 from plugin_mount import PagePlugin
 import service as service_module
 import util

modules/installed/first_boot/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module for first boot wizard
+"""
+
+from . import first_boot
+
+
+__all__ = ['first_boot']

modules/installed/first_boot/first_boot.py

@@ -23,10 +23,10 @@ from django import forms
 from django.core import validators
 from gettext import gettext as _
 from plugin_mount import PagePlugin
-from modules.auth import add_user
+from ..lib.auth import add_user
+from ..config import config
 from withsqlite.withsqlite import sqlite_db
 import cfg
-import config
 import util
 
 

modules/installed/help/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module for help pages
+"""
+
+from . import help  # pylint: disable-msg=W0622
+
+
+__all__ = ['help']

modules/installed/lib/__init__.py

@@ -0,0 +1,29 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth library modules
+"""
+
+from . import auth
+from . import auth_page
+from . import user_store
+
+
+__all__ = ['auth',
+           'auth_page',
+           'user_store']

modules/installed/owncloud/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module to configure ownCloud
+"""
+
+from . import owncloud
+
+
+__all__ = ['owncloud']

modules/installed/owncloud/owncloud.py

@@ -1,7 +1,7 @@
 import cherrypy
 from django import forms
 from gettext import gettext as _
-from modules.auth import require
+from ..lib.auth import require
 from plugin_mount import PagePlugin
 import actions
 import cfg

modules/installed/packages/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module to manage packages
+"""
+
+from . import packages
+
+
+__all__ = ['packages']

modules/installed/packages/packages.py

@@ -1,7 +1,7 @@
 import cherrypy
 from django import forms
 from gettext import gettext as _
-from auth import require
+from ..lib.auth import require
 from plugin_mount import PagePlugin
 import actions
 import cfg

modules/installed/pagekite/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module to configure PageKite
+"""
+
+from . import pagekite
+
+
+__all__ = ['pagekite']

modules/installed/pagekite/pagekite.py

@@ -26,7 +26,7 @@ from gettext import gettext as _
 
 import actions
 import cfg
-from modules.auth import require
+from ..lib.auth import require
 from plugin_mount import PagePlugin
 import util
 

modules/installed/santiago/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module to configure santiago port
+"""
+
+from . import santiago
+
+
+__all__ = ['santiago']

modules/installed/system/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module for system section page
+"""
+
+from . import system
+
+
+__all__ = ['system']

modules/installed/tor/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module to configure Tor
+"""
+
+from . import tor
+
+
+__all__ = ['tor']

modules/installed/tor/tor.py

@@ -22,7 +22,7 @@ Plinth module for configuring Tor
 import cherrypy
 from gettext import gettext as _
 from plugin_mount import PagePlugin
-from modules.auth import require
+from ..lib.auth import require
 import actions
 import cfg
 import util

modules/installed/users/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module to manage users
+"""
+
+from . import users
+
+
+__all__ = ['users']

modules/installed/users/users.py

@@ -2,8 +2,7 @@ import cherrypy
 from django import forms
 from django.core import validators
 from gettext import gettext as _
-import auth
-from auth import require
+from ..lib.auth import require, add_user
 from plugin_mount import PagePlugin
 import cfg
 from model import User
@@ -86,8 +85,8 @@ class UserAdd(PagePlugin):
                  username=data['username'])))
             return
 
-        auth.add_user(data['username'], data['password'], data['full_name'],
-                      data['email'], False)
+        add_user(data['username'], data['password'], data['full_name'],
+                 data['email'], False)
         messages.append(
             ('success', _('User "{username}" added').format(
              username=data['username'])))

modules/installed/xmpp/__init__.py

@@ -0,0 +1,25 @@
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+Plinth module to configure XMPP server
+"""
+
+from . import xmpp
+
+
+__all__ = ['xmpp']

modules/installed/xmpp/xmpp.py

@@ -1,7 +1,7 @@
 import cherrypy
 from django import forms
 from gettext import gettext as _
-from modules.auth import require
+from ..lib.auth import require
 from plugin_mount import PagePlugin
 import cfg
 import actions

modules/owncloud.py

@@ -1 +0,0 @@
-installed/owncloud/owncloud.py

modules/packages.py

@@ -1 +0,0 @@
-installed/packages/packages.py

modules/pagekite.py

@@ -1 +0,0 @@
-installed/pagekite/pagekite.py

modules/system.py

@@ -1 +0,0 @@
-installed/system/system.py

modules/tor.py

@@ -1 +0,0 @@
-installed/tor/tor.py

modules/user_store.py

@@ -1 +0,0 @@
-installed/lib/user_store.py

modules/users.py

@@ -1 +0,0 @@
-installed/users/users.py

modules/xmpp.py

@@ -1 +0,0 @@
-installed/xmpp/xmpp.py

plinth.py

@@ -4,8 +4,10 @@ import os, stat, sys, argparse
 from gettext import gettext as _
 import cfg
 import django.conf
+import importlib
 if not os.path.join(cfg.file_root, "vendor") in sys.path:
    sys.path.append(os.path.join(cfg.file_root, "vendor"))
+import re
 
 import cherrypy
 from cherrypy import _cpserver
@@ -74,20 +76,21 @@ class Root(plugin_mount.PagePlugin):
       else:
          raise cherrypy.InternalRedirect('help/about')
 
+
 def load_modules():
-   """Import all the symlinked .py files in the modules directory and
-   all the .py files in directories linked in the modules directory
-   (but don't dive deeper than that).  Also, ignore the installed
-   directory."""
-   for name in os.listdir("modules"):
-      if name.endswith(".py") and not name.startswith('.'):
-         cfg.log.info("importing modules/%s" % name)
-         try:
-            __import__("modules.%s"  % (name[:-3]))
-         except ImportError, e:
-            cfg.log.error(_("Couldn't import modules/%s: %s") % (name, e))
-      else:
-         cfg.log("skipping %s" % name)
+    """
+    Read names of enabled modules in modules/enabled directory and
+    import them from modules/installed directory.
+    """
+    for name in os.listdir('modules/enabled'):
+        cfg.log.info('Importing modules/installed/%s' % name)
+        try:
+            importlib.import_module(
+                'modules.installed.{module}'.format(module=name))
+        except ImportError as exception:
+            cfg.log.error(
+                'Could not import modules/installed/{module}: {exception}'
+                .format(module=name, exception=exception))
 
 
 def get_template_directories():
@@ -96,13 +99,9 @@ def get_template_directories():
     core_directory = os.path.join(directory, 'templates')
 
     directories = set((core_directory,))
-    for name in os.listdir('modules'):
-        if not name.endswith(".py") or name.startswith('.'):
-            continue
-
-        real_name = os.path.realpath(os.path.join('modules', name))
-        directory = os.path.dirname(real_name)
-        directories.add(os.path.join(directory, 'templates'))
+    for name in os.listdir('modules/enabled'):
+        directories.add(os.path.join('modules', 'installed', name,
+                                     'templates'))
 
     cfg.log.info('Template directories - %s' % directories)
 

plugin_mount.py

@@ -1,7 +1,4 @@
-import cherrypy
-from modules.auth import require
 import cfg
-import util
 
 
 class PluginMount(type):