Changeset 379

Show
Ignore:
Timestamp:
01/20/06 01:30:45 (3 years ago)
Author:
athomas
Message:

RepoSearchPlugin:

  • Remove repo argument from most methods in Indexer. Uses self.repo instead.
  • Bugfix for exception when index is set but `PYTHON_EGG_CACHE~ is not.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • reposearchplugin/0.9/tracreposearch/indexer.py

    r376 r379  
    9191 
    9292        self.index_dir = self.env.config.get('repo-search', 'index', 
    93                          os.path.join(os.getenv('PYTHON_EGG_CACHE'), '.idx')) 
     93                         os.path.join(os.getenv('PYTHON_EGG_CACHE', ''), '.idx')) 
    9494        self.env.log.debug('Repository search index: %s' % self.index_dir) 
    9595        self.minimum_word_length = int(self.env.config.get('repo-search', 
    …… 
    122122            yield word[start:start + 2] 
    123123 
    124     def sync(self, repo): 
    125         self.meta['last-repo-rev'] = str(repo.youngest_rev) 
     124    def sync(self): 
     125        self.meta['last-repo-rev'] = str(self.repo.youngest_rev) 
    126126        self.meta['index-include'] = self.env.config.get('repo-search', 'include', '') 
    127127        self.meta['index-exclude'] = self.env.config.get('repo-search', 'exclude', '') 
    …… 
    133133    sync = synchronized(sync) 
    134134 
    135     def need_reindex(self, repo): 
     135    def need_reindex(self): 
    136136        return not hasattr(self, 'meta') \ 
    137             or repo.youngest_rev != int(self.meta.get('last-repo-rev', -1)) \ 
     137            or self.repo.youngest_rev != \ 
     138               int(self.meta.get('last-repo-rev', -1)) \ 
    138139            or self.env.config.get('repo-search', 'include', '') \ 
    139140               != self.meta.get('index-include', '') \ 
    …… 
    197198            self.env.log.debug("Invalidated stale index entry %s" % file) 
    198199 
    199     def reindex(self, repo = None): 
     200    def reindex(self): 
    200201        """ Reindex the repository if necessary. """ 
    201         repo = repo or self.env.get_repository() 
    202  
    203         if self.need_reindex(repo): 
     202        if self.need_reindex(): 
    204203            self.env.log.debug('Indexing repository (either repository or indexing criteria have changed)') 
    205204            self._open_storage('c') 
    206205            new_files = set() 
    207             for node in TracRepoSearchPlugin(self.env).walk_repo(repo): 
     206            for node in TracRepoSearchPlugin(self.env).walk_repo(self.repo): 
    208207                if node.kind != Node.DIRECTORY: 
    209208                    # Node has changed? 
    …… 
    221220                self._invalidate_file(invalid) 
    222221 
    223             self.sync(repo) 
     222            self.sync() 
    224223            self._open_storage('r') 
    225224            self.env.log.debug('Index finished') 

  • reposearchplugin/0.9/tracreposearch/search.py

    r378 r379  
    7373            from tracreposearch.indexer import Indexer 
    7474            self.indexer = Indexer(self.env) 
    75             self.indexer.reindex(repo) 
     75            self.indexer.reindex() 
    7676            walker = lambda repo, query: [repo.get_node(filename) for filename 
    7777                                          in self.indexer.find_words(query)]