X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/67e1fe9fae2e13f3d2d19b8f104f81956afe26e4..3a619ed93038baf5568d87d3d4a24056e813e8af:/writer.plp?ds=sidebyside

diff --git a/writer.plp b/writer.plp
index 5b81a20..bae010c 100644
--- a/writer.plp
+++ b/writer.plp
@@ -40,9 +40,6 @@ input:not([type]) {
 select {
 	padding: .3rem .2rem; /* TODO: input */
 }
-form > ul li img {
-	max-width: 300px;
-}
 
 ul.popup {
 	display: flex;
@@ -85,42 +82,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
 });
 
@@ -140,14 +102,14 @@ my $db = eval {
 my @wordcols = (
 	lang    => 'Language',
 	cat     => 'Category',
+	ref     => undef, # included with cat
+	prio    => 'Level',
+	cover   => undef, # included with prio
 	form    => 'Translation',
 	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 || ();
@@ -177,27 +139,26 @@ 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} // [] };
@@ -210,11 +171,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;
@@ -262,12 +228,16 @@ for my $colinfo (pairs @wordcols) {
 	}
 	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" :
-			();
+		-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>';
 }
 :>