kallithea Changeset - 4f834b0abcd3

Changeset - 4f834b0abcd3

Parent rev.

Child rev.

[Not reviewed]

beta

0 6 0

Marcin Kuzminski - 15 years ago 2011-02-11 00:13:09
marcin@python-works.com

Code refactor number 2

6 files changed with 55 insertions and 55 deletions:

rhodecode/controllers/admin/repos.py

rhodecode/controllers/admin/settings.py

rhodecode/lib/helpers.py

rhodecode/lib/utils.py

rhodecode/model/forms.py

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -37,13 +37,13 @@ from pylons.controllers.util import abor @@
 from pylons.i18n.translation import _
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \
     HasPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.utils import invalidate_cache, action_logger
+from rhodecode.lib.utils import invalidate_cache, action_logger, repo_name_slug
 from rhodecode.model.db import User
 from rhodecode.model.forms import RepoForm
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.repo import RepoModel
@@ @@ -115,13 +115,13 @@ class ReposController(BaseController): @@
         return redirect(url('repos'))
     @HasPermissionAllDecorator('hg.admin')
     def new(self, format='html'):
         """GET /repos/new: Form to create a new item"""
         new_repo = request.GET.get('repo', '')
-        c.new_repo = h.repo_name_slug(new_repo)
         c.new_repo = repo_name_slug(new_repo)
         return render('admin/repos/repo_add.html')
     @HasPermissionAllDecorator('hg.admin')
     def update(self, repo_name):
         """PUT /repos/repo_name: Update an existing item"""

rhodecode/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ @@
 # MA  02110-1301, USA.
 import logging
 import traceback
 import formencode
-from operator import itemgetter
+from sqlalchemy import func
 from formencode import htmlfill
 from pylons import request, session, tmpl_context as c, url, app_globals as g, \
     config
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
@@ @@ -47,14 +47,12 @@ from rhodecode.model.db import RhodeCode @@
 from rhodecode.model.forms import UserForm, ApplicationSettingsForm, \
     ApplicationUiSettingsForm
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.settings import SettingsModel
 from rhodecode.model.user import UserModel
 from sqlalchemy import func
 log = logging.getLogger(__name__)
 class SettingsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
@@ @@ -321,13 +319,13 @@ class SettingsController(BaseController) @@
     @NotAnonymous()
     @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository')
     def create_repository(self):
         """GET /_admin/create_repository: Form to create a new item"""
         new_repo = request.GET.get('repo', '')
-        c.new_repo = h.repo_name_slug(new_repo)
         c.new_repo = repo_name_slug(new_repo)
         return render('admin/repos/repo_add_create_repository.html')
     def get_hg_ui_settings(self):
         ret = self.sa.query(RhodeCodeUi).all()

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -5,15 +5,17 @@ available to Controllers. This module is @@
 """
 import random
 import hashlib
 import StringIO
 from pygments.formatters import HtmlFormatter
 from pygments import highlight as code_highlight
-from pylons import url, app_globals as g
 from pylons import url
 from pylons.i18n.translation import _, ungettext
 from vcs.utils.annotate import annotate_highlight
 from rhodecode.lib.utils import repo_name_slug
 from webhelpers.html import literal, HTML, escape
 from webhelpers.html.tools import *
 from webhelpers.html.builder import make_tag
 from webhelpers.html.tags import auto_discovery_link, checkbox, css_classes, \
     end_form, file, form, hidden, image, javascript_link, link_to, link_to_if, \
     link_to_unless, ol, required_legend, select, stylesheet_link, submit, text, \
@@ @@ -70,29 +72,12 @@ class _GetError(object): @@
         tmpl = """<span class="error_msg">%s</span>"""
         if form_errors and form_errors.has_key(field_name):
             return literal(tmpl % form_errors.get(field_name))
 get_error = _GetError()
 def recursive_replace(str, replace=' '):
     """Recursive replace of given sign to just one instance
     :param str: given string
     :param replace: char to find and replace multiple instances
     Examples::
     >>> recursive_replace("Mighty---Mighty-Bo--sstones",'-')
     'Mighty-Mighty-Bo-sstones'
     """
     if str.find(replace * 2) == -1:
         return str
     else:
         str = str.replace(replace * 2, replace)
         return recursive_replace(str, replace)
 class _ToolTip(object):
     def __call__(self, tooltip_title, trim_at=50):
         """Special function just to wrap our text into nice formatted
         autowrapped text
@@ @@ -354,27 +339,12 @@ def pygmentize_annotation(filenode, **kw @@
+              )
         uri += '\n'
         return uri
     return literal(annotate_highlight(filenode, url_func, **kwargs))
 def repo_name_slug(value):
     """Return slug of name of repository
     This function is called on each creation/modification
     of repository to prevent bad names in repo
     """
     slug = remove_formatting(value)
     slug = strip_tags(slug)
     for c in """=[]\;'"<>,/~!@#$%^&*()+{}|: """:
         slug = slug.replace(c, '-')
     slug = recursive_replace(slug, '-')
     slug = collapse(slug, '-')
     return slug
 def get_changeset_safe(repo, rev):
     from vcs.backends.base import BaseRepository
     from vcs.exceptions import RepositoryError
     if not isinstance(repo, BaseRepository):
         raise Exception('You must pass an Repository '
                         'object as first argument got %s', type(repo))

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -26,21 +26,23 @@ @@
 # MA  02110-1301, USA.
 import os
 import logging
 import datetime
 import traceback
 import paste
 import beaker
 from paste.script.command import Command, BadCommand
 from UserDict import DictMixin
 from mercurial import ui, config, hg
 from mercurial.error import RepoError
 import paste
 import beaker
 from paste.script.command import Command, BadCommand
 from webhelpers.text import collapse, remove_formatting, strip_tags
 from vcs.backends.base import BaseChangeset
 from vcs.utils.lazy import LazyProperty
 from rhodecode.model import meta
 from rhodecode.model.caching_query import FromCache
@@ @@ -48,12 +50,44 @@ from rhodecode.model.db import Repositor @@
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.user import UserModel
 log = logging.getLogger(__name__)
 def recursive_replace(str, replace=' '):
     """Recursive replace of given sign to just one instance
     :param str: given string
     :param replace: char to find and replace multiple instances
     Examples::
     >>> recursive_replace("Mighty---Mighty-Bo--sstones",'-')
     'Mighty-Mighty-Bo-sstones'
     """
     if str.find(replace * 2) == -1:
         return str
     else:
         str = str.replace(replace * 2, replace)
         return recursive_replace(str, replace)
 def repo_name_slug(value):
     """Return slug of name of repository
     This function is called on each creation/modification
     of repository to prevent bad names in repo
     """
     slug = remove_formatting(value)
     slug = strip_tags(slug)
     for c in """=[]\;'"<>,/~!@#$%^&*()+{}|: """:
         slug = slug.replace(c, '-')
     slug = recursive_replace(slug, '-')
     slug = collapse(slug, '-')
     return slug
 def get_repo_slug(request):
     return request.environ['pylons.routes_dict'].get('repo_name')
 def action_logger(user, action, repo, ipaddr='', sa=None):
     """
     Action logger for various actions made by users

rhodecode/model/forms.py

➞

Show inline comments

@@ @@ -26,25 +26,24 @@ import logging @@
 import formencode
 from formencode import All
 from formencode.validators import UnicodeString, OneOf, Int, Number, Regex, \
     Email, Bool, StringBoolean, Set
 from pylons.i18n.translation import _
 from webhelpers.pylonslib.secure_form import authentication_token
-import rhodecode.lib.helpers as h
+from rhodecode.lib.utils import repo_name_slug
 from rhodecode.lib.auth import authenticate, get_crypt_password
 from rhodecode.lib.exceptions import LdapImportError
 from rhodecode.model import meta
 from rhodecode.model.user import UserModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.users_group import UsersGroupModel
 from rhodecode.model.db import User, UsersGroup
 from rhodecode import BACKENDS
 from webhelpers.pylonslib.secure_form import authentication_token
 log = logging.getLogger(__name__)
 #this is needed to translate the messages using _() in validators
 class State_obj(object):
     _ = staticmethod(_)
@@ @@ -211,13 +210,13 @@ class ValidRepoUser(formencode.validator @@
         return self.user_db.user_id
 def ValidRepoName(edit, old_data):
     class _ValidRepoName(formencode.validators.FancyValidator):
         def to_python(self, value, state):
-            slug = h.repo_name_slug(value)
             slug = repo_name_slug(value)
             if slug in ['_admin']:
                 raise formencode.Invalid(_('This repository name is disallowed'),
                                          value, state)
             if old_data.get('repo_name') != value or not edit:
                 if RepoModel().get_by_repo_name(slug, cache=False):
                     raise formencode.Invalid(_('This repository already exists') ,

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -26,36 +26,35 @@ @@
 # MA  02110-1301, USA.
 import os
 import time
 import traceback
 import logging
 from mercurial import ui
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.session import make_transient
 from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from vcs import get_backend
 from vcs.utils.helpers import get_scm
 from vcs.exceptions import RepositoryError, VCSError
 from vcs.utils.lazy import LazyProperty
 from mercurial import ui
 from beaker.cache import cache_region, region_invalidate
 from rhodecode import BACKENDS
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import HasRepoPermissionAny
 from rhodecode.lib.utils import get_repos as get_filesystem_repos, make_ui, action_logger
 from rhodecode.model import BaseModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.db import Repository, RhodeCodeUi, CacheInvalidation, \
     UserFollowing, UserLog
 from rhodecode.model.caching_query import FromCache
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.session import make_transient
 from sqlalchemy.exc import DatabaseError
 log = logging.getLogger(__name__)
 class UserTemp(object):
     def __init__(self, user_id):
         self.user_id = user_id

0 comments (0 inline, 0 general)