gitweb: Refactor checking if part of project info need filling

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 8ed2ba1a5dcc297881158ee7af5ca001e4121a6b6c671106ea95c155eafcf5be..a74f645bb05c538de6ffe39713c035f4867ecb044e9412cc3686ac1d71e45f7e 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -5189,6 +5189,20 @@ sub git_project_search_form {
        print "</div>\n";
 }
 
        print "</div>\n";
 }
 

+# entry for given @keys needs filling if at least one of keys in list
+# is not present in %$project_info
+sub project_info_needs_filling {
+       my ($project_info, @keys) = @_;
+
+       # return List::MoreUtils::any { !exists $project_info->{$_} } @keys;
+       foreach my $key (@keys) {
+               if (!exists $project_info->{$key}) {
+                       return 1;
+               }
+       }
+       return;
+}
+

 # fills project list info (age, description, owner, category, forks)
 # for each project in the list, removing invalid projects from
 # returned list
 # fills project list info (age, description, owner, category, forks)
 # for each project in the list, removing invalid projects from
 # returned list


@@ -5200,24 +5214,28 @@ sub fill_project_list_info {
        my $show_ctags = gitweb_check_feature('ctags');
  PROJECT:
        foreach my $pr (@$projlist) {
        my $show_ctags = gitweb_check_feature('ctags');
  PROJECT:
        foreach my $pr (@$projlist) {

-               my (@activity) = git_get_last_activity($pr->{'path'});
-               unless (@activity) {
-                       next PROJECT;
+               if (project_info_needs_filling($pr, 'age', 'age_string')) {
+                       my (@activity) = git_get_last_activity($pr->{'path'});
+                       unless (@activity) {
+                               next PROJECT;
+                       }
+                       ($pr->{'age'}, $pr->{'age_string'}) = @activity;

                }
                }

-               ($pr->{'age'}, $pr->{'age_string'}) = @activity;
-               if (!defined $pr->{'descr'}) {
+               if (project_info_needs_filling($pr, 'descr', 'descr_long')) {

                        my $descr = git_get_project_description($pr->{'path'}) || "";
                        $descr = to_utf8($descr);
                        $pr->{'descr_long'} = $descr;
                        $pr->{'descr'} = chop_str($descr, $projects_list_description_width, 5);
                }
                        my $descr = git_get_project_description($pr->{'path'}) || "";
                        $descr = to_utf8($descr);
                        $pr->{'descr_long'} = $descr;
                        $pr->{'descr'} = chop_str($descr, $projects_list_description_width, 5);
                }

-               if (!defined $pr->{'owner'}) {
+               if (project_info_needs_filling($pr, 'owner')) {

                        $pr->{'owner'} = git_get_project_owner("$pr->{'path'}") || "";
                }
                        $pr->{'owner'} = git_get_project_owner("$pr->{'path'}") || "";
                }

-               if ($show_ctags) {
+               if ($show_ctags &&
+                   project_info_needs_filling($pr, 'ctags')) {

                        $pr->{'ctags'} = git_get_project_ctags($pr->{'path'});
                }
                        $pr->{'ctags'} = git_get_project_ctags($pr->{'path'});
                }

-               if ($projects_list_group_categories && !defined $pr->{'category'}) {
+               if ($projects_list_group_categories &&
+                   project_info_needs_filling($pr, 'category')) {

                        my $cat = git_get_project_category($pr->{'path'}) ||
                                                           $project_list_default_category;
                        $pr->{'category'} = to_utf8($cat);
                        my $cat = git_get_project_category($pr->{'path'}) ||
                                                           $project_list_default_category;
                        $pr->{'category'} = to_utf8($cat);