X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/52b02ea8e347f2849b05828c9e77113c17a3db6e..3207fe934ef25ea7980d123c83c2711cf8964646:/writer.plp

diff --git a/writer.plp b/writer.plp
index d72ef02..cd2e2bf 100644
--- a/writer.plp
+++ b/writer.plp
@@ -5,128 +5,77 @@ Html({
 	version => '1.0',
 	nocache => 1,
 	raw => <<'EOT',
-<style>
-dl {
-	display: inline-grid;
-	grid: auto-flow / min-content repeat(10, auto);
-}
-
-form > ul {
-	display: table;
-	border-spacing: 0 2px;
-}
-form > ul > li {
-	display: table-row;
-}
-form > ul > li > * {
-	display: table-cell;
-	padding-right: .5em;
-}
-form > ul > li > label {
-	/* th */
-	text-align: right;
-}
-form > ul > li > label + * {
-	/* td */
-	width: 40em;
-}
-
-.multiinput,
-input,select {
-	box-sizing: border-box;
-	flex-grow: 1;
-}
-input:not([type=submit]) {
-	padding: .4rem;
-	font-family: monospace;
-}
-input[type=number] {
-	max-width: 7em;
-}
-select {
-	padding: .3rem .2rem; /* TODO: input */
-}
-#thumbpreview {
-	width: 300px;
-	align-self: start;
-	flex-shrink: 0;
-}
-
-ul.popup {
-	display: flex;
-	flex-wrap: wrap;
-	align-items: end;
-	position: fixed;
-	left: 0;
-	top: 0;
-	margin: auto;
-	max-height: 90%;
-	max-width: 90%;
-	overflow: auto;
-	background: rgba(0, 0, 0, .8);
-	border: 1px solid #CCC;
-}
-
-h1 {
-	margin-bottom: 1ex;
-}
-.inline {
-	display: inline-flex;
-	align-items: baseline;
-	margin: 0 -1ex; /* inner gap */
-}
-.inline > * {
-	margin: 0 1ex;
-}
-.inline .inline {
-	display: flex;
-	margin: 0;
-}
-.inline.multiinput {
-	flex-wrap: wrap;
-}
-.multiinput > input {
-	width: 10em;
-}
-
-#nav > ul,
-#nav > ul strong,
-#nav form {
-	margin: 1ex 0;
-	display: inline-block;
-}
-</style>
-
+<link rel="stylesheet" type="text/css" media="all" href="/editor.css" />
 <script src="/writer.js"></script>
 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, $@);
-$db->abstract->{array_datatypes}++;
 
 my $user = eval {
+	my $rootpath = ($ENV{REQUEST_URI} // '/writer') =~ s{(?<!^)/.+}{}r;
+	if (defined $post{username}) {
+		$cookie{login} = EncodeURI(join ':', @post{qw( username pass )});
+	}
+	elsif (exists $fields{logout}) {
+		require CGI::Cookie;
+		if (AddCookie(CGI::Cookie->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);
-	$db->select(login => '*', \%rowmatch)->hash;
-} or Abort('Login required', 403);
+	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 '<h1>Login to edit words</h1>';
+	Alert('Access denied', $@) if $@;
+	say '<form action="?" method="post" class="inline"><ul>';
+	my $loginform = bless {%post}, 'Shiar_Sheet::FormRow';
+	say '<li>', $loginform->input(@{$_}), '</li>' for pairs (
+		username => {-label => 'User name'},
+		pass     => {-label => 'Password', type => 'password'},
+	);
+	say '<li><input type="submit" value="Login" /></li>';
+	say '</ul></form>';
+	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 => ['<span style="color:green">★</span>', '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 @wordcols = pairkeys
 my %wordcol = (
@@ -136,9 +85,14 @@ my %wordcol = (
 	cat     => [{-label => 'Category'}, 'ref'],
 	ref     => {-label => 'Reference'},
 	prio    => [
-		{-label => 'Level', -select => [qw(
-			essential basic common distinctive rare invisible
-		)]},
+		{-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'},
@@ -146,11 +100,28 @@ my %wordcol = (
 	form    => {-label => 'Title'},
 	alt     => {-label => 'Synonyms', -multiple => 1},
 	wptitle => {-label => 'Wikipedia'},
-	source  => {-label => 'Image'},
-	thumb   => {-label => 'Convert options', -multiple => 1},
+	source  => {-label => 'Image', -json => 'image', -src => sub {
+		return "data/word/org/$_[0]->{id}.jpg";
+	}},
+	convert => {-label => 'Convert options', -json => 'image', -multiple => 1, -src => sub {
+		return "data/word/en/$_[0]->{id}.jpg";
+	}},
+	story   => {-label => 'Story', type => 'textarea', hidden => 'hidden'},
 );
-my ($find) = map {{id => $_}} $fields{id} || $Request || ();
 
+if (my $search = $fields{q}) {
+	my %filter = (form => {ilike => '%'.$search.'%'});
+	my $results = $db->select(word => '*', \%filter);
+	say '<h1>Search</h1><ul>';
+	printf("<li><small>%s</small> %s %s</li>\n",
+		$_->{id}, showlink($_->{form}, "/writer/$_->{id}"),
+		sprintf('<img src="/%s" style="height:3ex; width:auto" />', $wordcol{convert}->{-src}->($_)) x defined $_->{image}
+	) for $results->hashes;
+	say "</ul>\n";
+	exit;
+}
+
+my ($find) = map {{id => $_}} $fields{id} || $Request || ();
 my $row;
 if ($find) {
 	$row = $db->select(word => '*', $find)->hash
@@ -160,19 +131,29 @@ 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 = {map { $_ =>
-		ref $wordcol{$_} eq 'HASH' && $wordcol{$_}->{-multiple} ?
-			[ map { parseinput($_) } $post{'@'.$_}->@* ] :
-		scalar parseinput($post{$_})
-	} keys %wordcol};
+	my $replace = $row;  # currently stored
+	$row = {};  # proposed update
+	while (my ($col, $colinfo) = each %wordcol) {
+		ref $colinfo eq 'HASH' or $colinfo = {};
+		my @val = map { parseinput($_) } $post{'@'.$col}->@*;
+		my $val = $colinfo->{-multiple} && @val ? \@val : $val[-1];
+		if (my $jsoncol = $colinfo->{-json}) {
+			defined $val and
+			$row->{$jsoncol}->{$col} = $val;  # hash will be encoded
+		}
+		else {
+			$row->{$col} = $val;
+		}
+	}
+	my $imagecol = $row->{image};  # backup image subcolumns
+	ref $_ eq 'HASH' and $_ = encode_json($_) for values %{$row};
 
 	if (!$row->{form}) {
 		if ($row->{ref} ne 'delete') {
@@ -203,146 +184,56 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 		while (my ($lang, $val) = each %post) {
 			my $field = $lang;
 			$lang =~ s/^trans-// or next;
-			$db->insert(word => {
+			$val = parseinput($val) or next;
+			my %subrow = (
 				ref   => $row->{id},
 				lang  => $lang,
-				form  => $_,
-			}) for parseinput($val);
+				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', $@);
 
-	my $imgpath = Shiar_Sheet::FormRow::imagepath($row, 'source');
+	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 <q>$download</q> failed: ".$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} // [] };
-			if (my ($cmdarg) = grep { $cmds[$_] eq '-area' } 0 .. $#cmds) {
-				# replace option by permillage crop
-				my @dim = map { $_ / 1000 } split /\D/, $cmds[$cmdarg + 1];
-				splice @cmds, $cmdarg, 2, (
-					-set => 'option:distort:viewport' => sprintf(
-						'%%[fx:w*%s]x%%[fx:h*%s]+%%[fx:w*%s]+%%[fx:h*%s]',
-						($dim[2] || 1) - $dim[0], # width  = x2 - x1
-						($dim[3] || 1) - $dim[1], # height = y2 - y1
-						@dim[0, 1]                # offset = x1,y1
-					),
-					-distort => SRT => 0, # noop transform to apply viewport
-				);
-			}
-			@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 <small>#$row->{id}</small>" : 'new entry';
-
-package Shiar_Sheet::FormRow {
-	use PLP::Functions 'EscapeHTML';
-
-	sub input {
-		my ($row, $col, $attr) = @_;
-		my $val = $row->{$col} // '';
-		my $html = '';
-		$html .= qq( $_="$attr->{$_}") for sort grep {!/^-/} keys %{$attr // {}};
-
-		if (my $options = $attr->{-select}) {
-			$options = { map {$_ => $options->[$_]} 0 .. $#{$options} }
-				if ref $options eq 'ARRAY';
-			$options->{$val} //= "unknown ($val)";  # preserve current
-			return (
-				sprintf('<select id="%s" name="%1$s">', $col),
-				(map { sprintf('<option value="%s"%s>%s</option>',
-					$_, $val eq $_ && ' selected', $options->{$_}
-				) } sort keys %{$options}),
-				'</select>',
-			);
-		}
-		elsif ($attr->{type} eq 'checkbox') {
-			$html .= ' checked' if $val;
-			return sprintf(
-				join('',
-					'<label>',
-					'<input name="%1$s" value="0" type="hidden" />',
-					'<input id="%s" name="%1$s" value="1"%s>',
-					' %s</label>',
-				), $col, $html, $attr->{-label}
-			);
-		}
-		else {
-			my $multiple = ref $val eq 'ARRAY' || $attr->{-multiple};
-			return (
-				(map {
-					sprintf('<label for="%s">%s</label>', $col, $_)
-				} $attr->{-label} // ()),
-				$multiple ? '<span class="inline multiinput">' : (),
-				(map {
-					sprintf('<input name="%s" value="%s" />', $col, EscapeHTML($_))
-				} ref $val eq 'ARRAY' ? @{$val} : ()),
-				sprintf('<input id="%s" name="%1$s" value="%s"%s />',
-					$col, $multiple ? '' : EscapeHTML($val), $html
-				),
-				$multiple ? '</span>' : (),
-				(map {
-					sprintf '<img id="%spreview" src="/%s" alt="%s"%s />',
-						$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/en/$row->{form}.jpg"  if $col eq 'thumb';
-		return;
-	}
-}
+my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : 'new entry';
 bless $row, 'Shiar_Sheet::FormRow';
 :>
 <h1>Words <:= $title :></h1>
@@ -356,23 +247,33 @@ bless $row, 'Shiar_Sheet::FormRow';
 for my $col (@wordcols) {
 	my $info = $wordcol{$col} or next;
 	my ($attr, @span) = ref $info eq 'ARRAY' ? @{$info} : $info;
+	next if delete $attr->{hidden} and not $row->{$col};
 	my $title = ref $attr ? delete $attr->{-label} : $attr;
 	printf '<li><label for="%s">%s</label><p>', $col, $title;
 		printf '<span class=inline>';
 		print $row->input($col => $attr);
+		if (my $imgsrc = $attr->{-src}) {
+			printf('<img id="%spreview" src="/%s" alt="%s"%s />',
+				$col, $_, $row->{form}, $col eq 'source' && ' hidden'
+			) for grep { -e } $imgsrc->($row);
+		}
 		print $row->input($_ => delete $wordcol{$_}) for @span;
 		print '</span>';
 	say '</p></li>';
 }
 
-if ($row->{id} and not $row->{ref}) {
+if (not $row->{ref}) {
 	printf '<li><label for="%s">%s</label><div><ul class="inline" id="%1$s">',
 		'trans', 'Translations';
-	my @children = $db->select(word => '*', {ref => $row->{id}}, 'lang, id')->hashes;
+	my @children = !$row->{id} ? () :
+		$db->select(word => '*', {ref => $row->{id}}, 'lang, id')->hashes;
 	while (my ($lang, $val) = each %fields) {
 		$lang =~ s/^trans-// or next;
 		push @children, { lang => $lang, form => $val };
 	}
+	my %existing = map { $_->{lang} => 1 } $row, @children;
+	$existing{$_} or push @children, { lang => $_ } for @{$user->{editlang}};
+
 	for my $ref (@children) {
 		printf(
 			'<li><label for="%s" title="%3$s">%s </label>',
@@ -381,7 +282,7 @@ if ($row->{id} and not $row->{ref}) {
 		printf(
 			$ref->{id} ? '<a id="%s" href="%s">%s</a></li>' :
 			'<input id="%s" name="%1$s" value="%3$s" />',
-			"trans-$ref->{lang}", "/writer/$ref->{id}", Entity($ref->{form}),
+			"trans-$ref->{lang}", "/writer/$ref->{id}", Entity($ref->{form} // ''),
 		);
 	}
 	say '</ul></div></li>';
@@ -406,7 +307,7 @@ my $parents = $db->select(word => '*', [{id => $row->{cat}}, {id => $row->{ref}}
 while (my $ref = $parents->hash) {
 	printf '<li><a href="/writer/%d">%s</a></li>', $ref->{id}, Entity($ref->{form});
 }
-say "<li><strong>$row->{form}</strong></li>";
+say "<li><strong>$_</strong></li>" for Entity($row->{form});
 my $children = $db->select(word => '*', {cat => $row->{id}, ref => undef}, 'grade, id');
 while (my $ref = $children->hash) {
 	printf '<li><a href="/writer/%d">%s</a></li>', $ref->{id}, Entity($ref->{form});