This commit is contained in:
2025-03-17 16:17:32 +00:00
parent 78c0f76f3e
commit 97486a90b1
3 changed files with 48 additions and 17 deletions

View File

@@ -71,11 +71,13 @@ while (mysqli_stmt_fetch($stmt)) {
$printer["print_status"]="Drucken";
$printer["view"]=1;
}
$printer["progress"]=($json["job"]["progress"]["printTime"]/($json["job"]["progress"]["printTime"]+$json["job"]["progress"]["printTimeLeft"]));
}else if($cancel==1){
exec("curl --max-time 10 $url/api/job?apikey=$apikey > /var/www/html/user_files/" . $_SESSION["username"] . "/json.json");
$fg = file_get_contents("/var/www/html/user_files/" . $_SESSION["username"] . "/json.json");
$json = json_decode($fg, true);
$printer["progress"] = (int) $json['progress']['completion'];
//$printer["progress"] = (int) $json['progress']['completion'];
$printer["progress"]=($json["job"]["progress"]["printTime"]/($json["job"]["progress"]["printTime"]+$json["job"]["progress"]["printTimeLeft"]));
$printer["file"] = short_path($json["job"]["file"]["name"], 10, 10);
$printer["print_time_total"] = seconds_to_time(intval($json["job"]["estimatedPrintTime"]));
$printer["print_time_left"] = seconds_to_time(intval($json["progress"]["printTimeLeft"]));
@@ -92,7 +94,8 @@ while (mysqli_stmt_fetch($stmt)) {
$json = json_decode($fg, true);
if($json['state']=="Starting print from SD" or $json['state']=="Printing" or $json['state']=="Printing from SD" or $system_status==99){
$printer["print_status"]="Von anderer Quelle aus gestartet.";
$printer["progress"] = (int) $json['progress']['completion'];
//$printer["progress"] = (int) $json['progress']['completion'];
$printer["progress"]=($json["job"]["progress"]["printTime"]/($json["job"]["progress"]["printTime"]+$json["job"]["progress"]["printTimeLeft"]));
$printer["file"] = short_path($json["job"]["file"]["name"], 10, 10);
$printer["full_file"]=$json["job"]["file"]["name"];
$printer["print_time_total"] = seconds_to_time(intval($json["job"]["estimatedPrintTime"]));

View File

@@ -0,0 +1,30 @@
<?php
session_start();
$file_path=$_SESSION["current_file"];
include "../../config/config.php";
if(!isset($_SESSION["loggedin"]) || $_SESSION["loggedin"] !== true or $_SESSION["role"][0]!=="1"){
die("no_auth");
exit;
}
$username=$_SESSION["username"];
echo(get_base64_preview("/var/www/html/user_files/$username/".$_GET["file"]));
function get_base64_preview($filename){
$base64="";
$file=fopen($filename,"r");
$start=-1;
while(!feof($file)&&$start!=0){
$buf=fgets($file);
if(stripos($buf,"thumbnail end")!==false)
$start=0;
if($start==1)
$base64.=$buf;
if(stripos($buf,"thumbnail begin")!==false)
$start=1;
}
fclose($file);
$base64=str_replace(";","",$base64);
$base64=str_replace(" ","",$base64);
return $base64;
}
?>