Changeset 1813807

Timestamp:

02/01/2018 11:50:55 PM (7 years ago)

Author:

ihorsl

Message:

version 0.95

Location:

opti-mozjpeg-guetzli-webp/trunk

Files:

• class_wpmjgu_batch_optimization_dialog.php (modified) (3 diffs)
• class_wpmjgu_batch_optimization_worker.php (modified) (3 diffs)
• class_wpmjgu_batch_revert_dialog.php (modified) (3 diffs)
• class_wpmjgu_image.php (modified) (4 diffs)
• opti-mozjpeg-guetzli-webp.php (modified) (3 diffs)
• readme.txt (modified) (3 diffs)
• style.css (modified) (1 diff)

opti-mozjpeg-guetzli-webp/trunk/class_wpmjgu_batch_optimization_dialog.php

@@ -188 +188 @@
     if ($ALL_WPMJGU_SETTINGS['wpmjgu_mode'] === "guetzli")
     {
-        print "<p>Notice: Google Guetzli is terribly slow. Be patient and wait until first output appears on the console.</p>\n";
+        print "<p id='lable_guetzli_slow'>Notice: Google Guetzli is terribly slow. Be patient and wait until first output appears on the console.</p>\n";
     }
-    else
-    {
-        print "<br>\n";
-    }    
 ?>
+
+<script src="<?php print plugins_url('/other_includes/FileSaver.js', __FILE__ ); ?>"></script>
+<input type="button" class="button" id="button_save_log" value="Save console log" onclick="js_save_log();">
+
 <div id="console"></div>
 <script>
@@ -376 +376 @@
     document.getElementById("batch_optimization_status").innerHTML = "Complete";
     window.onbeforeunload = null;
+    
+    js_console("<br>\n<br>\n<br>\n---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n<br>\n<br>\n");
+    js_console("Batch optimization finished at " + new Date().toLocaleString());
+    js_console("<br>\n<br>\n<br>\n");
         
 <?php
@@ -430 +434 @@
 }
 
+function js_save_log()
+{
+    var js_tag_console = document.getElementById("console");
+    var js_console_text = js_tag_console.innerText;
+    js_console_text = js_console_text.replace(/\n/g , '\r\n');
+    var js_blob = new Blob([js_console_text], {type: "text/plain;charset=utf-8"});
+    saveAs(js_blob, "wpmjgu_batch_optimization_log.txt");
+}
+
+js_console('Batch optimization started at ' + new Date().toLocaleString());
 js_batch_continue_optimization();
 

opti-mozjpeg-guetzli-webp/trunk/class_wpmjgu_batch_optimization_worker.php

@@ -116 +116 @@
         
         
-        
+        delete_post_meta(ATTACHMENT_ID, 'wpmjgu_optimized');
         $r = $this->create_compressed_or_optimized_image();
         print $r['out'];
@@ -129 +129 @@
         $wpmjgu_func->url_file->delete_attachment_thumbnails(CURRENT_PATH);
         $wpmjgu_func->url_file->delete_webp_duplicates(CURRENT_PATH);        
+        delete_post_meta(ATTACHMENT_ID, 'wpmjgu_webp_duplicate');
         
         if (CURRENT_PATH !== $new_path)
@@ -567 +568 @@
 
         $wpmjgu_func->url_file->delete_webp_duplicates(CURRENT_PATH);
+        delete_post_meta(ATTACHMENT_ID, 'wpmjgu_webp_duplicate');
         
         $size = getimagesize(ORIGINAL_PATH);        

opti-mozjpeg-guetzli-webp/trunk/class_wpmjgu_batch_revert_dialog.php

@@ -121 +121 @@
 </tbody>    
 </table>
-<br><br><br>
+<br><br>
+
+<script src="<?php print plugins_url('/other_includes/FileSaver.js', __FILE__ ); ?>"></script>
+<input type="button" class="button" id="button_save_log" value="Save console log" onclick="js_save_log();">
+
 <div id="console"></div>
 <script>
@@ -217 +221 @@
     js_tag_button.style.visibility = "hidden";
     document.getElementById("batch_revert_status").innerHTML = "Complete";
+    
+    js_console("<br>\n<br>\n<br>\n---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n<br>\n<br>\n");
+    js_console("Batch revert finished at " + new Date().toLocaleString());
+    js_console("<br>\n<br>\n<br>\n");
 }
 
@@ -228 +236 @@
 }
 
+function js_save_log()
+{
+    var js_tag_console = document.getElementById("console");
+    var js_console_text = js_tag_console.innerText;
+    js_console_text = js_console_text.replace(/\n/g , '\r\n');
+    var js_blob = new Blob([js_console_text], {type: "text/plain;charset=utf-8"});
+    saveAs(js_blob, "wpmjgu_batch_revert_log.txt");
+}
+
+js_console('Batch revert started at ' + new Date().toLocaleString());
 js_batch_continue_revert();
 

opti-mozjpeg-guetzli-webp/trunk/class_wpmjgu_image.php

@@ -237 +237 @@
                 $this->sshc = new \phpseclib\Net\SSH2($ALL_WPMJGU_SETTINGS['wpmjgu_ssh_server'], $ALL_WPMJGU_SETTINGS['wpmjgu_ssh_port']);
 
-                if (! @$this->sshc->login($ALL_WPMJGU_SETTINGS['wpmjgu_ssh_username'], $ALL_WPMJGU_SETTINGS['wpmjgu_ssh_password'] ))
+                $attept = 1;                
+                while (! @$this->sshc->login($ALL_WPMJGU_SETTINGS['wpmjgu_ssh_username'], $ALL_WPMJGU_SETTINGS['wpmjgu_ssh_password'] ))
                 {
-                    $ret['out'] .= "Can`t connect to ssh server or bad login\n";
-                    $ret['error'] = true;
-                    return $ret;
+                    if ($attept > 5) {
+                        $ret['out'] .= "Can`t connect to ssh server or bad login\n";
+                        $ret['error'] = true;
+                        return $ret;
+                    } else {
+                        sleep(30);
+                        $attept++;
+                    }                    
                 }         
             }
@@ -248 +254 @@
             {    
                 $this->sftp = new \phpseclib\Net\SFTP($ALL_WPMJGU_SETTINGS['wpmjgu_ssh_server'], $ALL_WPMJGU_SETTINGS['wpmjgu_ssh_port']);
-                if (! @$this->sftp->login($ALL_WPMJGU_SETTINGS['wpmjgu_ssh_username'],  $ALL_WPMJGU_SETTINGS['wpmjgu_ssh_password']))
+                
+                $attept = 1;
+                while (! @$this->sftp->login($ALL_WPMJGU_SETTINGS['wpmjgu_ssh_username'],  $ALL_WPMJGU_SETTINGS['wpmjgu_ssh_password']))
                 {
-                    $ret['out'] .= "Can`t connect to sftp server\n";
-                    $ret['error'] = true;
-                    return $ret;            
+                    if ($attept > 5) {
+                        $ret['out'] .= "Can`t connect to sftp server\n";
+                        $ret['error'] = true;
+                        return $ret;
+                    } else {
+                        sleep(30);
+                        $attept++;
+                    }
                 }          
             }
@@ -346 +359 @@
             }
 
+            if ($this->sshc->isTimeout())
+            {
+                $ret['out'] .= "Ssh server error: Encoder timeout\n";
+                $ret['error'] = true;
+                return $ret;                 
+            }               
+            
             if (! $this->sftp->delete($source_file_ssh_path))
             {
@@ -351 +371 @@
                 $ret['error'] = true;
                 return $ret;            
-            }    
+            }  
 
             if (! $this->sftp->file_exists($dest_file_ssh_path))
             {
-                $ret['out'] .= "Ssh server error: Output file $dest_file_ssh_path not created\n";
-                $ret['error'] = true;
-                return $ret;            
-            }            
-
+                sleep(15);
+                if (! $this->sftp->file_exists($dest_file_ssh_path))
+                {
+                    $ret['out'] .= "Ssh server error: Output file $dest_file_ssh_path not created\n";
+                    $ret['error'] = true;
+                    return $ret;            
+                }            
+            }
+            
             if (! $this->sftp->get($dest_file_ssh_path, $dest_file_path))
             {

opti-mozjpeg-guetzli-webp/trunk/opti-mozjpeg-guetzli-webp.php

@@ -4 +4 @@
 Plugin Name: Opti MozJpeg Guetzli WebP
 Plugin URI: http://ihorsl.com/en/wordpress-opti-mozjpeg-guetzli-webp/home/
-Version: 0.91
+Version: 0.95
 Author: Ihor Slyva
 Author uri: http://ihorsl.com
@@ -53 +53 @@
 <div class="wrap">
 <div id="icon-options-general" class="icon32"></div>
-<h1 id="wpmjgu-title">Opti MozJpeg Guetzli WebP (v0.91)</h1>
+<h1 id="wpmjgu-title">Opti MozJpeg Guetzli WebP (v0.95)</h1>
 
 
@@ -192 +192 @@
     if (! current_user_can('edit_files') ) { die("You don't have enough privileges to pefrom this task\n\n"); }
     
-    set_time_limit(3600);
+    set_time_limit(7200);
     $wpmjgu_batch_optimization_worker = new \wpmjgu\class_wpmjgu_batch_optimization_worker();
     $wpmjgu_batch_optimization_worker->the_html();

opti-mozjpeg-guetzli-webp/trunk/readme.txt

@@ -4 +4 @@
 Donate link: http://ihorsl.com/en/wordpress-opti-mozjpeg-guetzli-webp/home/#donate-wpmjgu
 Requires at least: 4.7
-Tested up to: 4.9.1
+Tested up to: 4.9.2
 Requires PHP: 5.4
-Stable tag: 0.91
+Stable tag: 0.95
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -17 +17 @@
 This plugin uses flowing image encoders: Mozilla MozJpeg, Google Guetzli and Google WebP. But don't worry. There is no necessity to install them into your hosting. The plugin has built-in ssh client. It can access encoders remotely via ssh tunnel.
 
-Plugin's author created a virtual machine for Oracle VirtualBox. It contains Linux, ssh server and Mozilla MozJpeg, Google Guetzli and Google WebP. Simply run this virtual machine on your computer, establish ssh connection between the plugin and the virtual machine and optimize your images for free without any limitations.
+Plugin's author created a virtual machine for Oracle VirtualBox. It contains Linux, ssh server and Mozilla MozJpeg, Google Guetzli and Google WebP. Simply run this virtual machine in your computer, establish ssh connection between the plugin and the virtual machine and optimize your images for free without any limitations.
 
 Of course the plugin can use locally installed encoders too.
@@ -38 +38 @@
 == Changelog ==
 
+= 0.95 =
+* Added "Save console log" button
+
+= 0.6 =
+* Added "Intensive resources consumption mode" in Batch optimization
+
 = 0.5 =
 * First plugin release
- 
-= 0.6 =
-* Added "Intensive resources consumption mode" in Batch optimization
+

opti-mozjpeg-guetzli-webp/trunk/style.css

@@ -187 +187 @@
     font-style: italic;
 }
+
+#button_save_log {
+    float: right;
+    margin-bottom: 10px;
+    margin-right: 30px;
+}
+
+#lable_guetzli_slow {
+    float: left;
+}