bluto

commit d76ccc4ff57a98b0900c6f1c44ad988ca0dc9e07
parent 5c2e9a9e1dad9b9045292246b1903db05120f6f6
Author: lash <dev@holbrook.no>
Date:   Wed, 19 Jun 2024 16:30:17 +0100

Reinstate rss generation from module

Diffstat:
M
Bluto.pm
 | 
10
++++++++++
M
Bluto/RSS.pm
 | 
64
+++++++++++++++++++++++++++++++++++++++++++++++++++-------------
A
Bluto/Version.pm
 | 
5
+++++
M
to_std.pl
 | 
5
++---

4 files changed, 68 insertions(+), 16 deletions(-)
diff --git a/Bluto.pm b/Bluto.pm
@@ -56,6 +56,7 @@ sub from_config {
 	$m_main{slug} = $cfg->param('main.slug');
 	$m_main{summary} = $cfg->param('main.summary');
 	$m_main{license} = $cfg->param('main.license');
+	$m_main{url} = $cfg->param('main.url');
 	$m_main{author_maintainer}[0] = $cfg->param('author:maintainer.name') . " <" . $cfg->param('author:maintainer.email') . ">";
 	$m_main{author_maintainer}[1] = $cfg->param('author:maintainer.pgp');
 
@@ -152,6 +153,7 @@ sub from_config {
 
 sub get_announcement {
 	my $env = shift;
+
 	my $tt = Template->new({
 		INCLUDE_PATH => '.',
 		INTERPOLATE => 1,
@@ -162,4 +164,12 @@ sub get_announcement {
 	return $out;
 }
 
+sub get_rss {
+	my $env = shift;
+
+	my $out = get_announcement($env);
+
+	return Bluto::RSS::to_string(\%m_main, $env, $out);
+}
+
 1;
diff --git a/Bluto/RSS.pm b/Bluto/RSS.pm
@@ -1,37 +1,54 @@
 package Bluto::RSS;
 
+use File::Spec;
 use DateTime;
 
 use XML::RSS;
 use Template;
 
 use Log::Term::Ansi qw/error info debug warn trace/;
+use Bluto::Version;
 
 
-sub to_file() {
-	my $rss_title = $m_main{slug} . ' ' . $m_main{version};
+sub get_feed_filepath {
+	my $release = shift;
+	my $env = shift;
+	
+	my $fn = $release->{slug} . '.bluto.rss';
+	my $fp = File::Spec->catfile($env->{feed_dir}, $fn);
+	return $fp;
+}
+
+sub process {
+	my $release = shift;
+	my $env = shift;
+	my $body = shift;
+
+	my $rss_title = $release->{slug} . ' ' . $release->{version};
 	my $rss;
 	$rss = XML::RSS->new;
+	my $feed_file = get_feed_filepath($release, $env);
 	if ( -f $feed_file ) {
 		info('found existing feed file ' . $feed_file);
 		$rss->parsefile( $feed_file );
 		foreach my $v ( @{$rss->{items}} ) {
 			debug('rss contains: ' . $v->{title});
 			if ($v->{title} eq $rss_title) {
-				die('already have rss entry for ' . $rss_title);
+				error('already have rss entry for ' . $rss_title);
+				return undef;
 			}
 		}
 	} else {
 		info('starting new feed file ' . $feed_file);
 		$rss = XML::RSS->new(version => '1.0');
 		$rss->channel (
-			title => $m_main{name},
-			link => $m_main{git_upstream},
-			description => $m_main{summary},
+			title => $release->{name},
+			link => $release->{url},
+			description => $release->{summary},
 			dc => {
 				date => DateTime->now()->stringify(),
-				creator => $m_main{author_maintainer},
-				publisher => "$0 " . SemVer->new(VERSION). " (perl $^V)",
+				creator => $release->{author_maintainer},
+				publisher => "$0 " . SemVer->new(Bluto::Version::VERSION). " (perl $^V)",
 			},
 		#		subject    => "Linux Software",
 		#		creator    => 'scoop@freshmeat.net',
@@ -49,16 +66,19 @@ sub to_file() {
 	# check if we already have the title
 	foreach my $item ( $rss->{items}) {
 		if ( defined $item->[0] && $item->[0]{title} eq $rss_title ) {
-			die('already have published record for ' . $rss_title);
+			error('already have published record for ' . $rss_title);
+			return undef;
 		}
 	}
 
+	debug('outs '. $release->{url});
+
 	$rss->add_item (
 		title => $rss_title,
-		link => $targz,
-		description => $out,
+		link => $release->{src}[0],
+		description => $body,
 		dc => {
-			date => $m_main{time},
+			date => $release{time},
 		},
 	#  dc => {
 		#       subject  => "X11/Utilities",
@@ -70,7 +90,25 @@ sub to_file() {
 		#                               ]
 	);
 
-	$rss->save($feed_file);
+	return $rss;
+}
+
+sub to_string {
+	my $release = shift;
+	my $env = shift;
+	my $body = shift;
+
+	my $rss = process($release, $env, $body);
+	return $rss->as_string;
+}
+
+sub to_file {
+	my $release = shift;
+	my $env = shift;
+	my $body = shift;
+
+	my $rss = process($release, $env, $body);
+	$rss->save(get_feed_filepath($release, $env));
 }
 
 1;
diff --git a/Bluto/Version.pm b/Bluto/Version.pm
@@ -0,0 +1,5 @@
+package Bluto::Version;
+
+use constant { VERSION => '0.0.1' };
+
+1;
diff --git a/to_std.pl b/to_std.pl
@@ -3,7 +3,6 @@
 use v5.10.1;
 use warnings;
 use strict;
-use constant { VERSION => '0.0.1' };
 
 # standard imports
 use Getopt::Long qw/ :config auto_help /;
@@ -60,7 +59,7 @@ if (!defined $version) {
 }
 
 my $announcement = Bluto::get_announcement(\%env);
-
-print($announcement);
+my $rss = Bluto::get_rss(\%env);
+print($rss);
 
 #my @change = $cfg->vars();