X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/67e1fe9fae2e13f3d2d19b8f104f81956afe26e4..4cd7a16bb62318837752001e0d9a38b38bef3926:/writer.plp

diff --git a/writer.plp b/writer.plp
index 5b81a20..ef377a0 100644
--- a/writer.plp
+++ b/writer.plp
@@ -15,33 +15,39 @@ form > ul {
 	display: table;
 	border-spacing: 0 2px;
 }
-form > ul li {
+form > ul > li {
 	display: table-row;
 }
-form > ul li > * {
+form > ul > li > * {
 	display: table-cell;
 	padding-right: .5em;
 }
-form > ul li > label {
+form > ul > li > label {
 	/* th */
 	text-align: right;
 }
-form > ul li > label + * {
+form > ul > li > label + * {
 	/* td */
 	width: 32em;
 }
 
-input:not([type]) {
+input,select {
 	box-sizing: border-box;
-	width: 100%;
+	flex-grow: 1;
+}
+input:not([type=submit]) {
 	padding: .4rem;
 	font-family: monospace;
 }
+input[type=number] {
+	max-width: 7em;
+}
 select {
 	padding: .3rem .2rem; /* TODO: input */
 }
-form > ul li img {
-	max-width: 300px;
+#thumbpreview {
+	width: 300px;
+	align-self: start;
 }
 
 ul.popup {
@@ -64,7 +70,7 @@ h1 {
 }
 .inline {
 	display: inline-flex;
-	align-items: start;
+	align-items: baseline;
 	margin: 0 -1ex; /* inner gap */
 }
 .inline > * {
@@ -74,9 +80,6 @@ h1 {
 	display: flex;
 }
 
-#nav {
-	-margin-left: 1em; /* flex gap */
-}
 #nav > ul,
 #nav > ul strong,
 #nav form {
@@ -85,42 +88,7 @@ h1 {
 }
 </style>
 
-<script>
-document.addEventListener('DOMContentLoaded', () => {
-	var wpinput = document.getElementById('wptitle');
-	var wpbutton = wpinput.parentNode.appendChild(document.createElement('button'));
-	wpbutton.type = 'button';
-	wpbutton.append('Copy');
-	wpbutton.onclick = () => {
-		let wptitle = wpinput.value || document.getElementById('form').value;
-		let wplang = document.getElementById('lang').value.substr(0, 2); // crude iso-639-3→2
-		let wpapi = `https://${wplang}.wikipedia.org/w/api.php`;
-		let wppage = wpapi+'?action=parse&format=json&origin=*&prop=text&page='+wptitle;
-		fetch(wppage).then(res => res.json()).then(json => {
-			if (json.error) throw `error returned: ${json.error.info}`;
-			wpinput.value = json.parse.title;
-			let imginput = document.getElementById('source');
-			if (imginput.value) return;
-			let wpimages = json.parse.text['*'].match(/<img\s[^>]+>/g);
-			let wpselect = wpinput.parentNode.appendChild(document.createElement('ul'));
-			wpselect.className = 'popup';
-			wpimages.forEach(img => {
-				let selectitem = wpselect.appendChild(document.createElement('li'));
-				selectitem.insertAdjacentHTML('beforeend', img);
-				selectitem.onclick = e => {
-					let imgsrc = e.target.src
-						.replace(/^(?=\/\/)/, 'https:')
-						.replace(/\/thumb(\/.+)\/[^\/]+$/, '$1');
-					imginput.value = imgsrc;
-					wpselect.remove();
-					return false;
-				};
-			});
-		}).catch(error => alert(error));
-		return false;
-	};
-});
-</script>
+<script src="/writer.js"></script>
 EOT
 });
 
@@ -137,19 +105,32 @@ my $db = eval {
 	});
 } or Abort('Database error', 501, $@);
 
-my @wordcols = (
-	lang    => 'Language',
-	cat     => 'Category',
-	form    => 'Translation',
+my %lang = (
+	nld => ["\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}", 'dutch'],
+	eng => ["\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}", 'english'],
+	epo => ['<span style="color:green">★</span>', 'esperanto'],
+);
+my @wordcols = pairkeys
+my %wordcol = (
+	lang    => {-label => 'Language', -select => {
+		map { $_ => "@{$lang{$_}}" } keys %lang
+	}},
+	cat     => [{-label => 'Category'}, 'ref'],
+	ref     => {-label => 'Reference'},
+	prio    => [
+		{-label => 'Level', -select => [qw(
+			essential basic common distinctive rare invisible
+		)]},
+		'cover', 'grade',
+	],
+	cover   => {-label => 'Highlighted', type => 'checkbox'},
+	grade   => {-label => 'Order', type => 'number'},
+	form    => 'Title',
 	alt     => 'Synonyms',
 	wptitle => 'Wikipedia',
-	source  => 'Image URL',
+	source  => 'Image',
 	thumb   => 'Convert options',
-	prio    => 'Level',
-	cover   => undef, # included with prio
-	ref     => 'Reference',
 );
-my @prioenum = qw( essential basic common distinctive rare invisible );
 my ($find) = map {{id => $_}} $fields{id} || $Request || ();
 
 my $row;
@@ -163,7 +144,7 @@ if (exists $get{copy}) {
 }
 elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 	my $replace = $row;
-	$row = {%post{ pairkeys @wordcols }};
+	$row = {%post{keys %wordcol}};
 	$_ = length ? $_ : undef for values %{$row};
 
 	eval {
@@ -176,28 +157,27 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 		next;
 	};
 
-	my $imgpath = "data/word/org/$row->{id}.jpg";
-	if (($row->{source} // '') ne ($replace->{source} // '')) {
+	my $imgpath = Shiar_Sheet::FormRow::imagepath($row, 'source');
+	my $reimage = eval {
+		($row->{source} // '') ne ($replace->{source} // '') or return;
 		# copy changed remote url to local file
 		unlink $imgpath if -e $imgpath;
-		if (my $download = $row->{source}) {
-			require LWP::UserAgent;
-			my $ua = LWP::UserAgent->new;
-			$ua->agent('/');
-			my $status = $ua->mirror($download, $imgpath);
-			$status->is_success or Alert([
-				"Source image not found",
-				"Download from <q>$download</q> failed: ".$status->status_line,
-			]);
-		}
-	}
-	elsif ($row->{thumb} ~~ $replace->{thumb}) {
-		# image and conversion unaltered
-		$imgpath = undef;
-	}
+		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";
+	};
+	!$@ 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 ($imgpath) {
+	my $thumbpath = Shiar_Sheet::FormRow::imagepath($row => 'thumb');
+	if ($reimage) {
 		if (-e $imgpath) {
 			my $xyres = $row->{cover} ? '600x400' : '300x200';
 			my @cmds = @{ $row->{thumb} // [] };
@@ -210,11 +190,16 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 				'-strip', -quality => '60%', -interlace => 'plane',
 				$imgpath => $thumbpath
 			);
-			my $status = system @cmds;
-			$status == 0 or Alert([
+			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, error code ".($status >> 8),
-			], "@cmds");
+				"Failed to convert source image.",
+			], "@cmds\n$@");
 		}
 		else {
 			unlink $thumbpath;
@@ -227,6 +212,62 @@ else {
 }
 
 my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : 'new entry';
+
+package Shiar_Sheet::FormRow {
+	sub input {
+		my ($row, $col, $attr) = @_;
+		my $val = $row->{$col} // '';
+		$val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
+		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 {
+			return (
+				(map {
+					sprintf('<label for="%s">%s</label>', $col, $_)
+				} $attr->{-label} // ()),
+				sprintf('<input id="%s" name="%1$s" value="%s"%s />',
+					$col, PLP::Functions::EscapeHTML($val), $html
+				),
+				(map {
+					sprintf '<img id="%spreview" src="/%s" alt="%s"%s />',
+						$col, $_, $row->{form}, $col eq 'source' ? ' hidden' : '';
+				} grep { -e } $row->imagepath($col)),
+			);
+		}
+	}
+
+	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;
+	}
+}
+bless $row, 'Shiar_Sheet::FormRow';
 :>
 <h1>Words <:= $title :></h1>
 
@@ -236,39 +277,30 @@ my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : 'new entry';
 <input id="id" name="id" value="<:= $row->{id} // '' :>" type="hidden" />
 <ul>
 <:
-
-for my $colinfo (pairs @wordcols) {
-	my ($col, $title) = @{$colinfo};
-	defined $title or next;
-	my $val = $row->{$col} // '';
-	$val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
+for my $col (@wordcols) {
+	my $info = $wordcol{$col} or next;
+	my ($attr, @span) = ref $info eq 'ARRAY' ? @{$info} : $info;
+	my $title = ref $attr ? delete $attr->{-label} : $attr;
 	printf '<li><label for="%s">%s</label><p>', $col, $title;
 		printf '<span class=inline>';
-	if ($col eq 'prio') {
-		printf '<select id="%s" name="%1$s">', $col;
-		printf('<option value="%s"%s>%s</option>',
-			$_, $row->{$col} eq $_ && ' selected', $prioenum[$_]
-		) for 0 .. $#prioenum;
-		print '</select>';
+		print $row->input($col => $attr);
+		print $row->input($_ => delete $wordcol{$_}) for @span;
+		print '</span>';
+	say '</p></li>';
+}
+
+if ($row->{id}) {
+	my $children = $db->select(word => '*', {ref => $row->{id}}, 'lang, id');
+	printf '<li><label>%s</label><div><ul class="inline">', 'Translations';
+	while (my $row = $children->hash) {
 		printf(
-			join('',
-				'<label>',
-				'<input id="%1$s" name="%1$s" value="0" type="hidden" />',
-				'<input id="%s" name="%1$s" value="1" type="checkbox"%s>',
-				' %s</label>',
-			),
-			'cover', !!$row->{cover} && ' checked', 'Highlighted'
+			'<li><label for="%1$s" title="%5$s">%4$s</label>' .
+				' <a id="%s" href="%s">%s</a></li>',
+			"trans-$row->{lang}", "/writer/$row->{id}", Entity($row->{form}),
+			@{$lang{ $row->{lang} }}, # flag, name
 		);
 	}
-	else {
-		printf '<input id="%s" name="%1$s" value="%s" />', $col, Entity($val);
-		-e and printf '<img src="/%s" alt="%s" />', $_, $row->{form} for
-			$col eq 'source' ? "data/word/org/$row->{id}.jpg" :
-			$col eq 'thumb'  ? "data/word/eng/$row->{form}.jpg" :
-			();
-	}
-		print '</span>';
-	say '</p></li>';
+	say '</ul></div></li>';
 }
 :>
 </ul>
@@ -291,7 +323,7 @@ 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>";
-my $children = $db->select(word => '*', {cat => $row->{id}});
+my $children = $db->select(word => '*', {cat => $row->{id}}, 'grade, id');
 while (my $ref = $children->hash) {
 	printf '<li><a href="/writer/%d">%s</a></li>', $ref->{id}, Entity($ref->{form});
 }