Update variables and msec calculations

Author: PineappleIOnic

templates/android/library/src/main/java/io/appwrite/ID.kt.twig

@@ -10,11 +10,11 @@ class ID {
         // Recreated from https://www.php.net/manual/en/function.uniqid.php
         private fun hexTimestamp(): String {
             val now = Instant.now().toEpochMilli() / 1000.0
-            val secondsSinceEpoch = floor(now).toLong()
-            val msecs = ((now - secondsSinceEpoch) * 1_000_000).toLong()
+            val sec = floor(now).toLong()
+            val usec = ((now - sec) * 1_000_000).toLong()
 
             // Convert both parts to hexadecimal format
-            val hexTimestamp = "%08x%05x".format(secondsSinceEpoch, msecs)
+            val hexTimestamp = "%08x%05x".format(sec, usec)
             return hexTimestamp
         }
 

templates/dart/lib/id.dart.twig

@@ -8,10 +8,10 @@ class ID {
   // Recreated from https://www.php.net/manual/en/function.uniqid.php
   static String _hexTimestamp() {
     final now = DateTime.now();
-    final secondsSinceEpoch = (now.millisecondsSinceEpoch / 1000).floor();
-    final msecs = now.microsecondsSinceEpoch - secondsSinceEpoch * 1000000;
-    return secondsSinceEpoch.toRadixString(16) +
-        msecs.toRadixString(16).padLeft(5, '0');
+    final sec = (now.millisecondsSinceEpoch / 1000).floor();
+    final usec = now.microsecondsSinceEpoch - secondsSinceEpoch * 1000000;
+    return sec.toRadixString(16) +
+        usec.toRadixString(16).padLeft(5, '0');
   }
 
   // Generate a unique ID with padding to have a longer ID

templates/deno/src/id.ts.twig

@@ -3,12 +3,11 @@ export class ID {
     // Recreated from https://www.php.net/manual/en/function.uniqid.php
     static #hexTimestamp(): string {
         const now = new Date();
-        const secondsSinceEpoch = Math.floor(now.getTime() / 1000);
-        const msecs = now.getTime() - secondsSinceEpoch * 1000;
-        const microsecondsPart = msecs * 1000; // Convert milliseconds to microseconds
+        const sec = Math.floor(now.getTime() / 1000);
+        const usec = now.getMilliseconds() * 1000;
 
         // Convert to hexadecimal
-        const hexTimestamp = secondsSinceEpoch.toString(16) + microsecondsPart.toString(16).padStart(5, '0');
+        const hexTimestamp = sec.toString(16) + usec.toString(16).padStart(5, '0');
         return hexTimestamp;
     }
 

templates/dotnet/src/Appwrite/ID.cs.twig

@@ -10,13 +10,12 @@ namespace {{ spec.title | caseUcfirst }}
         {
             var now = DateTime.UtcNow;
             var epoch = (now - new DateTime(1970, 1, 1));
-            var secondsSinceEpoch = (long)epoch.TotalSeconds;
-            var msecs = epoch.TotalMilliseconds - secondsSinceEpoch * 1000;
-            var microsecondsPart = (long)(msecs * 1000); // Convert milliseconds to microseconds
-
+            var sec = (long)epoch.TotalSeconds;
+            var usec = epoch.TotalMilliseconds - secondsSinceEpoch * 1000000;
+    
             // Convert to hexadecimal
-            var hexTimestamp = secondsSinceEpoch.ToString("x")
-                + microsecondsPart.ToString("x").PadLeft(5, '0');
+            var hexTimestamp = sec.ToString("x")
+                + usec.ToString("x").PadLeft(5, '0');
             return hexTimestamp;
         }
 

templates/kotlin/src/main/kotlin/io/appwrite/ID.kt.twig

@@ -9,12 +9,12 @@ class ID {
         // Generate an hex ID based on timestamp
         // Recreated from https://www.php.net/manual/en/function.uniqid.php
         private fun hexTimestamp(): String {
-            val now = Instant.now().toEpochMilli() / 1000.0
-            val secondsSinceEpoch = floor(now).toLong()
-            val msecs = ((now - secondsSinceEpoch) * 1_000_000).toLong()
+            val now = Instant.now()
+            val sec = now.epochSecond
+            val millis = now.toEpochMilli() % 1000
+
+            val hexTimestamp = "%08x%03x".format(sec, millis)
 
-            // Convert both parts to hexadecimal format
-            val hexTimestamp = "%08x%05x".format(secondsSinceEpoch, msecs)
             return hexTimestamp
         }
 

templates/node/lib/id.js.twig

@@ -3,13 +3,11 @@ class ID {
     // Recreated from https://www.php.net/manual/en/function.uniqid.php
     static #hexTimestamp = () => {
         const now = new Date();
-        const secondsSinceEpoch = Math.floor(now.getTime() / 1000);
-        const msecs = now.getTime() - secondsSinceEpoch * 1000;
-        const microsecondsPart = msecs * 1000; // Convert milliseconds to microseconds
+        const sec = Math.floor(now.getTime() / 1000);
+        const usec = now.getMilliseconds() * 1000;
 
         // Convert to hexadecimal
-        const hexTimestamp = secondsSinceEpoch.toString(16)
-            + microsecondsPart.toString(16).padStart(5, '0');
+        const hexTimestamp = sec.toString(16) + usec.toString(16).padStart(5, '0');
         return hexTimestamp;
     }
 

templates/python/package/id.py.twig

@@ -8,9 +8,9 @@ class ID:
     @staticmethod
     def __hex_timestamp():
         now = datetime.now()
-        seconds_since_epoch = int(now.timestamp())
-        microseconds_part = now.microsecond
-        hex_timestamp = f'{seconds_since_epoch:08x}{microseconds_part:05x}'
+        sec = int(now.timestamp())
+        usec = now.microsecond
+        hex_timestamp = f'{sec:08x}{usec:05x}'
         return hex_timestamp
 
     @staticmethod

templates/ruby/lib/container/id.rb.twig

@@ -20,9 +20,9 @@ module {{spec.title | caseUcfirst}}
         #Recreated from https://www.php.net/manual/en/function.uniqid.php
         def self.hex_timestamp
             now = Time.now
-            seconds_since_epoch = now.to_i
-            microseconds_part = now.usec
-            hex_timestamp = "%08x%05x" % [seconds_since_epoch, microseconds_part]
+            sec = now.to_i
+            usec = now.usec
+            hex_timestamp = "%08x%05x" % [sec, usec]
             hex_timestamp
         end
     end

templates/swift/Sources/ID.swift.twig

@@ -5,9 +5,9 @@ public class ID {
     // Recreated from https://www.php.net/manual/en/function.uniqid.php
     private static func hexTimestamp() -> String {
         let now = Date()
-        let secondsSinceEpoch = Int(now.timeIntervalSince1970)
-        let microsecondsPart = Int((now.timeIntervalSince1970 - Double(secondsSinceEpoch)) * 1_000_000)
-        let hexTimestamp = String(format: "%08x%05x", secondsSinceEpoch, microsecondsPart)
+        let secs = Int(now.timeIntervalSince1970)
+        let usec = Int((now.timeIntervalSince1970 - Double(secs)) * 1_000_000)
+        let hexTimestamp = String(format: "%08x%05x", secs, usec)
         return hexTimestamp
     }
 

templates/web/src/id.ts.twig

@@ -3,10 +3,11 @@ export class ID {
     // Recreated from https://www.php.net/manual/en/function.uniqid.php
     static #hexTimestamp(): string {
         const now = new Date();
-        const secondsSinceEpoch = Math.floor(now.getTime() / 1000); // Get Unix Timestamp
-        const microsecondsPart = now.getMilliseconds() * 1000; // Convert milliseconds to microseconds
-        const hexTimestamp = secondsSinceEpoch.toString(16)
-            + microsecondsPart.toString(16).padStart(5, '0');
+        const sec = Math.floor(now.getTime() / 1000);
+        const usec = now.getMilliseconds() * 1000;
+
+        // Convert to hexadecimal
+        const hexTimestamp = sec.toString(16) + usec.toString(16).padStart(5, '0');
         return hexTimestamp;
     }