From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DED2A91099; Wed, 7 Sep 2022 10:58:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D4D272F804; Wed, 7 Sep 2022 10:58:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS; Wed, 7 Sep 2022 10:58:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B3B5243EC2; Wed, 7 Sep 2022 10:58:30 +0200 (CEST) From: Daniel Tschlatscher To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com, pmg-devel@lists.proxmox.com Date: Wed, 7 Sep 2022 10:56:29 +0200 Message-Id: <20220907085633.89113-4-d.tschlatscher@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220907085633.89113-1-d.tschlatscher@proxmox.com> References: <20220907085633.89113-1-d.tschlatscher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.081 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH common v2 3/7] stream file method for PMG and PVE X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2022 08:58:31 -0000 Creating the filestream for the tasklog download is sourced in its own function to avoid redundant implementations in pmg-api and pve-manager Signed-off-by: Daniel Tschlatscher --- src/PVE/Tools.pm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm index eb81b96..5639c32 100644 --- a/src/PVE/Tools.pm +++ b/src/PVE/Tools.pm @@ -2056,4 +2056,32 @@ sub get_file_hash { return lc($digest); } +sub stream_file { + my ($filename, $suggested_name, $compress, $content_type) = @_; + + my $fh; + $content_type = $content_type // "text/plain"; + $suggested_name = $suggested_name // $filename; + + if ($compress) { + my $cmd = ["/usr/bin/gzip", "-c", "$filename"]; + + open($fh, "-|", join(' ', @$cmd)) + or die "Could not create compressed file stream for $filename - $!"; + } else { + open($fh, '<', $filename) + or die "Could not open file $filename - $!"; + } + + return { + download => { + fh => $fh, + stream => 1, + 'content-encoding' => $compress ? 'gzip' : undef, + 'content-type' => $content_type, + 'content-disposition' => "attachment; filename=\"$suggested_name\"", + }, + }, +} + 1; -- 2.30.2