urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optionally accept and emit comments' url/email/ip.

master
Amitai Schlair 2014-12-28 10:02:26 -05:00
parent c574e7b422
commit b435ddb8de
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ikiwiki-comment.in
View File

@ -14,12 +14,15 @@ sub main {
my $pagefile=shift || usage(); my $pagefile=shift || usage();
my $interactive = -t STDIN; my $interactive = -t STDIN;
my $content; my $content;
my ($format, $username, $subject, $date); my ($format, $username, $subject, $date, $url, $email, $ip);
GetOptions( GetOptions(
'format:s' => \$format, 'format:s' => \$format,
'username:s' => \$username, 'username:s' => \$username,
'subject:s' => \$subject, 'subject:s' => \$subject,
'date:s' => \$date, 'date:s' => \$date,
'url:s' => \$url,
'email:s' => \$email,
'ip:s' => \$ip,
) || usage(); ) || usage();
my $dir=get_dir($pagefile); my $dir=get_dir($pagefile);
@ -32,15 +35,21 @@ sub main {
$username ||= get_username(); $username ||= get_username();
$subject ||= get_subject($page, $dir); $subject ||= get_subject($page, $dir);
$date ||= IkiWiki::Plugin::comments::commentdate(); $date ||= IkiWiki::Plugin::comments::commentdate();
$url ||= undef;
$email ||= undef;
$ip ||= undef;
} else { } else {
$format ||= undef; $format ||= undef;
die "must supply username" unless defined $username; die "must supply username" unless defined $username;
$subject ||= get_subject($page, $dir); $subject ||= get_subject($page, $dir);
die "must supply date" unless defined $date; die "must supply date" unless defined $date;
$url ||= undef;
$email ||= undef;
$ip ||= undef;
chomp($content = join('', <STDIN>)); chomp($content = join('', <STDIN>));
} }
my $comment=get_comment($format, $username, $subject, $date, $content); my $comment=get_comment($format, $username, $subject, $date, $url, $email, $ip, $content);
# For interactive use, this will yield a hash of the comment before # For interactive use, this will yield a hash of the comment before
# it's edited, but that's ok; the date provides sufficient entropy # it's edited, but that's ok; the date provides sufficient entropy
@ -81,13 +90,16 @@ sub get_subject {
} }
sub get_comment { sub get_comment {
my ($format, $username, $subject, $date, $content) = @_; my ($format, $username, $subject, $date, $url, $email, $ip, $content) = @_;
$format = defined $format ? $format = " format=$format" : q{}; $format = defined $format ? $format = " format=$format" : q{};
$content = '' unless defined $content; $content = '' unless defined $content;
my $comment="[[!comment$format\n"; my $comment="[[!comment$format\n";
$comment.=" username=\"$username\"\n"; $comment.=" username=\"$username\"\n";
$comment.=" subject=\"\"\"$subject\"\"\"\n"; $comment.=" subject=\"\"\"$subject\"\"\"\n";
$comment.=" date=\"$date\"\n"; $comment.=" date=\"$date\"\n";
$comment.=" url=\"$url\"\n" if defined $url;
$comment.=" email=\"$email\"\n" if defined $email;
$comment.=" ip=\"$ip\"\n" if defined $ip;
$comment.=" content=\"\"\"\n$content\n\"\"\"]]\n"; $comment.=" content=\"\"\"\n$content\n\"\"\"]]\n";
return $comment; return $comment;
} }