~mwhudson/loggerhead/wsgi-ify

« back to all changes in this revision

Viewing changes to loggerhead/apps/config.py

  • Committer: Michael Hudson
  • Date: 2008-06-18 11:27:59 UTC
  • Revision ID: michael.hudson@canonical.com-20080618112759-xm531vaz4rq1myws
make keeping up to date less ugly

Show diffs side-by-side

added added

removed removed

Lines of Context:
86
86
        description = view.history._branch.get_config().get_user_option('description')
87
87
        return description
88
88
 
89
 
    def _make_history(self, view_name, view_config, folder):
90
 
        h = History.from_folder(folder, view_name)
91
 
        cache_path = view_config.get('cachepath', None)
92
 
        if cache_path is None:
93
 
            # try the project config
94
 
            cache_path = self._config.get('cachepath', None)
95
 
        if cache_path is not None:
96
 
            h.use_file_cache(FileChangeCache(h, cache_path))
97
 
        return h
98
 
 
99
89
    def _add_view(self, view_name, view_config, folder):
100
 
        h = self._make_history(view_name, view_config, folder)
 
90
        view = BranchWSGIApp(folder, view_name, view_config)
101
91
        friendly_name = view_config.get('branch_name', None)
102
92
        if friendly_name is None:
103
 
            friendly_name = h.get_config().get_nickname()
 
93
            friendly_name = view.history.get_config().get_nickname()
104
94
            if friendly_name is None:
105
95
                friendly_name = view_name
106
 
        view = BranchWSGIApp(h, friendly_name)
 
96
        view.friendly_name = friendly_name
107
97
        view.name = view_name
108
98
        branch_url = self._get_branch_url(view, view_config)
109
99
        if branch_url is not None:
122
112
            view = self.views_by_name.get(segment)
123
113
            if view is None:
124
114
                raise httpexceptions.HTTPNotFound()
125
 
            if view.history.out_of_date():
126
 
                view.history = self._make_history(view.name, view._view_config, view._src_folder)
127
115
            return view.app(environ, start_response)
128
116
 
129
117