aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/gmg_commands
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/gmg_commands')
-rw-r--r--mediagoblin/gmg_commands/__init__.py14
-rw-r--r--mediagoblin/gmg_commands/assetlink.py151
-rw-r--r--mediagoblin/gmg_commands/dbupdate.py30
-rw-r--r--mediagoblin/gmg_commands/import_export.py4
-rw-r--r--mediagoblin/gmg_commands/theme.py122
-rw-r--r--mediagoblin/gmg_commands/users.py18
6 files changed, 190 insertions, 149 deletions
diff --git a/mediagoblin/gmg_commands/__init__.py b/mediagoblin/gmg_commands/__init__.py
index 6aed4f6c..d8156126 100644
--- a/mediagoblin/gmg_commands/__init__.py
+++ b/mediagoblin/gmg_commands/__init__.py
@@ -41,11 +41,15 @@ SUBCOMMAND_MAP = {
'setup': 'mediagoblin.gmg_commands.dbupdate:dbupdate_parse_setup',
'func': 'mediagoblin.gmg_commands.dbupdate:dbupdate',
'help': 'Set up or update the SQL database'},
- 'theme': {
- 'setup': 'mediagoblin.gmg_commands.theme:theme_parser_setup',
- 'func': 'mediagoblin.gmg_commands.theme:theme',
- 'help': 'Theming commands',
- }
+ 'assetlink': {
+ 'setup': 'mediagoblin.gmg_commands.assetlink:assetlink_parser_setup',
+ 'func': 'mediagoblin.gmg_commands.assetlink:assetlink',
+ 'help': 'Link assets for themes and plugins for static serving'},
+ # 'theme': {
+ # 'setup': 'mediagoblin.gmg_commands.theme:theme_parser_setup',
+ # 'func': 'mediagoblin.gmg_commands.theme:theme',
+ # 'help': 'Theming commands',
+ # }
## These might be useful, mayyyybe, but don't really work anymore
## due to mongo change and the "versatility" of sql options.
diff --git a/mediagoblin/gmg_commands/assetlink.py b/mediagoblin/gmg_commands/assetlink.py
new file mode 100644
index 00000000..148ebe9e
--- /dev/null
+++ b/mediagoblin/gmg_commands/assetlink.py
@@ -0,0 +1,151 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
+#
+# 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/>.
+
+import os
+
+from mediagoblin import mg_globals
+from mediagoblin.init import setup_global_and_app_config
+from mediagoblin.gmg_commands import util as commands_util
+from mediagoblin.tools.theme import register_themes
+from mediagoblin.tools.translate import pass_to_ugettext as _
+from mediagoblin.tools.common import simple_printer
+from mediagoblin.tools import pluginapi
+
+
+def assetlink_parser_setup(subparser):
+ # theme_subparsers = subparser.add_subparsers(
+ # dest=u"subcommand",
+ # help=u'Assetlink options')
+
+ # # Install command
+ # install_parser = theme_subparsers.add_parser(
+ # u'install', help=u'Install a theme to this mediagoblin instance')
+ # install_parser.add_argument(
+ # u'themefile', help=u'The theme archive to be installed')
+
+ # theme_subparsers.add_parser(
+ # u'assetlink',
+ # help=(
+ # u"Link the currently installed theme's assets "
+ # u"to the served theme asset directory"))
+ pass
+
+
+###########
+# Utilities
+###########
+
+def link_theme_assets(theme, link_dir, printer=simple_printer):
+ """
+ Returns a list of string of text telling the user what we did
+ which should be printable.
+ """
+ link_dir = link_dir.rstrip(os.path.sep)
+ link_parent_dir = os.path.dirname(link_dir)
+
+ if theme is None:
+ printer(_("Cannot link theme... no theme set\n"))
+ return
+
+ def _maybe_unlink_link_dir():
+ """unlink link directory if it exists"""
+ if os.path.lexists(link_dir) \
+ and os.path.islink(link_dir):
+ os.unlink(link_dir)
+ return True
+
+ return
+
+ if theme.get('assets_dir') is None:
+ printer(_("No asset directory for this theme\n"))
+ if _maybe_unlink_link_dir():
+ printer(
+ _("However, old link directory symlink found; removed.\n"))
+ return
+
+ _maybe_unlink_link_dir()
+
+ # make the link directory parent dirs if necessary
+ if not os.path.lexists(link_parent_dir):
+ os.makedirs(link_parent_dir)
+
+ os.symlink(
+ theme['assets_dir'].rstrip(os.path.sep),
+ link_dir)
+ printer("Linked the theme's asset directory:\n %s\nto:\n %s\n" % (
+ theme['assets_dir'], link_dir))
+
+
+def link_plugin_assets(plugin_static, plugins_link_dir, printer=simple_printer):
+ """
+ Arguments:
+ - plugin_static: a mediagoblin.tools.staticdirect.PluginStatic instance
+ representing the static assets of this plugins' configuration
+ - plugins_link_dir: Base directory plugins are linked from
+ """
+ # link_dir is the final directory we'll link to, a combination of
+ # the plugin assetlink directory and plugin_static.name
+ link_dir = os.path.join(
+ plugins_link_dir.rstrip(os.path.sep), plugin_static.name)
+
+ # make the link directory parent dirs if necessary
+ if not os.path.lexists(plugins_link_dir):
+ os.makedirs(plugins_link_dir)
+
+ # See if the link_dir already exists.
+ if os.path.lexists(link_dir):
+ # if this isn't a symlink, there's something wrong... error out.
+ if not os.path.islink(link_dir):
+ printer(_('Could not link "%s": %s exists and is not a symlink\n') % (
+ plugin_static.name, link_dir))
+ return
+
+ # if this is a symlink and the path already exists, skip it.
+ if os.path.realpath(link_dir) == plugin_static.file_path:
+ # Is this comment helpful or not?
+ printer(_('Skipping "%s"; already set up.\n') % (
+ plugin_static.name))
+ return
+
+ # Otherwise, it's a link that went to something else... unlink it
+ printer(_('Old link found for "%s"; removing.\n') % (
+ plugin_static.name))
+ os.unlink(link_dir)
+
+ os.symlink(
+ plugin_static.file_path.rstrip(os.path.sep),
+ link_dir)
+ printer('Linked asset directory for plugin "%s":\n %s\nto:\n %s\n' % (
+ plugin_static.name,
+ plugin_static.file_path.rstrip(os.path.sep),
+ link_dir))
+
+
+def assetlink(args):
+ """
+ Link the asset directory of the currently installed theme and plugins
+ """
+ mgoblin_app = commands_util.setup_app(args)
+ app_config = mg_globals.app_config
+
+ # link theme
+ link_theme_assets(mgoblin_app.current_theme, app_config['theme_linked_assets_dir'])
+
+ # link plugin assets
+ ## ... probably for this we need the whole application initialized
+ for plugin_static in pluginapi.hook_runall("static_setup"):
+ link_plugin_assets(
+ plugin_static, app_config['plugin_linked_assets_dir'])
diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py
index 32700c40..00007567 100644
--- a/mediagoblin/gmg_commands/dbupdate.py
+++ b/mediagoblin/gmg_commands/dbupdate.py
@@ -42,7 +42,7 @@ class DatabaseData(object):
self.name, self.models, self.migrations, session)
-def gather_database_data(media_types, plugins):
+def gather_database_data(plugins):
"""
Gather all database data relevant to the extensions we have
installed so we can do migrations and table initialization.
@@ -59,13 +59,6 @@ def gather_database_data(media_types, plugins):
DatabaseData(
u'__main__', MAIN_MODELS, MAIN_MIGRATIONS))
- # Then get all registered media managers (eventually, plugins)
- for media_type in media_types:
- models = import_component('%s.models:MODELS' % media_type)
- migrations = import_component('%s.migrations:MIGRATIONS' % media_type)
- managed_dbdata.append(
- DatabaseData(media_type, models, migrations))
-
for plugin in plugins:
try:
models = import_component('{0}.models:MODELS'.format(plugin))
@@ -78,6 +71,7 @@ def gather_database_data(media_types, plugins):
except AttributeError as exc:
_log.warning('Could not find MODELS in {0}.models, have you \
forgotten to add it? ({1})'.format(plugin, exc))
+ models = []
try:
migrations = import_component('{0}.migrations:MIGRATIONS'.format(
@@ -91,6 +85,7 @@ forgotten to add it? ({1})'.format(plugin, exc))
except AttributeError as exc:
_log.debug('Cloud not find MIGRATIONS in {0}.migrations, have you \
forgotten to add it? ({1})'.format(plugin, exc))
+ migrations = {}
if models:
managed_dbdata.append(
@@ -108,14 +103,25 @@ def run_dbupdate(app_config, global_config):
in the future, plugins)
"""
+ # Set up the database
+ db = setup_connection_and_db_from_config(app_config, migrations=True)
+ #Run the migrations
+ run_all_migrations(db, app_config, global_config)
+
+
+def run_all_migrations(db, app_config, global_config):
+ """
+ Initializes or migrates a database that already has a
+ connection setup and also initializes or migrates all
+ extensions based on the config files.
+
+ It can be used to initialize an in-memory database for
+ testing.
+ """
# Gather information from all media managers / projects
dbdatas = gather_database_data(
- app_config['media_types'],
global_config.get('plugins', {}).keys())
- # Set up the database
- db = setup_connection_and_db_from_config(app_config, migrations=True)
-
Session = sessionmaker(bind=db.engine)
# Setup media managers for all dbdata, run init/migrate and print info
diff --git a/mediagoblin/gmg_commands/import_export.py b/mediagoblin/gmg_commands/import_export.py
index d51a1e3e..98ec617d 100644
--- a/mediagoblin/gmg_commands/import_export.py
+++ b/mediagoblin/gmg_commands/import_export.py
@@ -63,7 +63,7 @@ def _import_media(db, args):
# TODO: Add import of queue files
queue_cache = BasicFileStorage(args._cache_path['queue'])
- for entry in db.MediaEntry.find():
+ for entry in db.MediaEntry.query.filter_by():
for name, path in entry.media_files.items():
_log.info('Importing: {0} - {1}'.format(
entry.title.encode('ascii', 'replace'),
@@ -204,7 +204,7 @@ def _export_media(db, args):
# TODO: Add export of queue files
queue_cache = BasicFileStorage(args._cache_path['queue'])
- for entry in db.MediaEntry.find():
+ for entry in db.MediaEntry.query.filter_by():
for name, path in entry.media_files.items():
_log.info(u'Exporting {0} - {1}'.format(
entry.title,
diff --git a/mediagoblin/gmg_commands/theme.py b/mediagoblin/gmg_commands/theme.py
deleted file mode 100644
index 71abb982..00000000
--- a/mediagoblin/gmg_commands/theme.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
-#
-# 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/>.
-
-import os
-
-from mediagoblin.init import setup_global_and_app_config
-from mediagoblin.tools.theme import register_themes
-from mediagoblin.tools.translate import pass_to_ugettext as _
-from mediagoblin.tools.common import simple_printer
-
-
-def theme_parser_setup(subparser):
- theme_subparsers = subparser.add_subparsers(
- dest=u"subcommand",
- help=u'Theme sub-commands')
-
- # Install command
- install_parser = theme_subparsers.add_parser(
- u'install', help=u'Install a theme to this mediagoblin instance')
- install_parser.add_argument(
- u'themefile', help=u'The theme archive to be installed')
-
- theme_subparsers.add_parser(
- u'assetlink',
- help=(
- u"Link the currently installed theme's assets "
- u"to the served theme asset directory"))
-
-
-###########
-# Utilities
-###########
-
-def link_assets(theme, link_dir, printer=simple_printer):
- """
- Returns a list of string of text telling the user what we did
- which should be printable.
- """
- link_dir = link_dir.rstrip(os.path.sep)
- link_parent_dir = os.path.dirname(link_dir)
-
- results = []
-
- if theme is None:
- printer(_("Cannot link theme... no theme set\n"))
- return results
-
- def _maybe_unlink_link_dir():
- """unlink link directory if it exists"""
- if os.path.lexists(link_dir) \
- and os.path.islink(link_dir):
- os.unlink(link_dir)
- return True
-
- return results
-
- if theme.get('assets_dir') is None:
- printer(_("No asset directory for this theme\n"))
- if _maybe_unlink_link_dir():
- printer(
- _("However, old link directory symlink found; removed.\n"))
- return results
-
- _maybe_unlink_link_dir()
-
- # make the link directory parent dirs if necessary
- if not os.path.lexists(link_parent_dir):
- os.makedirs(link_parent_dir)
-
- os.symlink(
- theme['assets_dir'].rstrip(os.path.sep),
- link_dir)
- printer("Linked the theme's asset directory:\n %s\nto:\n %s\n" % (
- theme['assets_dir'], link_dir))
-
-
-def install_theme(install_dir, themefile):
- pass # TODO ;)
-
-
-#############
-# Subcommands
-#############
-
-def assetlink_command(args):
- """
- Link the asset directory of the currently installed theme
- """
- global_config, app_config = setup_global_and_app_config(args.conf_file)
- theme_registry, current_theme = register_themes(app_config)
- link_assets(current_theme, app_config['theme_linked_assets_dir'])
-
-
-def install_command(args):
- """
- Handle the 'install this theme' subcommand
- """
- global_config, app_config = setup_global_and_app_config(args.conf_file)
- install_dir = app_config['theme_install_dir']
- install_theme(install_dir, args.themefile)
-
-
-SUBCOMMANDS = {
- 'assetlink': assetlink_command,
- 'install': install_command}
-
-
-def theme(args):
- SUBCOMMANDS[args.subcommand](args)
diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py
index 024c8498..e44b0aa9 100644
--- a/mediagoblin/gmg_commands/users.py
+++ b/mediagoblin/gmg_commands/users.py
@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from mediagoblin.gmg_commands import util as commands_util
-from mediagoblin.auth import lib as auth_lib
+from mediagoblin import auth
from mediagoblin import mg_globals
def adduser_parser_setup(subparser):
@@ -40,9 +40,9 @@ def adduser(args):
db = mg_globals.database
users_with_username = \
- db.User.find({
- 'username': args.username.lower(),
- }).count()
+ db.User.query.filter_by(
+ username=args.username.lower()
+ ).count()
if users_with_username:
print u'Sorry, a user with that name already exists.'
@@ -52,7 +52,7 @@ def adduser(args):
entry = db.User()
entry.username = unicode(args.username.lower())
entry.email = unicode(args.email)
- entry.pw_hash = auth_lib.bcrypt_gen_password_hash(args.password)
+ entry.pw_hash = auth.gen_password_hash(args.password)
entry.status = u'active'
entry.email_verified = True
entry.save()
@@ -71,7 +71,8 @@ def makeadmin(args):
db = mg_globals.database
- user = db.User.one({'username': unicode(args.username.lower())})
+ user = db.User.query.filter_by(
+ username=unicode(args.username.lower())).one()
if user:
user.is_admin = True
user.save()
@@ -94,9 +95,10 @@ def changepw(args):
db = mg_globals.database
- user = db.User.one({'username': unicode(args.username.lower())})
+ user = db.User.query.filter_by(
+ username=unicode(args.username.lower())).one()
if user:
- user.pw_hash = auth_lib.bcrypt_gen_password_hash(args.password)
+ user.pw_hash = auth.gen_password_hash(args.password)
user.save()
print 'Password successfully changed'
else: