README.md

@@ -50,16 +50,10 @@ If not you need to create user and database manually do (or similar on Windows):
     ) | sudo mysql
 
 Then you can install the database tables, this will update all tables from core + all enabled plugins.
-And also install all enabled plugins:
+*Hint:* The same command can be later used to upgrade the database after plugins or core are updated.
-
-    $ flaschengeist install
-
-*Hint:* To only install the database tables, or upgrade the database after plugins or core are updated later
-you can use this command:
 
     $ flaschengeist db upgrade heads
 
-
 ## Plugins
 To only upgrade one plugin (for example the `events` plugin):
 
@@ -94,7 +88,6 @@ with the difference of the main logger will be forced to output to `stderr` and
 of the CLI will override the logging level you have configured for the main logger.
 
     $ flaschengeist run
-
 or with debug messages:
 
     $ flaschengeist run --debug

flaschengeist/alembic/__init__.py

@@ -1,4 +0,0 @@
-from pathlib import Path
-
-
-alembic_migrations = str(Path(__file__).resolve().parent / "migrations")

flaschengeist/alembic/migrations/255b93b6beed_flaschengeist_initial.py

@@ -18,21 +18,14 @@ depends_on = None
 
 
 def upgrade():
-    op.create_table(
+    # ### commands auto generated by Alembic - please adjust! ###
-        "plugin_setting",
-        sa.Column("id", flaschengeist.models.Serial(), nullable=False),
-        sa.Column("plugin", sa.String(length=127), nullable=True),
-        sa.Column("name", sa.String(length=127), nullable=False),
-        sa.Column("value", sa.PickleType(protocol=4), nullable=True),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_plugin_setting")),
-    )
     op.create_table(
         "image",
         sa.Column("id", flaschengeist.models.Serial(), nullable=False),
-        sa.Column("filename", sa.String(length=255), nullable=False),
+        sa.Column("filename_", sa.String(length=127), nullable=False),
-        sa.Column("mimetype", sa.String(length=127), nullable=False),
+        sa.Column("mimetype_", sa.String(length=30), nullable=False),
-        sa.Column("thumbnail", sa.String(length=255), nullable=True),
+        sa.Column("thumbnail_", sa.String(length=127), nullable=True),
-        sa.Column("path", sa.String(length=255), nullable=True),
+        sa.Column("path_", sa.String(length=127), nullable=True),
         sa.PrimaryKeyConstraint("id", name=op.f("pk_image")),
     )
     op.create_table(

flaschengeist/cli/__init__.py

@@ -88,14 +88,12 @@ def main(*args, **kwargs):
     from .export_cmd import export
     from .docs_cmd import docs
     from .run_cmd import run
-    from .install_cmd import install
 
     # Override logging level
     environ.setdefault("FG_LOGGING", logging.getLevelName(LOGGING_MAX))
 
     cli.add_command(export)
     cli.add_command(docs)
-    cli.add_command(install)
     cli.add_command(plugin)
     cli.add_command(run)
     cli(*args, **kwargs)

flaschengeist/cli/install_cmd.py

@@ -1,20 +0,0 @@
-import click
-from click.decorators import pass_context
-from flask.cli import with_appcontext
-from flask_migrate import upgrade
-
-from flaschengeist.alembic import alembic_migrations
-from flaschengeist.cli.plugin_cmd import install_plugin_command
-from flaschengeist.utils.hook import Hook
-
-
-@click.command()
-@with_appcontext
-@pass_context
-@Hook("plugins.installed")
-def install(ctx):
-    # Install database
-    upgrade(alembic_migrations, revision="heads")
-
-    # Install plugins
-    install_plugin_command(ctx, [], True)

flaschengeist/cli/plugin_cmd.py

@@ -4,9 +4,7 @@ from flask import current_app
 from flask.cli import with_appcontext
 from importlib_metadata import EntryPoint, entry_points
 
-from flaschengeist.database import db
 from flaschengeist.config import config
-from flaschengeist.models.user import Permission
 
 
 @click.group()
@@ -14,7 +12,12 @@ def plugin():
     pass
 
 
-def install_plugin_command(ctx, plugin, all):
+@plugin.command()
+@click.argument("plugin", nargs=-1, type=str)
+@click.option("--all", help="Install all enabled plugins", is_flag=True)
+@with_appcontext
+@pass_context
+def install(ctx, plugin, all):
     """Install one or more plugins"""
     if not all and len(plugin) == 0:
         ctx.fail("At least one plugin must be specified, or use `--all` flag.")
@@ -28,30 +31,10 @@ def install_plugin_command(ctx, plugin, all):
     for p in plugins:
         name = p.id.split(".")[-1]
         click.echo(f"Installing {name}{'.'*(20-len(name))}", nl=False)
-        # Install permissions
-        if p.permissions:
-            cur_perm = set(x.name for x in Permission.query.filter(Permission.name.in_(p.permissions)).all())
-            all_perm = set(p.permissions)
-
-            add = all_perm - cur_perm
-            if add:
-                db.session.bulk_save_objects([Permission(name=x) for x in all_perm])
-                db.session.commit()
-        # Custom installation steps
         p.install()
         click.secho(" ok", fg="green")
 
 
-@plugin.command()
-@click.argument("plugin", nargs=-1, type=str)
-@click.option("--all", help="Install all enabled plugins", is_flag=True)
-@with_appcontext
-@pass_context
-def install(ctx, plugin, all):
-    """Install one or more plugins"""
-    return install_plugin_command(ctx, plugin, all)
-
-
 @plugin.command()
 @click.argument("plugin", nargs=-1, type=str)
 @with_appcontext

flaschengeist/models/image.py

@@ -9,11 +9,11 @@ from ..database import db
 
 class Image(db.Model, ModelSerializeMixin):
     __tablename__ = "image"
-    id: int = db.Column(Serial, primary_key=True)
+    id: int = db.Column("id", Serial, primary_key=True)
-    filename_: str = db.Column("filename", db.String(255), nullable=False)
+    filename_: str = db.Column(db.String(127), nullable=False)
-    mimetype_: str = db.Column("mimetype", db.String(127), nullable=False)
+    mimetype_: str = db.Column(db.String(30), nullable=False)
-    thumbnail_: str = db.Column("thumbnail", db.String(255))
+    thumbnail_: str = db.Column(db.String(127))
-    path_: str = db.Column("path", db.String(255))
+    path_: str = db.Column(db.String(127))
 
     def open(self):
         return open(self.path_, "rb")

flaschengeist/models/setting.py

@@ -8,6 +8,6 @@ from ..database import db
 class _PluginSetting(db.Model):
     __tablename__ = "plugin_setting"
     id = db.Column("id", Serial, primary_key=True)
-    plugin: str = db.Column(db.String(127))
+    plugin: str = db.Column(db.String(30))
-    name: str = db.Column(db.String(127), nullable=False)
+    name: str = db.Column(db.String(30), nullable=False)
     value: Any = db.Column(db.PickleType(protocol=4))

flaschengeist/plugins/auth_plain/__init__.py

@@ -19,7 +19,7 @@ class AuthPlain(AuthPlugin):
     def install(self):
         plugins_installed(self.post_install)
 
-    def post_install(self, *args, **kwargs):
+    def post_install(self, **kwargs):
         if User.query.filter(User.deleted == False).count() == 0:
             logger.info("Installing admin user")
             role = Role.query.filter(Role.name == "Superuser").first()

flaschengeist/plugins/roles/__init__.py

@@ -16,7 +16,6 @@ from . import permissions
 
 
 class RolesPlugin(Plugin):
-    id = "roles"
     blueprint = Blueprint("roles", __name__)
     permissions = permissions.permissions
 

flaschengeist/plugins/scheduler.py

@@ -39,8 +39,6 @@ def scheduled(id: str, replace=False, **kwargs):
 
 
 class SchedulerPlugin(Plugin):
-    id = "scheduler"
-
     def __init__(self, entry_point, config=None):
         super().__init__(entry_point, config)
         self.blueprint = Blueprint(self.name, __name__)

flaschengeist/plugins/users/__init__.py

@@ -18,7 +18,6 @@ from flaschengeist.utils.datetime import from_iso_format
 
 
 class UsersPlugin(Plugin):
-    id = "users"
     blueprint = Blueprint("users", __name__)
     permissions = permissions.permissions