Updated to support Sys::Virt::Domain generating PNG screenshots

* This should work with older versions still generating PPM screenshots.

Signed-off-by: digimer <mkelly@alteeve.ca>

Anvil/Tools.pm

@@ -1278,6 +1278,7 @@ sub _set_paths
 				ps				=>	"/usr/bin/ps",
 				psql				=>	"/usr/bin/psql",
 				pamtopng			=>	"/usr/bin/pamtopng",
+				pngtopam			=>	"/usr/bin/pngtopam",
 				pnmtojpeg			=>	"/usr/bin/pnmtojpeg",
 				'postgresql-setup'		=>	"/usr/bin/postgresql-setup",
 				postmap				=>	"/usr/sbin/postmap",

share/words.xml

@@ -2681,7 +2681,7 @@ The file: [#!variable!file!#] needs to be updated. The difference is:
 		<key name="log_0804">Connecting: [#!variable!host_name!#] via: [#!variable!target_ip!#]</key>
 		<key name="log_0805">Getting a screenshot from: [#!variable!server_name!#] (uuid: [#!variable!server_uuid!#]) from the host: [#!variable!host_name!#].</key>
 		<key name="log_0806">- Saving the screenshot: [#!variable!ppm_file!#].</key>
-		<key name="log_0807">- Converting: [#!variable!ppm_file!#] to: 
+		<key name="log_0807">- Converting: [#!variable!source_file!#] to: 
 [#!variable!new_file!#]</key>
 		<key name="log_0808">Deleting screenshots older than: [#!variable!maximum_age!#].</key>
 		<key name="log_0809">- Deleting the server: [#!variable!server_name!#]'s screenshot: [#!variable!file!#].</key>
@@ -4187,6 +4187,7 @@ We will try to proceed anyway.</key>
 		<key name="warning_0170">[ Warning ] - The attempt to boot: [#!variable!host_name!#] appears to have failed. The return code received was: [#!variable!return_code!#] (expected '0'). The output, if any, was: [#!variable!output!#].</key>
 		<key name="warning_0171">[ Warning ] - The daemon: [#!variable!daemon!#] appears to have failed! Attempting to restart it now.</key>
 		<key name="warning_0172">[ Warning ] - The line: [#!variable!line!#] that was going to be added to the hosts file is invalid, removing it.</key>
+		<key name="warning_0173">[ Warning ] - Failed to convert: [#!variable!source_file!#] to: [#!variable!new_file!#] (format: [#!variable!format!#]! Return code was: [#!variable!return_code!#], expected '0'.</key>
 		
 	</language>
 	<!-- 日本語 -->

tools/striker-get-screenshots

@@ -381,6 +381,8 @@ sub get_screenshots
 		my $unix_time       = time;
 		my $file_name       = "server-uuid_".$server_uuid."_timestamp-".$unix_time;
 		my $ppm_file        = $anvil->data->{path}{directories}{screenshots}."/".$file_name.".ppm";
+		my $jpg_file        = $anvil->data->{path}{directories}{screenshots}."/".$file_name.".jpg";
+		my $png_file        = $anvil->data->{path}{directories}{screenshots}."/".$file_name.".png";
 		my $mimetype        = $domain->screenshot($stream, 0);
 		my $screenshot      = "";
 		my $screenshot_size = 0;
@@ -393,13 +395,88 @@ sub get_screenshots
 			unix_time       => $unix_time,
 			file_name       => $file_name, 
 			ppm_file        => $ppm_file, 
+			jpg_file        => $jpg_file,
+			png_file        => $png_file, 
 			mimetype        => $mimetype, 
 			screenshot_size => $screenshot_size." (".$anvil->Convert->bytes_to_human_readable({'bytes' => $screenshot_size}).")",
 		}});
 		
 		$stream->recv_all($handle_ss_chunk);
 		
-		# Write out the screenshot.
+		### TODO: Delete this when EL8 support is dropped.
+		### TODO: When generating PNG, convert directly to JPEG
+		# On EL8, the mimetype is 'image/x-portable-pixmap'. On EL9, this is 'image/png'. 
+		if ($mimetype eq "image/png")
+		{
+			# Write this out to png, and convert it to pmm.
+			$anvil->Storage->write_file({
+				debug  => 2,
+				file   => $png_file,
+				body   => $screenshot, 
+				mode   => "0666",
+				binary => 1,
+			});
+			
+			# Change the ownership
+			$anvil->Storage->change_owner({
+				debug => 2, 
+				path  => $png_file,
+				user  => "striker-ui-api",
+				group => "striker-ui-api",
+			});
+			
+			# Convert to PPM
+			my $shell_call = $anvil->data->{path}{exe}{pngtopam}." ".$png_file." > ".$ppm_file;
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
+			
+			my ($output, $return_code) = $anvil->System->call({shell_call => $shell_call});
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+				output      => $output, 
+				return_code => $return_code, 
+			}});
+			
+			if ($return_code)
+			{
+				# Failed 
+				$anvil->Job->update_progress({
+					progress  => $anvil->data->{job}{progress} < 99 ? ++$anvil->data->{job}{progress} : $anvil->data->{job}{progress},
+					message   => "warning_0173", 
+					log_level => 1,
+					variables => { 
+						source_file => $png_file, 
+						new_file    => $ppm_file, 
+						'format'    => "ppm",
+						return_code => $return_code, 
+					},
+				});
+				unlink $ppm_file;
+			}
+			else
+			{
+				$anvil->Job->update_progress({
+					progress  => $anvil->data->{job}{progress} < 99 ? ++$anvil->data->{job}{progress} : $anvil->data->{job}{progress},
+					message   => "log_0807", 
+					log_level => 2,
+					variables => { 
+						source_file => $png_file, 
+						new_file    => $ppm_file, 
+						'format'    => "ppm",
+					},
+				});
+				
+				# Change the ownership
+				$anvil->Storage->change_owner({
+					debug => 2, 
+					path  => $png_file,
+					user  => "striker-ui-api",
+					group => "striker-ui-api",
+				});
+			}
+			
+		}
+		else
+		{
+			# Write out ppm the screenshot.
 			$anvil->Storage->write_file({
 				debug  => 2,
 				file   => $ppm_file,
@@ -407,12 +484,23 @@ sub get_screenshots
 				mode   => "0666",
 				binary => 1,
 			});
+			print "Wrote ppm: [".$ppm_file."]\n";
+			
+			# Change the ownership
+			$anvil->Storage->change_owner({
+				debug => 2, 
+				path  => $ppm_file,
+				user  => "striker-ui-api",
+				group => "striker-ui-api",
+			});
+			
 			$anvil->Job->update_progress({
 				progress  => $anvil->data->{job}{progress} < 99 ? ++$anvil->data->{job}{progress} : $anvil->data->{job}{progress},
 				message   => "log_0806", 
 				log_level => 2,
 				variables => { ppm_file => $ppm_file },
 			});
+		}
 		
 		### TODO: Make these user-configurable later.
 		my $make_jpeg  = 1;
@@ -425,26 +513,41 @@ sub get_screenshots
 		}});
 		
 		# Convert to jpg
-		if ($make_jpeg)
+		if ((-e $ppm_file) && ($make_jpeg))
 		{
-			my $jpg_file   = $anvil->data->{path}{directories}{screenshots}."/".$file_name.".jpg";
 			my $shell_call = $anvil->data->{path}{exe}{pnmtojpeg}." ".$ppm_file." > ".$jpg_file;
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
-				shell_call => $shell_call,
-				jpg_file   => $jpg_file,
-			}});
 			
 			my ($output, $return_code) = $anvil->System->call({shell_call => $shell_call});
 			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
 				output      => $output, 
 				return_code => $return_code, 
 			}});
+			
+			if ($return_code)
+			{
+				# Failed 
+				$anvil->Job->update_progress({
+					progress  => $anvil->data->{job}{progress} < 99 ? ++$anvil->data->{job}{progress} : $anvil->data->{job}{progress},
+					message   => "warning_0173", 
+					log_level => 1,
+					variables => { 
+						source_file => $ppm_file, 
+						new_file    => $jpg_file, 
+						'format'    => "jpeg",
+						return_code => $return_code, 
+					},
+				});
+				unlink $jpg_file;
+			}
+			else
+			{
 				$anvil->Job->update_progress({
 					progress  => $anvil->data->{job}{progress} < 99 ? ++$anvil->data->{job}{progress} : $anvil->data->{job}{progress},
 					message   => "log_0807", 
 					log_level => 2,
 					variables => { 
-					ppm_file => $ppm_file, 
+						source_file => $ppm_file, 
 						new_file    => $jpg_file, 
 						'format'    => "jpeg",
 					},
@@ -458,28 +561,44 @@ sub get_screenshots
 					group => "striker-ui-api",
 				});
 			}
+		}
 		
 		# Convert to png
-		if ($make_png)
+		if ((-e $ppm_file) && ($make_png) && (not -e $png_file))
 		{
-			my $png_file   = $anvil->data->{path}{directories}{screenshots}."/".$file_name.".png";
 			my $shell_call = $anvil->data->{path}{exe}{pamtopng}." ".$ppm_file." > ".$png_file;
-			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
-				shell_call => $shell_call,
-				png_file   => $png_file, 
-			}});
 			
 			my ($output, $return_code) = $anvil->System->call({shell_call => $shell_call});
 			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
 				output      => $output, 
 				return_code => $return_code, 
 			}});
+			
+			if ($return_code)
+			{
+				# Failed 
+				$anvil->Job->update_progress({
+					progress  => $anvil->data->{job}{progress} < 99 ? ++$anvil->data->{job}{progress} : $anvil->data->{job}{progress},
+					message   => "warning_0173", 
+					log_level => 1,
+					variables => { 
+						source_file => $ppm_file, 
+						new_file    => $png_file, 
+						'format'    => "png",
+						return_code => $return_code, 
+					},
+				});
+				unlink $png_file;
+			}
+			else
+			{
 				$anvil->Job->update_progress({
 					progress  => $anvil->data->{job}{progress} < 99 ? ++$anvil->data->{job}{progress} : $anvil->data->{job}{progress},
 					message   => "log_0807", 
 					log_level => 2,
 					variables => { 
-					ppm_file => $ppm_file, 
+						source_file => $ppm_file, 
 						new_file    => $png_file, 
 						'format'    => "png",
 					},
@@ -493,6 +612,12 @@ sub get_screenshots
 					group => "striker-ui-api",
 				});
 			}
+		}
+		elsif ((not $make_png) && (-e $png_file))
+		{
+			# Remove the source png file
+			unlink $png_file;
+		}
 		
 		# Delete the original PPM file?
 		if ($delete_ppm)