summaryrefslogtreecommitdiff
path: root/Omni/Task/Core.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Omni/Task/Core.hs')
-rw-r--r--Omni/Task/Core.hs30
1 files changed, 21 insertions, 9 deletions
diff --git a/Omni/Task/Core.hs b/Omni/Task/Core.hs
index bab1912..a2e76b6 100644
--- a/Omni/Task/Core.hs
+++ b/Omni/Task/Core.hs
@@ -176,7 +176,7 @@ withTaskReadLock action =
action
)
--- Generate a short ID using base62 encoding of timestamp
+-- Generate a short ID using base36 encoding of timestamp (lowercase)
generateId :: IO Text
generateId = do
now <- getCurrentTime
@@ -188,7 +188,7 @@ generateId = do
-- Combine MJD and micros to ensure uniqueness across days.
-- Multiplier 10^11 (100,000 seconds) is safe for any day length.
totalMicros = (mjd * 100000000000) + micros
- encoded = toBase62 totalMicros
+ encoded = toBase36 totalMicros
pure <| "t-" <> T.pack encoded
-- Generate a child ID based on parent ID (e.g. "t-abc.1", "t-abc.1.2")
@@ -220,15 +220,15 @@ getSuffix parent childId =
else Nothing
else Nothing
--- Convert number to base62 (0-9, a-z, A-Z)
-toBase62 :: Integer -> String
-toBase62 0 = "0"
-toBase62 n = reverse <| go n
+-- Convert number to base36 (0-9, a-z)
+toBase36 :: Integer -> String
+toBase36 0 = "0"
+toBase36 n = reverse <| go n
where
- alphabet = ['0' .. '9'] ++ ['a' .. 'z'] ++ ['A' .. 'Z']
+ alphabet = ['0' .. '9'] ++ ['a' .. 'z']
go 0 = []
go x =
- let (q, r) = x `divMod` 62
+ let (q, r) = x `divMod` 36
idx = fromIntegral r
char = case drop idx alphabet of
(c : _) -> c
@@ -320,7 +320,7 @@ createTask :: Text -> TaskType -> Maybe Text -> Maybe Text -> Priority -> [Depen
createTask title taskType parent namespace priority deps description =
withTaskWriteLock <| do
tid <- case parent of
- Nothing -> generateId
+ Nothing -> generateUniqueId
Just pid -> do
tasks <- loadTasksInternal
pure <| computeNextChildId tasks pid
@@ -342,6 +342,18 @@ createTask title taskType parent namespace priority deps description =
saveTaskInternal task
pure task
+-- Generate a unique ID (checking against existing tasks)
+generateUniqueId :: IO Text
+generateUniqueId = do
+ tasks <- loadTasksInternal
+ go tasks
+ where
+ go tasks = do
+ tid <- generateId
+ case findTask tid tasks of
+ Nothing -> pure tid
+ Just _ -> go tasks -- Retry if collision (case-insensitive)
+
-- Update task status
updateTaskStatus :: Text -> Status -> IO ()
updateTaskStatus tid newStatus =