X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/0788c4247ca8ea24d8238a910a68efb9e7e3a04a..e9b44cdb431c531fa34832ebee1870e1a301db0a:/writer.plp diff --git a/writer.plp b/writer.plp index 2df9e55..c6d5898 100644 --- a/writer.plp +++ b/writer.plp @@ -5,118 +5,122 @@ Html({ version => '1.0', nocache => 1, raw => <<'EOT', - - + EOT }); use List::Util qw( pairs pairkeys ); +use Shiar_Sheet::FormRow; my $db = eval { - my @dbinfo = ( - 'DBI:Pg:dbname=sheet;host=localhost', 'sheetadmin', 'fairuse', - ) or die "database not configured\n"; - require DBIx::Simple; - DBIx::Simple->new(@dbinfo[0..2], { - RaiseError => 1, - pg_enable_utf8 => 1, - }); + require Shiar_Sheet::DB; + Shiar_Sheet::DB->connect; } or Abort('Database error', 501, $@); -my @wordcols = ( - lang => 'Language', - cat => 'Category', - form => 'Translation', - alt => 'Synonyms', - wptitle => 'Wikipedia', - source => 'Image URL', - thumb => 'Convert options', - prio => 'Level', - cover => undef, # included with prio - ref => 'Reference', +my $user = eval { + my $rootpath = ($ENV{REQUEST_URI} // '/writer') =~ s{(?new( + -name => 'login', + -value => '', + -path => $rootpath, + -expires => 'now', + )->as_string)) { + delete $cookie{login}; + die "Logged out as requested\n"; + } + Alert("Failed to log out", "Login cookie could not be removed."); + } + + my $cookiedata = $cookie{login} or return; + my ($name, $key) = split /[:\v]/, DecodeURI($cookiedata); + my %rowmatch = (username => $name, pass => $key); + my $found = $db->select(login => '*', \%rowmatch)->hash + or die "Invalid user or password\n"; + + eval { + require CGI::Cookie; + my $httpcookie = CGI::Cookie->new( + -name => 'login', + -value => join(':', @{$found}{qw( username pass )}), + -path => $rootpath, + ) or die "prepared object is empty\n"; + AddCookie($httpcookie->as_string); + } or Abort(["Unable to create login cookie", $@], 403); + + return $found; +} or do { + say '

Login to edit words

'; + Alert('Access denied', $@) if $@; + say '
'; + exit; +}; + +my %lang = ( + nl => ["\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}", 'nederlands'], + en => ["\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}", 'english'], + eo => ['★', 'esperanto'], + ru => ["\N{REGIONAL INDICATOR SYMBOL LETTER R}\N{REGIONAL INDICATOR SYMBOL LETTER U}", 'русский'], + zh => ["\N{REGIONAL INDICATOR SYMBOL LETTER C}\N{REGIONAL INDICATOR SYMBOL LETTER N}", '中文'], + la => ["\N{PUSHPIN}", 'latin'], ); -my @prioenum = qw( essential basic common distinctive rare invisible ); -my ($find) = map {{id => $_}} $fields{id} || $Request || (); +my @wordcols = pairkeys +my %wordcol = ( + lang => {-label => 'Language', -select => { + map { $_ => "@{$lang{$_}}" } keys %lang + }}, + cat => [{-label => 'Category'}, 'ref'], + ref => {-label => 'Reference'}, + prio => [ + {-label => 'Level', -select => sub { + my ($row) = @_; + my @enum = qw[ essential basic common distinctive optional invisible ]; + return { + ('' => 'parent') x (defined $row->{ref}), + map { $_ => $enum[$_] } 0 .. $#enum + }; + }}, + 'cover', 'grade', + ], + cover => {-label => 'Highlighted', type => 'checkbox'}, + grade => {-label => 'Order', type => 'number'}, + form => {-label => 'Title'}, + alt => {-label => 'Synonyms', -multiple => 1}, + wptitle => {-label => 'Wikipedia'}, + source => {-label => 'Image', -src => sub { + return "data/word/org/$_[0]->{id}.jpg"; + }}, + thumb => {-label => 'Convert options', -multiple => 1, -src => sub { + return "data/word/en/$_[0]->{id}.jpg"; + }}, + story => {-label => 'Story', type => 'textarea', hidden => 'hidden'}, +); + +if (my $search = $fields{q}) { + my %filter = (form => {ilike => '%'.$search.'%'}); + my $results = $db->select(word => '*', \%filter); + say '

Search

\n"; + exit; +} +my ($find) = map {{id => $_}} $fields{id} || $Request || (); my $row; if ($find) { $row = $db->select(word => '*', $find)->hash @@ -126,13 +130,37 @@ if ($find) { if (exists $get{copy}) { $row = {%{$row}{ qw(prio lang cat) }}; } -elsif ($ENV{REQUEST_METHOD} eq 'POST') {{ +elsif (defined $post{form}) {{ + sub parseinput { + return if not length $_[0]; + require Encode; + return Encode::decode_utf8($_[0]); + } + my $replace = $row; - $row = {%post{ pairkeys @wordcols }}; - $_ = length ? $_ : undef for values %{$row}; + $row = {map { $_ => + ref $wordcol{$_} eq 'HASH' && $wordcol{$_}->{-multiple} ? + [ map { parseinput($_) } $post{'@'.$_}->@* ] : + scalar parseinput($post{$_}) + } keys %wordcol}; + + if (!$row->{form}) { + if ($row->{ref} ne 'delete') { + Alert("Empty title", + "Confirm removal by setting Reference to delete." + ); + } + else { + $db->delete(word => $find); + Alert("Entry removed"); + } + next; + } eval { my %res = (returning => '*'); + $row->{creator} = $user->{id} unless $find; + $row->{updated} = ['now()']; my $query = $find ? $db->update(word => $row, $find, \%res) : $db->insert(word => $row, \%res); $row = $query->hash; @@ -141,61 +169,53 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{ next; }; - my $imgpath = "data/word/org/$row->{id}.jpg"; + eval { + while (my ($lang, $val) = each %post) { + my $field = $lang; + $lang =~ s/^trans-// or next; + $val = parseinput($val) or next; + my %subrow = ( + ref => $row->{id}, + lang => $lang, + form => $val, + prio => undef, + ); + $subrow{wptitle} = $1 if $subrow{form} =~ s/\h*\[(.*)\]$//; # [Link] shorthand + $subrow{alt} = [split m{/}, $1] if $subrow{form} =~ s{/(\S.*)}{}; # /alternates shorthand + $db->insert(word => \%subrow); + delete $fields{$field}; + } + return 1; + } or Alert('Error creating translation entries', $@); + + require Shiar_Sheet::ImagePrep; + my $image = Shiar_Sheet::ImagePrep->new($wordcol{source}->{-src}->($row)); my $reimage = eval { ($row->{source} // '') ne ($replace->{source} // '') or return; - # copy changed remote url to local file - unlink $imgpath if -e $imgpath; - my $download = $row->{source} or return 1; - require LWP::UserAgent; - my $ua = LWP::UserAgent->new; - $ua->agent('/'); - my $status = $ua->mirror($download, $imgpath); - $status->is_success - or die "Download from $download failed: ".$status->status_line."\n"; + $image->download($row->{source}); }; !$@ or Alert(["Source image not found", $@]); $reimage ||= $row->{thumb} ~~ $replace->{thumb}; # different convert $reimage ||= $row->{cover} ~~ $replace->{cover}; # resize $reimage++ if $fields{rethumb}; # force refresh - - my $thumbpath = "data/word/eng/$row->{form}.jpg"; if ($reimage) { - if (-e $imgpath) { - my $xyres = $row->{cover} ? '600x400' : '300x200'; - my @cmds = @{ $row->{thumb} // [] }; - @cmds = ( - 'convert', - -delete => '1--1', -background => 'white', - -gravity => @cmds ? 'northwest' : 'center', - @cmds, - -resize => "$xyres^", -extent => $xyres, - '-strip', -quality => '60%', -interlace => 'plane', - $imgpath => $thumbpath - ); - eval { - require IPC::Run; - my $output; - IPC::Run::run(\@cmds, '<' => \undef, '>&' => \$output) - or die $output || - ($? & 127 ? "signal $?" : "error code ".($? >> 8))."\n"; - } or Alert([ - "Thumbnail image not generated", - "Failed to convert source image.", - ], "@cmds\n$@"); - } - else { - unlink $thumbpath; - } + eval { + $image->convert($wordcol{thumb}->{-src}->($row), $row->{thumb}); + } or do { + my ($warn, @details) = ref $@ ? @{$@} : $@; + Alert([ "Thumbnail image not generated", $warn ], @details); + }; } }} else { - $row->{prio} //= 1; + $row->{lang} //= $user->{editlang}->[0]; $row->{$_} = $get{$_} for keys %get; + $row->{prio} = defined $row->{ref} ? undef : 1 unless exists $row->{prio}; } my $title = $row->{id} ? "entry #$row->{id}" : 'new entry'; +bless $row, 'Shiar_Sheet::FormRow'; :>

Words <:= $title :>

@@ -205,39 +225,48 @@ my $title = $row->{id} ? "entry #$row->{id}" : 'new entry'; @@ -255,12 +284,12 @@ if ($row->{id}) { <: say '