March 2022 - Wine-Commits - list.winehq.org

Matteo Bruni : vkd3d-shader/preproc: Don't add additional spaces after whitespace tokens.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: vkd3d Branch: master Commit: d2104522fe42cc565c431c7aecb14d00fb32e741 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d2104522fe42cc565c431c7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 30 23:38:32 2022 +0200 vkd3d-shader/preproc: Don't add additional spaces after whitespace tokens. This is especially a problem when e.g. it introduces a whitespace before a #pragma directive, breaking shader compilation. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 20cb0c35..7686e018 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -578,7 +578,10 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) if (ctx->current_directive) return return_token(token, lval, text); - vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); + if (isspace(text[0])) + vkd3d_string_buffer_printf(&ctx->buffer, "%s", text); + else + vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); break; }

1 0

Francois Gouget : testbot/cgi: ItemPage does not need URI::Escape.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: tools Branch: master Commit: 5b93ca3f4d192b1e22c8ae89076717432f785895 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5b93ca3f4d192b1e22c8ae8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 31 16:06:02 2022 +0200 testbot/cgi: ItemPage does not need URI::Escape. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 567a489..b88e273 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -31,7 +31,6 @@ ObjectModel::CGI::ItemPage - Base class for bound web forms use ObjectModel::CGI::FormPage; our @ISA = qw(ObjectModel::CGI::FormPage); -use URI::Escape; sub _initialize($$$$) {

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: HTTP::Response is not needed.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: tools Branch: master Commit: 96db89f74e9e5381d67ec5ae48d74df5f785bfe3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=96db89f74e9e5381d67ec5a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 31 16:05:55 2022 +0200 testbot/CheckForWinetestUpdate: HTTP::Response is not needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 94d9750..c7aecce 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -46,7 +46,6 @@ use File::Compare; use File::Copy; use LWP::UserAgent; use HTTP::Request; -use HTTP::Response; use HTTP::Status; use WineTestBot::Config;

1 0

Francois Gouget : testbot/web: Use SimpleCollectionPage for the patches page.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: tools Branch: master Commit: eadae71f7f958cea2fb4ebd63747dbc87b88cd34 URL: https://source.winehq.org/git/tools.git/?a=commit;h=eadae71f7f958cea2fb4ebd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 31 16:53:03 2022 +0200 testbot/web: Use SimpleCollectionPage for the patches page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/PatchesList.pl | 63 +++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 04ca020..e756a76 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -2,6 +2,7 @@ # Patch list page # # Copyright 2010 Ge van Geldorp +# Copyright 2012-2018, 2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,34 +20,25 @@ use strict; -package PatchesListPage; +package PatchesBlock; -use ObjectModel::CGI::CollectionPage; -our @ISA = qw(ObjectModel::CGI::CollectionPage); +use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); use URI::Escape; use WineTestBot::Patches; -sub _initialize($$$) +sub Create($$) { - my ($self, $Request, $RequiredRole) = @_; + my ($Collection, $EnclosingPage) = @_; - $self->SUPER::_initialize($Request, $RequiredRole, CreatePatches()); - $self->SetRefreshInterval(60); + return PatchesBlock->new($Collection, $EnclosingPage); } -sub SortKeys($$$) +sub DisplayProperty($$) { - my ($self, $CollectionBlock, $Keys) = @_; - - my @SortedKeys = sort { $b <=> $a } @$Keys; - return \@SortedKeys; -} - -sub DisplayProperty($$$) -{ - my ($self, $CollectionBlock, $PropertyDescriptor) = @_; + my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); @@ -54,21 +46,9 @@ sub DisplayProperty($$$) $PropertyName eq "FromName" || $PropertyName eq "Subject"; } -sub GetItemActions($$) -{ - #my ($self, $CollectionBlock) = @_; - return []; -} - -sub GetActions($$) -{ - #my ($self, $CollectionBlock) = @_; - return []; -} - sub GenerateDataCell($$$$$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + my ($self, $Item, $PropertyDescriptor, $DetailsPage) = @_; my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Disposition" and $Item->Disposition =~ /job ([0-9]+)$/) @@ -80,14 +60,29 @@ sub GenerateDataCell($$$$$) } else { - $self->SUPER::GenerateDataCell($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage); + $self->SUPER::GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); } } +sub GetItemActions($) +{ + #my ($self) = @_; + return []; +} + +sub GetActions($) +{ + #my ($self) = @_; + return []; +} + package main; -my $Request = shift; +use ObjectModel::CGI::SimpleCollectionPage; +use WineTestBot::Patches; -my $PatchesListPage = PatchesListPage->new($Request, ""); -$PatchesListPage->GeneratePage(); +my $Request = shift; +my $Page = ObjectModel::CGI::SimpleCollectionPage->new($Request, "", CreatePatches(), \&PatchesBlock::Create); +$Page->SetRefreshInterval(60); +$Page->GeneratePage();

1 0

Francois Gouget : testbot/web: Standardize the page creation.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: tools Branch: master Commit: 1c24a824261992b4f1c507cdd176bdf4fcc08d72 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1c24a824261992b4f1c507c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 31 16:07:06 2022 +0200 testbot/web: Standardize the page creation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 5 ++--- testbot/web/Feedback.pl | 5 ++--- testbot/web/ForgotPassword.pl | 5 ++--- testbot/web/JobDetails.pl | 5 ++--- testbot/web/Login.pl | 5 ++--- testbot/web/Logout.pl | 5 ++--- testbot/web/Register.pl | 5 ++--- testbot/web/ResetPassword.pl | 5 ++--- testbot/web/Stats.pl | 5 ++--- testbot/web/Submit.pl | 5 ++--- testbot/web/admin/BranchDetails.pl | 5 ++--- testbot/web/admin/Log.pl | 5 ++--- testbot/web/admin/SpecialJobs.pl | 5 ++--- testbot/web/admin/UserDetails.pl | 5 ++--- testbot/web/admin/VMDetails.pl | 5 ++--- testbot/web/index.pl | 5 ++--- 16 files changed, 32 insertions(+), 48 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 1771e7c..5a5a375 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -318,6 +318,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $ActivityPage = ActivityPage->new($Request, "wine-devel"); -$ActivityPage->GeneratePage(); +my $Page = ActivityPage->new($Request, "wine-devel"); +$Page->GeneratePage(); diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index ca1ee5e..6185d26 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -137,6 +137,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $FeedbackPage = FeedbackPage->new($Request, ""); -$FeedbackPage->GeneratePage(); +my $Page = FeedbackPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index cc0cd45..1909852 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -131,6 +131,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $ForgotPasswordPage = ForgotPasswordPage->new($Request, ""); -$ForgotPasswordPage->GeneratePage(); +my $Page = ForgotPasswordPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 5b8b701..3b639b7 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -709,6 +709,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $JobDetailsPage = JobDetailsPage->new($Request, ""); -$JobDetailsPage->GeneratePage(); +my $Page = JobDetailsPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index ac64fc2..b1f82a9 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -154,6 +154,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $LoginPage = LoginPage->new($Request, ""); -$LoginPage->GeneratePage(); +my $Page = LoginPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index b0fd5cd..35f5c48 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -76,6 +76,5 @@ sub GeneratePage($) package main; my $Request = shift; - -my $LogoutPage = LogoutPage->new($Request, ""); -$LogoutPage->GeneratePage(); +my $Page = LogoutPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 4cfef79..bbea0eb 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -183,6 +183,5 @@ EOF package main; my $Request = shift; - -my $RegisterPage = RegisterPage->new($Request, ""); -$RegisterPage->GeneratePage(); +my $Page = RegisterPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 81655e0..4f672ea 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -184,6 +184,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $ResetPasswordPage = ResetPasswordPage->new($Request, ""); -$ResetPasswordPage->GeneratePage(); +my $Page = ResetPasswordPage->new($Request, ""); +$Page->GeneratePage(); diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 39c2878..7ef65b3 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -397,6 +397,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $StatsPage = StatsPage->new($Request, "wine-devel"); -$StatsPage->GeneratePage(); +my $Page = StatsPage->new($Request, "wine-devel"); +$Page->GeneratePage(); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index aba2b6d..8323b9a 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1376,6 +1376,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $SubmitPage = SubmitPage->new($Request, "wine-devel"); -$SubmitPage->GeneratePage(); +my $Page = SubmitPage->new($Request, "wine-devel"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/BranchDetails.pl b/testbot/web/admin/BranchDetails.pl index fe3ebd1..1373e20 100644 --- a/testbot/web/admin/BranchDetails.pl +++ b/testbot/web/admin/BranchDetails.pl @@ -38,6 +38,5 @@ sub _initialize($$$) package main; my $Request = shift; - -my $BranchDetailsPage = BranchDetailsPage->new($Request, "admin"); -$BranchDetailsPage->GeneratePage(); +my $Page = BranchDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 8d3a8ce..9c18c37 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -97,6 +97,5 @@ sub GenerateBody($) package main; my $Request = shift; - -my $LogPage = LogPage->new($Request, "admin"); -$LogPage->GeneratePage(); +my $Page = LogPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 49f80a0..e267cc7 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -256,6 +256,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $SubmitPage = SpecialJobsPage->new($Request, "admin"); -$SubmitPage->GeneratePage(); +my $Page = SpecialJobsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 7f7c710..f11d127 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -126,6 +126,5 @@ sub OnAction($$) package main; my $Request = shift; - -my $UserDetailsPage = UserDetailsPage->new($Request, "admin"); -$UserDetailsPage->GeneratePage(); +my $Page = UserDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index f39b0d6..35b2681 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -89,6 +89,5 @@ sub GenerateFooter($) package main; my $Request = shift; - -my $VMDetailsPage = VMDetailsPage->new($Request, "admin"); -$VMDetailsPage->GeneratePage(); +my $Page = VMDetailsPage->new($Request, "admin"); +$Page->GeneratePage(); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 9442153..d2dd2b4 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -394,6 +394,5 @@ EOF package main; my $Request = shift; - -my $StatusPage = StatusPage->new($Request, ""); -$StatusPage->GeneratePage(); +my $Page = StatusPage->new($Request, ""); +$Page->GeneratePage();

1 0

Francois Gouget : testbot: Remove an unneeded Fcntl import in VM::Run().
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: tools Branch: master Commit: 5de09acdbdcf2ac19d80e31e40a971fde04f7b08 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5de09acdbdcf2ac19d80e31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 31 16:06:10 2022 +0200 testbot: Remove an unneeded Fcntl import in VM::Run(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index f850daa..65f6333 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -446,7 +446,6 @@ sub Run($$$$$$) # So set ChildPid in the parent and synchronize with the child so it only # execs once this is done. - use Fcntl; my ($fd_read, $fd_write); pipe($fd_read, $fd_write); # For synchronization

1 0

Francois Gouget : testbot/web: Remove unneeded imports from the Submit page.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: tools Branch: master Commit: 5d3a4e575d33d4bac1198b71641e8ed63b783d75 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5d3a4e575d33d4bac1198b7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 31 16:05:49 2022 +0200 testbot/web: Remove unneeded imports from the Submit page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3d49aae..aba2b6d 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -26,9 +26,7 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use Fcntl qw(O_RDONLY); -use IO::Handle; use POSIX qw(:fcntl_h); # For SEEK_XXX -use File::Basename; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor;

1 0

Francois Gouget : testbot/web: Use SimpleCollectionPage for the job details page.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: tools Branch: master Commit: a9fa612e264e7d00068c3912c3f9a85da9a48d39 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a9fa612e264e7d00068c391… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 31 16:52:53 2022 +0200 testbot/web: Use SimpleCollectionPage for the job details page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 378 +++++++++++++++++++++++++--------------------- 1 file changed, 205 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=a9fa612e264e7d00068…

1 0

Francois Gouget : testbot: Fix the spelling of a couple of Perl POD entries.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: tools Branch: master Commit: 4e33e66ba1630737c7012e6a34bb2851da4a1faf URL: https://source.winehq.org/git/tools.git/?a=commit;h=4e33e66ba1630737c7012e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 31 16:52:05 2022 +0200 testbot: Fix the spelling of a couple of Perl POD entries. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 58ece69..9a52f11 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -37,7 +37,7 @@ Also, because this is only one part of a web page, some methods, such as those dealing with errors, are delegated to the EnclosingPage object which must implement the ObjectModel::CGI::Page interface. -Other methods are designed so they can be overriden by the enclosing page as +Other methods are designed so they can be overridden by the enclosing page as a way to allow it to modify how the collection block looks or behaves. These methods can be identified by their CallXxx() trampoline. The override mechanism works as follows: diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index a791559..0879557 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -360,7 +360,7 @@ sub GetPageTitle($) =head1 C<GetTitle()> This returns the title for the current web page or email section. -Note that this may not be valid HTML and thus my need escaping. +Note that this may not be valid HTML and thus may need escaping. =back =cut

1 0

Francois Gouget : testbot/cgi: Add SimpleCollectionPage.
by Alexandre Julliard March 31, 2022

March 31, 2022

Module: tools Branch: master Commit: 1af4892ec58788f17e4ab12b92d3e16fe9fdff56 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1af4892ec58788f17e4ab12… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 31 16:53:07 2022 +0200 testbot/cgi: Add SimpleCollectionPage. SimpleCollectionPage embeds a single collection block. But unlike CollectionPage it is only a Page subclass instead of implementing both the Page and CollectionBlock interfaces. Customizing the collection block is done by creating a CollectionBlock subclass and passing the appropriate creator function to the page constructor. This better separates the page customization aspects (implement a SimpleCollectionPage subclass) from the collection block ones (implement a CollectionBlock subclass). Most of the time only the collection block needs to be customized and SimpleCollectionPage can be used as is. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 5 + .../lib/ObjectModel/CGI/SimpleCollectionPage.pm | 138 +++++++++++++++++++++ 2 files changed, 143 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 9a52f11..200734a 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -91,6 +91,11 @@ sub _initialize($$$) #my ($self, $Collection, $EnclosingPage) = @_; } +sub Create($$@) +{ + return ObjectModel::CGI::CollectionBlock->new(@_); +} + sub CallGetDetailsPage($) { my ($self) = @_; diff --git a/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm b/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm new file mode 100644 index 0000000..76e4d51 --- /dev/null +++ b/testbot/lib/ObjectModel/CGI/SimpleCollectionPage.pm @@ -0,0 +1,138 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Base class for list pages +# +# Copyright 2009 Ge van Geldorp +# Copyright 2014, 2017-2018, 2022 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package ObjectModel::CGI::SimpleCollectionPage; + +=head1 NAME + +ObjectModel::CGI::SimpleCollectionPage - Base class for list pages + +A page containing a single collection block. + +The SimpleCollectionPage instances have the following properties: +=over +=item Collection +The collection containing the items to be shown in the CollectionBlock widget. + +=item CollectionBlock +The widget showing the items in the specified collection. + +=item ActionPerformed +Set to true if an action was specified and succeeded. +=back + +=cut + +use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); + +# Use require to avoid overriding Page::new() +require ObjectModel::CGI::CollectionBlock; + + +=pod +=over 12 + +=item C<_initialize()> + +Sets up the new page object. + +Parameters: +=over + +=item Request +=item RequiredRole +See Page::new(). + +=item Collection +This is the collection of items that should be shown in the CollectionBlock +widget. + +=item BlockCreator +If undefined the page will create an instance of the CollectionBlock class. +Otherwise it will use this function to create the CollectionBlock widget, thus +enabling use of a CollectionBlock subclass. + +=back + +=back +=cut + +sub _initialize($$$$;$) +{ + my ($self, $Request, $RequiredRole, $Collection, $BlockCreator) = @_; + + $self->{Collection} = $Collection; + $BlockCreator ||= \&ObjectModel::CGI::CollectionBlock::Create; + $self->{CollectionBlock} = &$BlockCreator($Collection, $self); + $self->SUPER::_initialize($Request, $RequiredRole); +} + + +# +# HTML page generation +# + +sub GetTitle($) +{ + my ($self) = @_; + + my $Title = ucfirst($self->{Collection}->GetCollectionName()); + $Title =~ s/([a-z])([A-Z])/$1 $2/g; + return $Title; +} + +sub GenerateTitle($) +{ + my ($self) = @_; + + my $Title = $self->GetTitle(); + if ($Title) + { + print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; + } +} + +sub GenerateBody($) +{ + my ($self) = @_; + + print "<div class='CollectionPageBody'>\n"; + $self->GenerateTitle(); + print "<div class='Content'>\n"; + $self->{CollectionBlock}->GenerateList(); + print "</div>\n"; + print "</div>\n"; +} + +sub GeneratePage($) +{ + my ($self) = @_; + + if ($self->GetParam("Action")) + { + $self->{ActionPerformed} = $self->{CollectionBlock}->OnAction($self->GetParam("Action")); + } + $self->SUPER::GeneratePage(); +} + +1;

1 0