X-Git-Url: https://git.shemshak.org/~bandali/bndl.org/blobdiff_plain/324698012e075437f9ed936c99f47ad60ee8438e..2e54355170923a0479ca86bae87b5e698ca61931:/txt2pre diff --git a/txt2pre b/txt2pre index 31fdb78..1f04eb4 100644 --- a/txt2pre +++ b/txt2pre @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# txt2pre --- convert my site's txt files to `pre'-based html +# txt2pre --- convert my site's txt files to `pre'-based atom/rss/html # Copyright (C) 2014-2021 all contributors # Copyright (c) 2021 Amin Bandali @@ -195,11 +195,12 @@ my $txt = do { local $/; }; my $title = html_esc($txt =~ /\A([^\n]+)/); $title =~ s/^\s+|\s+$//g; -$title .= " — $author" if $title !~ /$author/; +$title .= " — $author" if $title !~ /$author/; my ($upd, $pub, $url) = $txt =~ /(.*)\r?\n(.*)\r?\n(.*)\r?\n?\z/; ($upd) = $upd =~ /(?:updated|ویرایش): (.*)/ if $upd; ($pub) = $pub =~ /(?:published|انتشار): (.*)/ if $pub; +$upd = $pub if (!$upd); ($url) = $url =~ /(?:plain text|متن ساده): (.*)/ if $url; $url = 'https://bndl.org/bandali-cv.txt' if (!$url and $title =~ /curriculum vitae/); @@ -211,10 +212,10 @@ $txt = linkify(html_esc($txt)); my $upd_iso8601 = `date -Iseconds -ud '$upd' | tr -d \\\\n` if $upd; my $pub_iso8601 = `date -Iseconds -ud '$pub' | tr -d \\\\n` if $pub; my $pub_rfc5322 = `date -uRd '$pub' | tr -d \\\\n` if $pub; -my $url_html = $url =~ s/(?:[.]$lang)?[.]txt$/.html/r; -$url_html =~ s|/bandali-(.*)|/$1|; -my $slug = $url_html =~ s|.*/(.*)[.]html$|$1|r; -my $note_id = "$feed_id:$slug"; +my $url_html = $url =~ s/(?:[.]$lang)?[.]txt$/.html/r if $url; +$url_html =~ s|/bandali-(.*)|/$1| if $url_html; +my $slug = $url_html =~ s|.*/(.*)[.]html$|$1|r if $url_html; +my $note_id = "$feed_id:$slug" if $url_html; # note header if ($format eq 'html') { @@ -272,7 +273,7 @@ qq( $url_html $note_id $pub_rfc5322\n) -. ($updated ? $updated : '') . +. (($updated and $pub ne $upd) ? $updated : '') . qq() : ''; }