From 36cf2ade4b596db0a62c66196e9e46abef0be574 Mon Sep 17 00:00:00 2001 From: Kenichi Ishigaki Date: Wed, 14 May 2025 01:09:11 +0900 Subject: [PATCH 1/4] Revert "Improve sorting by the modified date for show_files and delete_files" This reverts commit cc2433a67b35c956dbea74168618909c1a7809fe. --- lib/pause_2017/PAUSE/Web/Controller/User/Files.pm | 10 ++++------ lib/pause_2017/templates/user/files/delete.html.ep | 4 ++-- lib/pause_2017/templates/user/files/show.html.ep | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm b/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm index d5e3602b8..7d6cc0472 100644 --- a/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm +++ b/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm @@ -49,11 +49,10 @@ sub show { warn "ALERT: Could not stat f[$f]: $!"; next; } - my $modified = (stat _)[9]; my $blurb = $deletes{$f} ? $c->scheduled($whendele{$f}) : - HTTP::Date::time2str($modified); - $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f}, modified => $modified }; + HTTP::Date::time2str((stat _)[9]); + $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f} }; } $pause->{files} = \%files; } @@ -178,11 +177,10 @@ sub delete { $tmpf =~ s/\.(?:readme|meta)$/.tar.gz/; my $info = CPAN::DistnameInfo->new($tmpf); my $distv = $info->distvname; - my $modified = (stat _)[9]; my $blurb = $deletes{$f} ? $c->scheduled($whendele{$f}) : - HTTP::Date::time2str($modified); - $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f}, distv => $distv, modified => $modified }; + HTTP::Date::time2str((stat _)[9]); + $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f}, distv => $distv }; $pause->{deleting_indexed_files} = 1 if $deletes{$f} && $indexed->{$f}; } $pause->{files} = \%files; diff --git a/lib/pause_2017/templates/user/files/delete.html.ep b/lib/pause_2017/templates/user/files/delete.html.ep index 2d182bae7..f159dc89a 100644 --- a/lib/pause_2017/templates/user/files/delete.html.ep +++ b/lib/pause_2017/templates/user/files/delete.html.ep @@ -36,7 +36,7 @@ <%= $file %> % } <%= $files->{$file}{stat} %> - <%= $files->{$file}{blurb} %> + <%= $files->{$file}{blurb} %> % } @@ -48,7 +48,7 @@ %= javascript "/list.min.js" %= javascript begin var List = new List('files', { - valueNames: ['file', 'size', { name: 'modified', attr: 'data-modified' }] + valueNames: ['file', 'size', 'modified'] }); document.querySelectorAll('input[type=checkbox]').forEach(function(e) { diff --git a/lib/pause_2017/templates/user/files/show.html.ep b/lib/pause_2017/templates/user/files/show.html.ep index 950f6414d..9bab21d54 100644 --- a/lib/pause_2017/templates/user/files/show.html.ep +++ b/lib/pause_2017/templates/user/files/show.html.ep @@ -23,7 +23,7 @@ <%= $file %> % } <%= $files->{$file}{stat} %> - <%= $files->{$file}{blurb} %> + <%= $files->{$file}{blurb} %> % } @@ -33,7 +33,7 @@ %= javascript "/list.min.js" %= javascript begin var List = new List('files', { - valueNames: ['file', 'size', { name: 'modified', attr: 'data-modified' }] + valueNames: ['file', 'size', 'modified'] }); % end % end From 2e2ef28f7c0db02fb64d97e66695385b0eb825a3 Mon Sep 17 00:00:00 2001 From: Kenichi Ishigaki Date: Wed, 14 May 2025 01:09:18 +0900 Subject: [PATCH 2/4] Revert "Use distvname instead of dist not to check distributions with different versions" This reverts commit 08e28db4e3c5813ff476a99f853c26d984abafb1. --- lib/pause_2017/PAUSE/Web/Controller/User/Files.pm | 4 ++-- lib/pause_2017/templates/user/files/delete.html.ep | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm b/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm index 7d6cc0472..d48bc3ca4 100644 --- a/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm +++ b/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm @@ -176,11 +176,11 @@ sub delete { my $tmpf = $f; $tmpf =~ s/\.(?:readme|meta)$/.tar.gz/; my $info = CPAN::DistnameInfo->new($tmpf); - my $distv = $info->distvname; + my $dist = $info->dist; my $blurb = $deletes{$f} ? $c->scheduled($whendele{$f}) : HTTP::Date::time2str((stat _)[9]); - $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f}, distv => $distv }; + $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f}, dist => $dist }; $pause->{deleting_indexed_files} = 1 if $deletes{$f} && $indexed->{$f}; } $pause->{files} = \%files; diff --git a/lib/pause_2017/templates/user/files/delete.html.ep b/lib/pause_2017/templates/user/files/delete.html.ep index f159dc89a..0b2a4e90f 100644 --- a/lib/pause_2017/templates/user/files/delete.html.ep +++ b/lib/pause_2017/templates/user/files/delete.html.ep @@ -29,7 +29,7 @@ % for my $file (sort keys %$files) { - <%= check_box "pause99_delete_files_FILE" => $file, 'data-distv' => $files->{$file}{distv} %> + <%= check_box "pause99_delete_files_FILE" => $file, 'data-dist' => $files->{$file}{dist} %> % if ($files->{$file}{indexed}) { <%= $file %> [indexed] % } else { @@ -54,8 +54,8 @@ var List = new List('files', { document.querySelectorAll('input[type=checkbox]').forEach(function(e) { e.addEventListener('change', function(ev) { var checked = ev.currentTarget.checked; - var distv = ev.currentTarget.getAttribute('data-distv'); - document.querySelectorAll('input[data-distv="'+distv+'"]').forEach(function(e) { + var dist = ev.currentTarget.getAttribute('data-dist'); + document.querySelectorAll('input[data-dist='+dist+']').forEach(function(e) { e.checked = checked; }); }) From c1903201e1a64184cd4afa1dc99353f66ae7a713 Mon Sep 17 00:00:00 2001 From: Kenichi Ishigaki Date: Wed, 14 May 2025 01:09:25 +0900 Subject: [PATCH 3/4] Revert "Add js snippet to check related checkboxes" This reverts commit 843ae2c399a22275a17a8efbe69de79bf38108d5. --- lib/pause_2017/templates/user/files/delete.html.ep | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/pause_2017/templates/user/files/delete.html.ep b/lib/pause_2017/templates/user/files/delete.html.ep index 0b2a4e90f..c9789d6af 100644 --- a/lib/pause_2017/templates/user/files/delete.html.ep +++ b/lib/pause_2017/templates/user/files/delete.html.ep @@ -50,17 +50,6 @@ var List = new List('files', { valueNames: ['file', 'size', 'modified'] }); - -document.querySelectorAll('input[type=checkbox]').forEach(function(e) { - e.addEventListener('change', function(ev) { - var checked = ev.currentTarget.checked; - var dist = ev.currentTarget.getAttribute('data-dist'); - document.querySelectorAll('input[data-dist='+dist+']').forEach(function(e) { - e.checked = checked; - }); - }) -}); - % end % end From 14e087c9d8a97830d28b8c232b22f07b9afcb1e5 Mon Sep 17 00:00:00 2001 From: Kenichi Ishigaki Date: Wed, 14 May 2025 01:09:31 +0900 Subject: [PATCH 4/4] Revert "Add distibution name to checkboxes to delete" This reverts commit 5d4a1b60b8d8a085cd83448495602a76efb33029. --- lib/pause_2017/PAUSE/Web/Controller/User/Files.pm | 7 +------ lib/pause_2017/templates/user/files/delete.html.ep | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm b/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm index d48bc3ca4..822fc3790 100644 --- a/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm +++ b/lib/pause_2017/PAUSE/Web/Controller/User/Files.pm @@ -4,7 +4,6 @@ use Mojo::Base "Mojolicious::Controller"; use HTTP::Date (); use File::pushd; use PAUSE (); -use CPAN::DistnameInfo; sub show { my $c = shift; @@ -173,14 +172,10 @@ sub delete { warn "ALERT: Could not stat f[$f]: $!"; next; } - my $tmpf = $f; - $tmpf =~ s/\.(?:readme|meta)$/.tar.gz/; - my $info = CPAN::DistnameInfo->new($tmpf); - my $dist = $info->dist; my $blurb = $deletes{$f} ? $c->scheduled($whendele{$f}) : HTTP::Date::time2str((stat _)[9]); - $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f}, dist => $dist }; + $files{$f} = {stat => -s _, blurb => $blurb, indexed => $indexed->{$f} }; $pause->{deleting_indexed_files} = 1 if $deletes{$f} && $indexed->{$f}; } $pause->{files} = \%files; diff --git a/lib/pause_2017/templates/user/files/delete.html.ep b/lib/pause_2017/templates/user/files/delete.html.ep index c9789d6af..6bd26d07d 100644 --- a/lib/pause_2017/templates/user/files/delete.html.ep +++ b/lib/pause_2017/templates/user/files/delete.html.ep @@ -29,7 +29,7 @@ % for my $file (sort keys %$files) { - <%= check_box "pause99_delete_files_FILE" => $file, 'data-dist' => $files->{$file}{dist} %> + <%= check_box "pause99_delete_files_FILE" => $file %> % if ($files->{$file}{indexed}) { <%= $file %> [indexed] % } else {