kallithea Changeset - 6e270cedc8aa

Changeset - 6e270cedc8aa

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Thomas De Schampheleire - 8 years ago 2018-05-01 21:59:03
thomas.de_schampheleire@nokia.com

setup-db: perform an initial repository scan as stated by the docs (Issue #302)

The documentation, as well as the prompt text inside setup-db itself, states
that the repository root location will be scanned automatically for existing
repositories.
However, this is not actually the case. Only exception is when the
'initial_repo_scan' is set to True in the ini file; in that case the scan is
done on each start of Kallithea.

Add the required repo scan logic at the end of setup-db, after setting up
the application completely (the database has only just been set up).

The app setup code from BasePasterCommand is duplicated - this command doesn't
fit in and need to run both before and after database creation.

The scan call from kallithea/config/app_cfg.py is also duplicated - that will
be removed next.

1 file changed with 11 insertions and 0 deletions:

kallithea/lib/paster_commands/setup_db.py

0 comments (0 inline, 0 general)

kallithea/lib/paster_commands/setup_db.py

➞

Show inline comments

@@ @@ -2,48 +2,49 @@ @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU 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 General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 kallithea.lib.paster_commands.setup_db
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Databaset setup gearbox command for Kallithea
 """
 import os
 import sys
 import paste.deploy
 import kallithea
 from kallithea.lib.db_manage import DbManage
 from kallithea.lib.paster_commands.common import BasePasterCommand
 from kallithea.model.meta import Session
 # This is almost like SetupAppCommand ... but we have to pass options and it is
 # thus simpler to drop websetup and reimplement everything
 class Command(BasePasterCommand):
     """Kallithea: Configure the database specified in the .ini file
     Setup Kallithea according to its configuration file.  This is
     the second part of a two-phase web application installation
     process (the first phase is prepare-app). The setup process
     consist of things like setting up databases and creating the admin user
     """
     def get_description(self):
         return self.__doc__.splitlines()[0]
     requires_db_session = False # only available after this command has been run
     def get_parser(self, prog_name):
         parser = super(Command, self).get_parser(prog_name)
@@ @@ -82,25 +83,35 @@ class Command(BasePasterCommand): @@
                            dest='public_access',
                            default=None,
                            help='Enable public access on this installation (default)')
         parser.add_argument('--no-public-access',
                            action='store_false',
                            dest='public_access',
                            default=None,
                            help='Disable public access on this installation ')
         return parser
     def take_action(self, opts):
         dbconf = self.config['sqlalchemy.url']
         dbmanage = DbManage(dbconf=dbconf, root=self.config['here'],
                             tests=False, cli_args=vars(opts))
         dbmanage.create_tables(override=True)
         opts = dbmanage.config_prompt(None)
         dbmanage.create_settings(opts)
         dbmanage.create_default_user()
         dbmanage.admin_prompt()
         dbmanage.create_permissions()
         dbmanage.populate_default_permissions()
         Session().commit()
         # initial repository scan
         kallithea.config.middleware.make_app_without_logging(
                 self.config.global_conf, **self.config.local_conf)
         added, _ = kallithea.lib.utils.repo2db_mapper(kallithea.model.scm.ScmModel().repo_scan())
         if added:
             print 'Initial repository scan: added following repositories:'
             print '\t','\n\t'.join(added)
         else:
             print 'Initial repository scan: no repositories found.'
         print 'Database set up successfully.'

0 comments (0 inline, 0 general)