X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/87d94e5fa2a28dac9f26632cc25a29fe088cb1e2..3a619ed93038baf5568d87d3d4a24056e813e8af:/writer.plp

diff --git a/writer.plp b/writer.plp
index 288891a..bae010c 100644
--- a/writer.plp
+++ b/writer.plp
@@ -6,27 +6,39 @@ 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:not([type]) {
 	box-sizing: border-box;
-	width: 50%;
-	margin: 0;
-	line-height: 4ex;
-	vertical-align: text-top;
-}
-dd > img {
-	max-width: 300px;
-	display: block;
+	width: 100%;
+	padding: .4rem;
+	font-family: monospace;
 }
-dd input ~ button {
-	margin-left: -5em;
+select {
+	padding: .3rem .2rem; /* TODO: input */
 }
 
 ul.popup {
@@ -44,53 +56,33 @@ 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: start;
+	margin: 0 -1ex; /* inner gap */
 }
-section > ul strong, section form {
-	line-height: 2;
+.inline > * {
+	margin: 0 1ex;
+}
+.inline .inline {
+	display: flex;
+}
+
+#nav {
+	-margin-left: 1em; /* flex gap */
+}
+#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 +100,18 @@ my $db = eval {
 } or Abort('Database error', 501, $@);
 
 my @wordcols = (
+	lang    => 'Language',
+	cat     => 'Category',
+	ref     => undef, # included with cat
+	prio    => 'Level',
+	cover   => undef, # included with prio
 	form    => 'Translation',
+	alt     => 'Synonyms',
 	wptitle => 'Wikipedia',
-	ref     => 'Reference',
-	cat     => 'Category',
-	lang    => 'Language',
-	source  => 'Image URL',
+	source  => 'Image',
 	thumb   => 'Convert options',
 );
+my @prioenum = qw( essential basic common distinctive rare invisible );
 my ($find) = map {{id => $_}} $fields{id} || $Request || ();
 
 my $row;
@@ -125,7 +121,7 @@ if ($find) {
 }
 
 if (exists $get{copy}) {
-	$row = {%{$row}{ qw(lang cat) }};
+	$row = {%{$row}{ qw(prio lang cat) }};
 }
 elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 	my $replace = $row;
@@ -143,43 +139,48 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 	};
 
 	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;
@@ -187,6 +188,7 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 	}
 }}
 else {
+	$row->{prio} //= 1;
 	$row->{$_} = $get{$_} for keys %get;
 }
 
@@ -194,25 +196,52 @@ my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : 'new entry';
 :>
 <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 $col (pairs @wordcols) {
-	my $val = $row->{$col->key} // '';
+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';
-	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>';
+	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>';
+		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'
+		);
+	}
+	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 'thumb'  ? "data/word/eng/$row->{form}.jpg" : ();
+		printf('<label for="%s">%s</label><input id="%1$s" name="%1$s" value="%s" />',
+			'ref', 'Reference', Entity($row->{ref})
+		) 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>';
 }
 :>
-</dl>
+</ul>
 <p>
 	<input type="submit" value="Save" />
 	<input type="submit" value="New" formaction="/writer?copy=cat" />
@@ -220,9 +249,9 @@ for my $col (pairs @wordcols) {
 </form>
 
 <:
-$row->{id} or exit;
+if ($row->{id}) {
 :>
-<section>
+<section id="nav">
 <h2>Hierarchy</h2>
 
 <:
@@ -244,3 +273,7 @@ while (my $ref = $children->hash) {
 </form></li>
 </ul>
 </section>
+<:
+}
+:>
+</div>