Changeset - ec73bce93d6a
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Thomas De Schampheleire - 5 years ago 2020-10-09 13:39:08
thomas.de_schampheleire@nokia.com
extensions: rename internal names away from 'rcextensions'

Additionally, get rid of the unnecessary 'EXT' variable in load_extensions.
3 files changed with 12 insertions and 19 deletions:
kallithea/bin/kallithea_cli_index.py
2
2
kallithea/config/app_cfg.py
2
2
kallithea/lib/utils.py
8
15
0 comments (0 inline, 0 general)
kallithea/bin/kallithea_cli_index.py
➞
Show inline comments
 
@@ -19,38 +19,38 @@ Original author and date, and relevant c
 
:copyright: (c) 2013 RhodeCode GmbH, and others.
 
:license: GPLv3, see LICENSE.md for more details.
 
"""
 
import os
 
import sys
 

			




	
	
	
		
 
import click

			




	
	
	
		
 

			




	
	
	
		
 
import kallithea

			




	
	
	
		
 
import kallithea.bin.kallithea_cli_base as cli_base

			




	
	
	
		
 
from kallithea.lib.indexers.daemon import WhooshIndexingDaemon

			




	
	
	
		
 
from kallithea.lib.pidlock import DaemonLock, LockHeld

			




	
	
	
		
 
from kallithea.lib.utils import load_rcextensions

			




	
	
	
		
 
from kallithea.lib.utils import load_extensions

			




	
	
	
		
 
from kallithea.model.repo import RepoModel

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
@cli_base.register_command(config_file_initialize_app=True)

			




	
	
	
		
 
@click.option('--repo-location', help='Base path of repositories to index. Default: all')

			




	
	
	
		
 
@click.option('--index-only', help='Comma-separated list of repositories to build index on. Default: all')

			




	
	
	
		
 
@click.option('--update-only', help='Comma-separated list of repositories to re-build index on. Default: all')

			




	
	
	
		
 
@click.option('-f', '--full/--no-full', 'full_index', help='Recreate the index from scratch')

			




	
	
	
		
 
def index_create(repo_location, index_only, update_only, full_index):

			




	
	
	
		
 
    """Create or update full text search index"""

			




	
	
	
		
 

			




	
	
	
		
 
    index_location = kallithea.CONFIG['index_dir']

			




	
	
	
		
 
    load_rcextensions(kallithea.CONFIG['here'])

			




	
	
	
		
 
    load_extensions(kallithea.CONFIG['here'])

			




	
	
	
		
 

			




	
	
	
		
 
    if not repo_location:

			




	
	
	
		
 
        repo_location = RepoModel().repos_path

			




	
	
	
		
 
    repo_list = [x.strip() for x in index_only.split(',')] \

			




	
	
	
		
 
        if index_only else None

			




	
	
	
		
 
    repo_update_list = [x.strip() for x in update_only.split(',')] \

			




	
	
	
		
 
        if update_only else None

			




	
	
	
		
 

			




	
	
	
		
 
    try:

			




	
	
	
		
 
        l = DaemonLock(os.path.join(index_location, 'make_index.lock'))

			




	
	
	
		
 
        WhooshIndexingDaemon(index_location=index_location,

			




	
	
	
		
 
                             repo_location=repo_location,

			




        

    


    
    

    

        

                

                    kallithea/config/app_cfg.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -25,25 +25,25 @@ import sys

			




	
	
	
		
 
import alembic.config

			




	
	
	
		
 
import mercurial

			




	
	
	
		
 
import tg

			




	
	
	
		
 
from alembic.migration import MigrationContext

			




	
	
	
		
 
from alembic.script.base import ScriptDirectory

			




	
	
	
		
 
from sqlalchemy import create_engine

			




	
	
	
		
 
from tg import FullStackApplicationConfigurator

			




	
	
	
		
 

			




	
	
	
		
 
import kallithea.lib.locale

			




	
	
	
		
 
import kallithea.model.base

			




	
	
	
		
 
import kallithea.model.meta

			




	
	
	
		
 
from kallithea.lib import celerypylons

			




	
	
	
		
 
from kallithea.lib.utils import check_git_version, load_rcextensions, set_app_settings, set_indexer_config, set_vcs_config

			




	
	
	
		
 
from kallithea.lib.utils import check_git_version, load_extensions, set_app_settings, set_indexer_config, set_vcs_config

			




	
	
	
		
 
from kallithea.lib.utils2 import asbool

			




	
	
	
		
 
from kallithea.model import db

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
log = logging.getLogger(__name__)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
base_config = FullStackApplicationConfigurator()

			




	
	
	
		
 

			




	
	
	
		
 
base_config.update_blueprint({

			




	
	
	
		
 
    'package': kallithea,

			




	
	
	
		
 

			




	
	
		
 
@@ -130,25 +130,25 @@ def setup_configuration(app):

			




	
	
	
		
 
                      'Expected database version id(s): %s\n'

			




	
	
	
		
 
                      'If you are a developer and you know what you are doing, you can add `ignore_alembic_revision = True` '

			




	
	
	
		
 
                      'to your .ini file to skip the check.\n' % (' '.join(current_heads), ' '.join(available_heads)))

			




	
	
	
		
 
            sys.exit(1)

			




	
	
	
		
 

			




	
	
	
		
 
    # store some globals into kallithea

			




	
	
	
		
 
    kallithea.DEFAULT_USER_ID = db.User.get_default_user().user_id

			




	
	
	
		
 

			




	
	
	
		
 
    if asbool(config.get('use_celery')):

			




	
	
	
		
 
        kallithea.CELERY_APP = celerypylons.make_app()

			




	
	
	
		
 
    kallithea.CONFIG = config

			




	
	
	
		
 

			




	
	
	
		
 
    load_rcextensions(root_path=config['here'])

			




	
	
	
		
 
    load_extensions(root_path=config['here'])

			




	
	
	
		
 

			




	
	
	
		
 
    set_app_settings(config)

			




	
	
	
		
 

			




	
	
	
		
 
    instance_id = kallithea.CONFIG.get('instance_id', '*')

			




	
	
	
		
 
    if instance_id == '*':

			




	
	
	
		
 
        instance_id = '%s-%s' % (platform.uname()[1], os.getpid())

			




	
	
	
		
 
        kallithea.CONFIG['instance_id'] = instance_id

			




	
	
	
		
 

			




	
	
	
		
 
    # update kallithea.CONFIG with the meanwhile changed 'config'

			




	
	
	
		
 
    kallithea.CONFIG.update(config)

			




	
	
	
		
 

			




	
	
	
		
 
    # configure vcs and indexer libraries (they are supposed to be independent

			




        

    


    
    

    

        

                

                    kallithea/lib/utils.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -511,50 +511,43 @@ def repo2db_mapper(initial_repo_dict, re

			




	
	
	
		
 
                          repo.repo_name)

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    RepoModel().delete(repo, forks='detach', fs_remove=False)

			




	
	
	
		
 
                    sa.commit()

			




	
	
	
		
 
                except Exception:

			




	
	
	
		
 
                    #don't hold further removals on error

			




	
	
	
		
 
                    log.error(traceback.format_exc())

			




	
	
	
		
 
                    sa.rollback()

			




	
	
	
		
 
            removed.append(repo.repo_name)

			




	
	
	
		
 
    return added, removed

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def load_rcextensions(root_path):

			




	
	
	
		
 
def load_extensions(root_path):

			




	
	
	
		
 
    path = os.path.join(root_path, 'rcextensions', '__init__.py')

			




	
	
	
		
 
    if os.path.isfile(path):

			




	
	
	
		
 
        rcext = create_module('rc', path)

			




	
	
	
		
 
        EXT = kallithea.EXTENSIONS = rcext

			




	
	
	
		
 
        log.debug('Found rcextensions now loading %s...', rcext)

			




	
	
	
		
 
        ext = create_module('rc', path)

			




	
	
	
		
 
        kallithea.EXTENSIONS = ext

			




	
	
	
		
 
        log.debug('Found rcextensions now loading %s...', ext)

			




	
	
	
		
 

			




	
	
	
		
 
        # Additional mappings that are not present in the pygments lexers

			




	
	
	
		
 
        kallithea.config.conf.LANGUAGES_EXTENSIONS_MAP.update(getattr(EXT, 'EXTRA_MAPPINGS', {}))

			




	
	
	
		
 
        kallithea.config.conf.LANGUAGES_EXTENSIONS_MAP.update(getattr(ext, 'EXTRA_MAPPINGS', {}))

			




	
	
	
		
 

			




	
	
	
		
 
        # OVERRIDE OUR EXTENSIONS FROM RC-EXTENSIONS (if present)

			




	
	
	
		
 

			




	
	
	
		
 
        if getattr(EXT, 'INDEX_EXTENSIONS', []):

			




	
	
	
		
 
        if getattr(ext, 'INDEX_EXTENSIONS', []):

			




	
	
	
		
 
            log.debug('settings custom INDEX_EXTENSIONS')

			




	
	
	
		
 
            kallithea.config.conf.INDEX_EXTENSIONS = getattr(EXT, 'INDEX_EXTENSIONS', [])

			




	
	
	
		
 
            kallithea.config.conf.INDEX_EXTENSIONS = getattr(ext, 'INDEX_EXTENSIONS', [])

			




	
	
	
		
 

			




	
	
	
		
 
        # ADDITIONAL MAPPINGS

			




	
	
	
		
 
        log.debug('adding extra into INDEX_EXTENSIONS')

			




	
	
	
		
 
        kallithea.config.conf.INDEX_EXTENSIONS.extend(getattr(EXT, 'EXTRA_INDEX_EXTENSIONS', []))

			




	
	
	
		
 

			




	
	
	
		
 
        # auto check if the module is not missing any data, set to default if is

			




	
	
	
		
 
        # this will help autoupdate new feature of rcext module

			




	
	
	
		
 
        #from kallithea.config import rcextensions

			




	
	
	
		
 
        #for k in dir(rcextensions):

			




	
	
	
		
 
        #    if not k.startswith('_') and not hasattr(EXT, k):

			




	
	
	
		
 
        #        setattr(EXT, k, getattr(rcextensions, k))

			




	
	
	
		
 
        kallithea.config.conf.INDEX_EXTENSIONS.extend(getattr(ext, 'EXTRA_INDEX_EXTENSIONS', []))

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
#==============================================================================

			




	
	
	
		
 
# MISC

			




	
	
	
		
 
#==============================================================================

			




	
	
	
		
 

			




	
	
	
		
 
git_req_ver = StrictVersion('1.7.4')

			




	
	
	
		
 

			




	
	
	
		
 
def check_git_version():

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Checks what version of git is installed on the system, and raise a system exit

			




	
	
	
		
 
    if it's too old for Kallithea to work properly.

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-31958
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support