X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/26b42ef92dccbff26573149d6886958862455d81..3207fe934ef25ea7980d123c83c2711cf8964646:/writer.plp diff --git a/writer.plp b/writer.plp index 15a9515..cd2e2bf 100644 --- a/writer.plp +++ b/writer.plp @@ -5,127 +5,123 @@ Html({ version => '1.0', nocache => 1, raw => <<'EOT', - - + EOT }); use List::Util qw( pairs pairkeys ); +use Shiar_Sheet::FormRow; +use JSON; 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', - ref => undef, # included with cat - grade => undef, # " - prio => 'Level', - cover => undef, # included with prio - form => 'Title', - alt => 'Synonyms', - wptitle => 'Wikipedia', - source => 'Image', - thumb => 'Convert options', +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 '
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; @@ -150,109 +180,60 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{ next; }; - my $imgpath = Shiar_Sheet::FormRow::imagepath($row, 'source'); + 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
$downloadfailed: ".$status->status_line."\n"; + ($imagecol->{source} // '') ne ($replace->{source} // '') or return; + $image->download($imagecol->{source}); }; !$@ or Alert(["Source image not found", $@]); - $reimage ||= $row->{thumb} ~~ $replace->{thumb}; # different convert + $reimage ||= $row->{image} ~~ $replace->{image}; # different source $reimage ||= $row->{cover} ~~ $replace->{cover}; # resize $reimage++ if $fields{rethumb}; # force refresh - - my $thumbpath = Shiar_Sheet::FormRow::imagepath($row => 'thumb'); 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{convert}->{-src}->($row), $imagecol->{convert}); + } 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'; - -package Shiar_Sheet::FormRow { - sub input { - my ($row, $col, $type, $label) = @_; - my $val = $row->{$col} // ''; - $val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY'; - if (ref $type eq 'ARRAY') { - return ( - sprintf('', - ); - } - elsif ($type eq 'checkbox') { - return sprintf( - join('', - '', - ), $col, $type, !!$val && ' checked', $label - ); - } - else { - my $html = ''; - $html .= qq( $_="$type->{$_}") for sort keys %{$type // {}}; - return ( - $label ? sprintf('', $col, $label) : (), - sprintf('', - $col, PLP::Functions::EscapeHTML($val), $html - ), - (map { - sprintf '', - $col, $_, $row->{form}, $col eq 'source' ? ' hidden' : ''; - } grep { -e } $row->imagepath($col)), - ); - } +eval { + my $imagerow = $row->{image} && decode_json(delete $row->{image}) || {}; + while (my ($col, $val) = each %{$imagerow}) { + $row->{$col} = $val; } + 1; +} or Alert("Error decoding image metadata", $@); - sub imagepath { - my ($row, $col) = @_; - return "data/word/org/$row->{id}.jpg" if $col eq 'source'; - return "data/word/eng/$row->{form}.jpg" if $col eq 'thumb'; - return; - } -} +my $title = $row->{id} ? "entry #$row->{id}" : 'new entry'; bless $row, 'Shiar_Sheet::FormRow'; :>
', $col, $title; printf ''; - if ($col eq 'prio') { - print $row->input($col => \@prioenum); - print $row->input(cover => 'checkbox', 'Highlighted'); - print $row->input(grade => {type => 'number'}, 'Order'); - } - else { - print $row->input($col); - print $row->input(ref => {}, 'Reference') if $col eq 'cat'; - } + print $row->input($col => $attr); + if (my $imgsrc = $attr->{-src}) { + printf('', + $col, $_, $row->{form}, $col eq 'source' && ' hidden' + ) for grep { -e } $imgsrc->($row); + } + print $row->input($_ => delete $wordcol{$_}) for @span; print ''; say '