[PATCHv5 15/17] gitweb: Introduce %actions_info, gathering information about actions
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Oct 6, 2010, 22:02 UTC
- Message-ID
- <1286402526-13143-16-git-send-email-jnareb@gmail.com>
- In-Reply-To
- <1286402526-13143-1-git-send-email-jnareb@gmail.com>
Currently it only contains information about output format, and is not used anywhere. It will be used to check whether current action produces HTML output, and therefore is displaying HTML-based progress info about (re)generating cache makes sense.
It can contain information about allowed extra options, whether to display link to feed (Atom or RSS), etc. in easier and faster way than listing all matching or all non-matching actions at appropriate site.
Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- This is new patch, which didn't exist in v4 (previous version) of gitweb caching series, and doesn't have equivalent in J.H. patch.
While it is patch preparing infrastructure to be used by progress indicator (generating info), it is IMHO a good idea in itself, and that is why it is not marked as RFC.
gitweb/gitweb.perl | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index d9ac063..26d5619 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -807,6 +807,25 @@ our %allowed_options = ( "--no-merges" => [ qw(rss atom log shortlog history) ], ); +our %actions_info = (); +sub evaluate_actions_info { + our %actions_info; + our (%actions); + + # unless explicitely stated otherwise, default output format is html + foreach my $action (keys %actions) { + $actions_info{$action}{'output_format'} = 'html'; + } + # list all exceptions; undef means variable (no definite format) + map { $actions_info{$_}{'output_format'} = 'text' } + qw(commitdiff_plain patch patches project_index blame_data); + map { $actions_info{$_}{'output_format'} = 'xml' } + qw(rss atom opml); # there are different types (document formats) of XML + map { $actions_info{$_}{'output_format'} = undef } + qw(blob_plain object); + $actions_info{'snapshot'}{'output_format'} = 'binary'; +} + # fill %input_params with the CGI parameters. All values except for 'opt' # should be single values, but opt can be an array. We should probably # build an array of parameters that can be multi-valued, but since for the time @@ -1153,6 +1172,7 @@ sub run_request { evaluate_uri(); evaluate_gitweb_config(); + evaluate_actions_info(); evaluate_git_version(); check_loadavg(); configure_caching()
-- 1.7.3