✨ Improved byte value parsing

phpmon/Domain/Core/PhpInstall.swift

@@ -38,17 +38,21 @@ class PhpInstall {
         
         // Get configuration values
         self.configuration = Configuration(
-            memory_limit: type(of: self).getIniValue(key: "memory_limit"),
+            memory_limit: type(of: self).getByteCount(key: "memory_limit"),
-            upload_max_filesize: type(of: self).getIniValue(key: "upload_max_filesize"),
+            upload_max_filesize: type(of: self).getByteCount(key: "upload_max_filesize"),
-            post_max_size: type(of: self).getIniValue(key: "post_max_size")
+            post_max_size: type(of: self).getByteCount(key: "post_max_size")
         )
     }
     
+    /**
+     When the app tries to retrieve the version, the installation is considered broken if the output is nothing,
+     _or_ if the output contains the word "Warning" or "Error". In normal situations this should not be the case.
+     */
     private static func getVersion() -> Version {
         var versionStruct = Version()
         let version = Command.execute(path: Paths.php, arguments: ["-r", "print phpversion();"])
         
-        if (version == "" || version.contains("Warning")) {
+        if (version == "" || version.contains("Warning") || version.contains("Error")) {
             versionStruct.short = "💩 BROKEN"
             versionStruct.long = "";
             versionStruct.error = true
@@ -67,8 +71,31 @@ class PhpInstall {
         return versionStruct
     }
     
-    private static func getIniValue(key: String) -> String {
+    /**
-        return Command.execute(path: Paths.php, arguments: ["-r", "echo ini_get('\(key)');"])
+     Retrieves the display value for a specific key in the `.ini` file.
+     
+     The following values are valid:
+     * -1: unlimited (show the infinity icon)
+     * 10000: an integer = amount of bytes
+     * 1K, 1M, 1G = shorthand for kilobytes, megabytes and gigabytes
+     
+     If none of these notations are used, the _fallback_ value is used. We'll show an emoji to indicate something has gone wrong here.
+     To clarify, B gets appended to valid values. As a result, "5M" (valid) becomes "5MB", and "5MB" (invalid) becomes ⚠️.
+     
+     - Parameter key: The key of the `ini` value that needs to be retrieved. For example, you can use `memory_limit`.
+     */
+    private static func getByteCount(key: String) -> String {
+        let value = Command.execute(path: Paths.php, arguments: ["-r", "echo ini_get('\(key)');"])
+        
+        // Check if the value is unlimited
+        if (value == "-1") {
+            return "∞"
+        }
+        
+        // Check if the syntax is valid otherwise
+        let regex = try! NSRegularExpression(pattern: #"^([0-9]*)(K|M|G|)$"#, options: [])
+        let match = regex.matches(in: value, options: [], range: NSMakeRange(0, value.count)).first
+        return (match == nil) ? "⚠️" : "\(value)B"
     }
     
     // MARK: - Structs

phpmon/Domain/Menu/StatsView.xib

@@ -10,17 +10,17 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="c22-O7-iKe" customClass="StatsView" customModule="PHP_Monitor" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="341" height="56"/>
+            <rect key="frame" x="0.0" y="0.0" width="341" height="55"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <stackView distribution="fillEqually" orientation="horizontal" alignment="top" spacing="20" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TnH-dX-qaQ">
-                    <rect key="frame" x="30" y="6" width="281" height="44"/>
+                    <rect key="frame" x="30" y="6" width="281" height="43"/>
                     <subviews>
                         <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="doH-ww-BDw">
-                            <rect key="frame" x="0.0" y="4" width="87" height="36"/>
+                            <rect key="frame" x="0.0" y="4" width="87" height="35"/>
                             <subviews>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="At1-ch-qv2">
-                                    <rect key="frame" x="-2" y="22" width="91" height="14"/>
+                                    <rect key="frame" x="-2" y="21" width="91" height="14"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="MEMORY LIMIT" id="LKe-C4-jxo">
                                         <font key="font" metaFont="systemMedium" size="11"/>
                                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -28,9 +28,9 @@
                                     </textFieldCell>
                                 </textField>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Emt-m3-Dt6">
-                                    <rect key="frame" x="15" y="0.0" width="58" height="20"/>
+                                    <rect key="frame" x="16" y="0.0" width="55" height="19"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="1024M" id="H6T-wY-PIG">
-                                        <font key="font" metaFont="systemMedium" size="17"/>
+                                        <font key="font" metaFont="systemMedium" size="16"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
@@ -46,10 +46,10 @@
                             </customSpacing>
                         </stackView>
                         <stackView distribution="fillEqually" orientation="vertical" alignment="centerX" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="g4d-4N-NkC">
-                            <rect key="frame" x="107" y="4" width="77" height="36"/>
+                            <rect key="frame" x="107" y="4" width="77" height="35"/>
                             <subviews>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7um-XA-djV">
-                                    <rect key="frame" x="7" y="22" width="63" height="14"/>
+                                    <rect key="frame" x="7" y="21" width="63" height="14"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="MAX POST" id="Qfq-Bl-yuh">
                                         <font key="font" metaFont="systemMedium" size="11"/>
                                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -57,9 +57,9 @@
                                     </textFieldCell>
                                 </textField>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Vyu-AO-8SH">
-                                    <rect key="frame" x="10" y="0.0" width="58" height="20"/>
+                                    <rect key="frame" x="11" y="0.0" width="55" height="19"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="1024M" id="uH4-Zy-43x">
-                                        <font key="font" metaFont="systemMedium" size="17"/>
+                                        <font key="font" metaFont="systemMedium" size="16"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
@@ -75,10 +75,10 @@
                             </customSpacing>
                         </stackView>
                         <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nWj-33-m8Q">
-                            <rect key="frame" x="204" y="4" width="77" height="36"/>
+                            <rect key="frame" x="204" y="4" width="77" height="35"/>
                             <subviews>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Oef-6n-9QI">
-                                    <rect key="frame" x="-1" y="22" width="79" height="14"/>
+                                    <rect key="frame" x="-1" y="21" width="79" height="14"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="MAX UPLOAD" id="lGh-MT-TgI">
                                         <font key="font" metaFont="systemMedium" size="11"/>
                                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -86,9 +86,9 @@
                                     </textFieldCell>
                                 </textField>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eHT-tr-Kwx">
-                                    <rect key="frame" x="10" y="0.0" width="58" height="20"/>
+                                    <rect key="frame" x="11" y="0.0" width="55" height="19"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="1024M" id="1iA-Ri-zYY">
-                                        <font key="font" metaFont="systemMedium" size="17"/>
+                                        <font key="font" metaFont="systemMedium" size="16"/>
                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>