From 6a2e4b94e5741c9a6352a267c34fe142181a3b7b Mon Sep 17 00:00:00 2001
From: Lord Hepipud <contact@lordhepipud.de>
Date: Tue, 20 Aug 2019 15:09:43 +0200
Subject: [PATCH] Improved ConvertTo-Seconds Cmdlet

---
 lib/core/tools/ConvertTo-Seconds.psm1 | 76 ++++++++++++++++++---------
 1 file changed, 52 insertions(+), 24 deletions(-)

diff --git a/lib/core/tools/ConvertTo-Seconds.psm1 b/lib/core/tools/ConvertTo-Seconds.psm1
index 85e7f41..68c1e65 100644
--- a/lib/core/tools/ConvertTo-Seconds.psm1
+++ b/lib/core/tools/ConvertTo-Seconds.psm1
@@ -1,34 +1,62 @@
+Import-IcingaLib core\tools;
 # year month week days hours minutes seconds milliseconds
 
 function ConvertTo-Seconds()
 {
     param(
-        [string]$Value,
-        [char]$Unit,
-        [switch]$Milliseconds
+        [string]$Value
     );
 
-    #100 D
-    #100 D
-    $Unit = $Value.Substring($Value.get_Length()-2)[0];
-    [single]$ValueSplitted = $Value;
-    #$Name.Substring($Name.get_Length()-1);
-    #$Name.Substring(0,$Name.get_Length()-1);
-    switch ([int][char]$Unit) {
-#       { 'ms', 'milliseconds' -contains $_ } { $result = ($Value / [math]::Pow(10, 3)); $boolOption = $true; }
-        { 115 -contains $_ } { $result = $ValueSplitted; $boolOption = $true; }
-        { 109 -contains $_ } { $result = ($ValueSplitted * 60); $boolOption = $true; }
-        { 104 -contains $_ } { $result = ($ValueSplitted * 3600); $boolOption = $true; }
-        { 100 -contains $_ } { $result = ($ValueSplitted * 86400); $boolOption = $true; }
-        { 87  -contains $_ } { $result = ($ValueSplitted * 604800); $boolOption = $true; }
-        { 77  -contains $_ } { $result = ($ValueSplitted * (2.5[math]::Pow(10, 6))); $boolOption = $true; }
-        { 89  -contains $_ } { $result = ($ValueSplitted * (3.10[math]::Pow(10, 7))); $boolOption = $true; }
-        default { 
-            if (-Not $boolOption) {
-                Throw 'Invalid input';
-            } 
+    [string]$NumberPart = '';
+    [string]$UnitPart   = '';
+    [bool]$Negate       = $FALSE;
+
+    foreach($char in $Value.ToCharArray()) {
+        if ((Test-Numeric $char)) {
+            $NumberPart += $char;
+        } else {
+            if ($char -eq '-') {
+                $Negate = $TRUE;
+            } elseif ($char -eq '.' -Or $char -eq ',') {
+                $NumberPart += '.';
+            } else {
+                $UnitPart += $char;
+            }
         }
     }
-    
+
+    [single]$ValueSplitted = $NumberPart;
+    $result             = 0;
+
+    if ($Negate) {
+        $ValueSplitted *= -1;
+    }
+
+    [string]$errorMsg   = (
+        [string]::Format('Invalid unit type "{0}" specified for convertion. Allowed units: ms, s, m, h, d, w, M, y', $UnitPart)
+    );
+
+    if ($UnitPart -Match 'ms') {
+        $result = ($ValueSplitted / [math]::Pow(10, 3));
+    } else {
+        if ($UnitPart.Length -gt 1) {
+            Throw $errorMsg;
+        }
+
+        switch ([int][char]$UnitPart) {
+            { 115 -contains $_ } { $result = $ValueSplitted; break; } # s
+            { 109 -contains $_ } { $result = $ValueSplitted * 60; break; } # m
+            { 104 -contains $_ } { $result = $ValueSplitted * 3600; break; } # h
+            { 100 -contains $_ } { $result = $ValueSplitted * 86400; break; } # d
+            { 119 -contains $_ } { $result = $ValueSplitted * 604800; break; } # w
+            { 77  -contains $_ } { $result = $ValueSplitted * 2592000; break; } # M
+            { 121 -contains $_ } { $result = $ValueSplitted * 31536000; break; } # y
+            default { 
+                Throw $errorMsg;
+                break;
+            }
+        }
+    }
+
     return $result;
-}
\ No newline at end of file
+}