X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/24d7164ce1fd20686e5091d6446b3408a1c71c73..cf8d01da2735d21735d562e73009546d64125d4a:/writer.plp

diff --git a/writer.plp b/writer.plp
index 11754e8..99a9736 100644
--- a/writer.plp
+++ b/writer.plp
@@ -6,27 +6,48 @@ Html({
 	nocache => 1,
 	raw => <<'EOT',
 <style>
-dd > input {
+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: 32em;
-	max-width: 100%;
-	padding: 1ex;
-	font-family: monospace;
 }
-dl > dt, dl > dd {
-	float: none;
-	display: inline-block;
+
+input,select {
 	box-sizing: border-box;
-	width: 50%;
-	margin: 0;
-	line-height: 4ex;
-	vertical-align: text-top;
+	flex-grow: 1;
+}
+input:not([type=submit]) {
+	padding: .4rem;
+	font-family: monospace;
+}
+input[type=number] {
+	max-width: 7em;
 }
-dd > img {
-	max-width: 300px;
-	display: block;
+select {
+	padding: .3rem .2rem; /* TODO: input */
 }
-dd input ~ button {
-	margin-left: -5em;
+#thumbpreview {
+	width: 300px;
+	align-self: start;
 }
 
 ul.popup {
@@ -44,53 +65,30 @@ ul.popup {
 	border: 1px solid #CCC;
 }
 
-section {
-	position: absolute;
-	top: 7ex;
-	right: 1em;
+h1 {
+	margin-bottom: 1ex;
 }
-section > ul {
-	margin-top: 1ex;
+.inline {
+	display: inline-flex;
+	align-items: baseline;
+	margin: 0 -1ex; /* inner gap */
 }
-section > ul strong, section form {
-	line-height: 2;
+.inline > * {
+	margin: 0 1ex;
+}
+.inline .inline {
+	display: flex;
+}
+
+#nav > ul,
+#nav > ul strong,
+#nav form {
+	margin: 1ex 0;
+	display: inline-block;
 }
 </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 wppage = 'https://en.wikipedia.org/w/api.php?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
 });
 
@@ -108,14 +106,24 @@ my $db = eval {
 } or Abort('Database error', 501, $@);
 
 my @wordcols = (
-	form    => 'Translation',
-	wptitle => 'Wikipedia',
-	ref     => 'Reference',
-	cat     => 'Category',
 	lang    => 'Language',
-	source  => 'Image URL',
+	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 @prioenum = qw( essential basic common distinctive rare invisible );
+my %langflag = (
+	nld => "\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}",
+	eng => "\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}",
+	epo => '<span style="color:green">★</span>',
+);
 my ($find) = map {{id => $_}} $fields{id} || $Request || ();
 
 my $row;
@@ -125,9 +133,9 @@ if ($find) {
 }
 
 if (exists $get{copy}) {
-	$row = {%{$row}{ qw(lang cat) }};
+	$row = {%{$row}{ qw(prio lang cat) }};
 }
-elsif ($ENV{REQUEST_METHOD} eq 'POST') {
+elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 	my $replace = $row;
 	$row = {%post{ pairkeys @wordcols }};
 	$_ = length ? $_ : undef for values %{$row};
@@ -137,79 +145,148 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {
 		my $query = $find ? $db->update(word => $row, $find, \%res) :
 			$db->insert(word => $row, \%res);
 		$row = $query->hash;
-	} or Alert("Entry could not be saved", $@);
+	} or do {
+		Alert("Entry could not be saved", $@);
+		next;
+	};
 
 	my $imgpath = "data/word/org/$row->{id}.jpg";
-	if (($row->{source} // '') ne ($replace->{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) {
+	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 => '300x200^', -extent => '300x200',
+				-resize => "$xyres^", -extent => $xyres,
 				'-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;
 		}
 	}
-}
+}}
 else {
+	$row->{prio} //= 1;
 	$row->{$_} = $get{$_} for keys %get;
 }
 
 my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : '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('<select id="%s" name="%1$s">', $col),
+				(map { sprintf('<option value="%s"%s>%s</option>',
+					$_, $val eq $_ && ' selected', $type->[$_]
+				) } 0 .. $#{$type}),
+				'</select>',
+			);
+		}
+		elsif ($type eq 'checkbox') {
+			return sprintf(
+				join('',
+					'<label>',
+					'<input id="%1$s" name="%1$s" value="0" type="hidden" />',
+					'<input id="%s" name="%1$s" value="1" type="%s"%s>',
+					' %s</label>',
+				), $col, $type, !!$val && ' checked', $label
+			);
+		}
+		else {
+			my $html = '';
+			$html .= qq( $_="$type->{$_}") for sort keys %{$type // {}};
+			return (
+				$label ? sprintf('<label for="%s">%s</label>', $col, $label) : (),
+				sprintf('<input id="%s" name="%1$s" value="%s"%s />',
+					$col, PLP::Functions::EscapeHTML($val), $html
+				),
+			);
+		}
+	}
+}
+bless $row, 'Shiar_Sheet::FormRow';
 :>
 <h1>Words <:= $title :></h1>
 
+<div class="inline">
+
 <form action="?" method="post">
 <input id="id" name="id" value="<:= $row->{id} // '' :>" type="hidden" />
-<dl>
+<ul>
 <:
+for my $colinfo (pairs @wordcols) {
+	my ($col, $title) = @{$colinfo};
+	defined $title or next;
+	printf '<li><label for="%s">%s</label><p>', $col, $title;
+		printf '<span class=inline>';
+	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);
+		-e and printf '<img id="%spreview" src="/%s" alt="%s" />', $col, $_, $row->{form}
+			for $col eq 'thumb'  ? "data/word/eng/$row->{form}.jpg" : ();
+		print $row->input(ref => {}, 'Reference') if $col eq 'cat';
+	}
+		print '</span>';
+	-e and printf('<img id="%spreview" src="/%s" alt="%s" hidden />',
+		$col, $_, $row->{form}
+	) for $col eq 'source' ? "data/word/org/$row->{id}.jpg" : ();
+	say '</p></li>';
+}
 
-for my $col (pairs @wordcols) {
-	my $val = $row->{$col->key} // '';
-	$val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
-	printf '<dt><label for="%s">%s</label></dt>'
-		. '<dd><input id="%1$s" name="%1$s" value="%s" />',
-		$col->key, $col->value, Entity($val);
-	-e and printf ' <img src="/%s" alt="%s" />', $_, $row->{form} for
-		$col->key eq 'source' ? "data/word/org/$row->{id}.jpg" :
-		$col->key eq 'thumb'  ? "data/word/eng/$row->{form}.jpg" :
-		();
-	say '</dd>';
+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 '<li><label for="%s">%s</label> <a id="%1$s" href="%s">%s</a></li>',
+			"trans-$row->{lang}", $langflag{$row->{lang}},
+			"/writer/$row->{id}", Entity($row->{form});
+	}
+	say '</ul></div></li>';
 }
 :>
-</dl>
+</ul>
 <p>
 	<input type="submit" value="Save" />
 	<input type="submit" value="New" formaction="/writer?copy=cat" />
@@ -217,9 +294,9 @@ for my $col (pairs @wordcols) {
 </form>
 
 <:
-$row->{id} or exit;
+if ($row->{id}) {
 :>
-<section>
+<section id="nav">
 <h2>Hierarchy</h2>
 
 <:
@@ -229,7 +306,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});
 }
@@ -241,3 +318,7 @@ while (my $ref = $children->hash) {
 </form></li>
 </ul>
 </section>
+<:
+}
+:>
+</div>