* [PATCH 4/4] lei: use File::Temp for listing saved searches
2023-09-22 21:13 5% [PATCH 0/4] small lei fixes Eric Wong
@ 2023-09-22 21:13 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-09-22 21:13 UTC (permalink / raw)
To: meta
I have no idea how badly my brain malfunctioned here when I
wrote the code to create a temporary file without O_EXCL :x
I'm still not sure if users have enough saved searches for
justifying a cache, here.
---
lib/PublicInbox/LeiSavedSearch.pm | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/LeiSavedSearch.pm b/lib/PublicInbox/LeiSavedSearch.pm
index e5396342..2811c46d 100644
--- a/lib/PublicInbox/LeiSavedSearch.pm
+++ b/lib/PublicInbox/LeiSavedSearch.pm
@@ -3,8 +3,7 @@
# pretends to be like LeiDedupe and also PublicInbox::Inbox
package PublicInbox::LeiSavedSearch;
-use strict;
-use v5.10.1;
+use v5.12;
use parent qw(PublicInbox::Lock);
use PublicInbox::Git;
use PublicInbox::OverIdx;
@@ -14,6 +13,8 @@ use PublicInbox::Spawn qw(run_die);
use PublicInbox::ContentHash qw(git_sha);
use PublicInbox::MID qw(mids_for_index);
use PublicInbox::SHA qw(sha256_hex);
+use File::Temp ();
+use IO::Handle ();
our $LOCAL_PFX = qr!\A(?:maildir|mh|mbox.+|mmdf|v2):!i; # TODO: put in LeiToMail?
# move this to PublicInbox::Config if other things use it:
@@ -76,20 +77,17 @@ sub list {
my $lss_dir = $lei->share_path.'/saved-searches';
return () unless -d $lss_dir;
# TODO: persist the cache? Use another format?
- my $f = $lei->cache_dir."/saved-tmp.$$.".time.'.config';
- open my $fh, '>', $f or die "open $f: $!";
+ my $fh = File::Temp->new(TEMPLATE => 'lss_list-XXXX', TMPDIR => 1) or
+ die "File::Temp->new: $!";
print $fh "[include]\n";
for my $p (glob("$lss_dir/*/lei.saved-search")) {
print $fh "\tpath = ", cquote_val($p), "\n";
}
- close $fh or die "close $f: $!";
- my $cfg = $lei->cfg_dump($f);
- unlink($f);
+ $fh->flush or die "flush: $fh";
+ my $cfg = $lei->cfg_dump($fh->filename);
my $out = $cfg ? $cfg->get_all('lei.q.output') : [];
- map {;
- s!$LOCAL_PFX!!;
- $_;
- } @$out
+ s!$LOCAL_PFX!! for @$out;;
+ @$out;
}
sub translate_dedupe ($$) {
^ permalink raw reply related [relevance 7%]
* [PATCH 0/4] small lei fixes
@ 2023-09-22 21:13 5% Eric Wong
2023-09-22 21:13 7% ` [PATCH 4/4] lei: use File::Temp for listing saved searches Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-09-22 21:13 UTC (permalink / raw)
To: meta
Only noticed while working on bigger fixes...
Eric Wong (4):
lei blob|rediff: fix usage of lei->fail
lei: improve ->fail internal API
lei_to_mail: drop awkward duplication of $lei object
lei: use File::Temp for listing saved searches
lib/PublicInbox/LEI.pm | 19 ++++++++++++-------
lib/PublicInbox/LeiBlob.pm | 2 +-
lib/PublicInbox/LeiRediff.pm | 2 +-
lib/PublicInbox/LeiSavedSearch.pm | 20 +++++++++-----------
lib/PublicInbox/LeiToMail.pm | 12 +++++-------
5 files changed, 28 insertions(+), 27 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-09-22 21:13 5% [PATCH 0/4] small lei fixes Eric Wong
2023-09-22 21:13 7% ` [PATCH 4/4] lei: use File::Temp for listing saved searches Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).