Commit #27

Patra3 · May 9, 2016 · 8e22ac6 · 8e22ac6
1 parent b98034b
commit 8e22ac6
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Glifcos
 PocketMine-MP server manager run on webserver.  
 
-** NOTE: There is currently some issues running on Windows machine. Linux/Mac works fine. **  
+** NOTE: Glifcos will now work on all systems! Have fun! **  
 
 ### Introduction  
 Hi, thank you for viewing Glifcos. Glifcos is a PocketMine control panel, hosted easily on your webserver.  
@@ -37,7 +37,7 @@ You need a webserver, a PocketMine server, and the server.log file to be enabled
 ##### What are some bugs or errors?  
 Glifcos varies on performance. There are bugs specific to your host, configuration, and enviornment.  
 Don't think that Glifcos is completely unstable and a 'failed' project. I've put it on an Apache instance  
-and it was stable. If you put it on Windows, there will defintely be some memory related leaks.  
+and it was stable. If you put it on Windows, there will no longer be memory leaks...  
 
 If you use a stable Apache web host, and a Unix PocketMine server... it will work just fine...  
 

diff --git a/glifcos-plugin/plugin.yml b/glifcos-plugin/plugin.yml
@@ -1,6 +1,6 @@
 name: Glifcos-p
 main: glifcos\glifcos
-version: 0.1.1
+version: 0.1.2
 api: [2.0.0, 1.0.0]
 author: HotFireyDeath\Chopstick Software
 

diff --git a/glifcos-plugin/src/glifcos/glifcos.php b/glifcos-plugin/src/glifcos/glifcos.php
@@ -43,7 +43,9 @@
 use glifcos\maintasks\enabledplugin;
 
 class glifcos extends PluginBase implements Listener {
+
     public $direct;
+
     public function onEnable(){
         if (!is_dir($this->getDataFolder())){
             mkdir($this->getDataFolder());
@@ -105,18 +107,22 @@ private function runServerCheck(){
         }
     }
     private function sellServerInfo(){
-        // Don't take this angrily!! I'm just syncing
-        // data with the webserver >~<
         $domain = $this->getConfig()->get("glifcos-domain");
         // this is to get the real external ip..
-
+        if (method_exists($this->getServer(), "getCodename")){
+            if ($this->getServer()->getCodename() === "Ikaros"){
+                $genisys = true;
+            }
+        }
         $dat = array("ip" => json_decode(file_get_contents("http://api.ipify.org/?format=json")
         , true)["ip"], 
         "port" => $this->getServer()->getPort(), 
         "api" => $this->getServer()->getApiVersion(),
         "pm-v" => $this->getServer()->getPocketMineVersion(),
         "motd" => $this->getServer()->getMotd(),
         );
+        $dat["genisys"] = $genisys;
+        $dat["pm-v"] = $this->getServer()->getVersion();
         $compile = base64_encode(json_encode($dat));
         $data = fopen($domain."?type=updatedata&data=".$compile, "r");
         $this->getLogger()->info(TextFormat::BLUE.TextFormat::BOLD.
@@ -227,18 +233,9 @@ public function url_exists($url){
         } else { return false;}
     }
     public function get_memory_load(){
-        // RESOURCE FOUND AT PHP.NET
-        // http://php.net/manual/en/function.sys-getloadavg.php#107243
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            $wmi = new \COM("Winmgmts://");
-            $server = $wmi->execquery("SELECT LoadPercentage FROM Win32_Processor");
-            $cpu_num = 0;
-            $load_total = 0;
-            foreach($server as $cpu){
-                $cpu_num++;
-                $load_total += $cpu->loadpercentage;
-            }
-            $load = round($load_total/$cpu_num);
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'){
+            exec('wmic memorychip get capacity', $totalMemory);
+            $load = array_sum($totalMemory) / 1024 / 1024;
         }
         else{
             $sys_load = sys_getloadavg();

diff --git a/glifcos-plugin/src/glifcos/maintasks/cpubroadcast.php b/glifcos-plugin/src/glifcos/maintasks/cpubroadcast.php
@@ -34,8 +34,22 @@ public function __construct($plugin){
     }
     public function onRun($ticks){
         if ($this->start){
+            if (stristr(PHP_OS, 'win')){
+                $wmi = new \COM("Winmgmts://");
+                $server = $wmi->execquery("SELECT LoadPercentage FROM Win32_Processor");  
+                $cpu_num = 0;
+                $load_total = 0;
+                foreach($server as $cpu){
+                    $cpu_num++;
+                    $load_total += $cpu->loadpercentage;
+                }
+                $load = round($load_total/$cpu_num);
+            }
+            else{
+                $load = sys_getloadavg()[0];
+            }
             $t = fopen($this->plugin->getConfig()->get("glifcos-domain")."?type=cpu&s=".
-            sys_getloadavg()[0], "r");
+            $load, "r");
             unset($t);
             gc_collect_cycles();
         }

diff --git a/glifcos-webserver/library/ceoperands/grabr.php b/glifcos-webserver/library/ceoperands/grabr.php
@@ -53,6 +53,9 @@ public static function getPMBuild($base_dir){
          if ($data["serverdata"]["pm-v"] === "1.0dev"){
              return "ImagicalMine v1.0dev";
          }
+         elseif ($data["serverdata"]["genisys"]){
+             return "Genisys ".$data["serverdata"]["pm-v"];
+         }
          else{
              return "PocketMine v".$data["serverdata"]["pm-v"];
          }

diff --git a/glifcos-webserver/library/main/mainstart.php b/glifcos-webserver/library/main/mainstart.php
@@ -190,8 +190,8 @@
               <i class="fa fa-bug"></i> 
               Report a Bug
             </a>
-            <a style="color: blue; background-color: black;">
-              Glifcos v0.1.0-BETA
+            <a style="color: green; background-color: black;">
+              Glifcos v0.1.2-BETA
             </a>
           </div>
         </div>
@@ -340,12 +340,12 @@ class="w3-closebtn">×</span>
     </header>
     <div class="w3-container">
       <br>
-      Version: 0.1.0-BETA <br>
+      Version: 0.1.2-BETA <br>
       Changelog:
       <ul>
-        <li> Fixed Windows memory bug (plugin side).</li>
-        <li> Completed User Management (server side).</li>
-        <li> Misc. Improvements & Cleanups</li>
+        <li>- Truly fixed CPU statistics/errors on Windows!</li>
+        <li>- General cleanup.</li>
+        <li>- Added support for Genisys.</li>
       </ul>
     </div>
     <br>