twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-18 19:10:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

X.P.OrgMode: Do not default the day if no time is given

Browse Source 
Partially reverts b8d5c391cc03cfa5d7d95caa79f590d366e3c0ba
Fixes: https://github.com/liskin/xmonad-contrib/actions/runs/8869462044/job/24350171604
This commit is contained in:
Tony Zorman 2024-04-30 08:25:20 +02:00
parent 700507fcd0
commit 0622ed11ed
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
XMonad/Prompt/OrgMode.hs
View File

@ -514,8 +514,8 @@ ppNote clp todo = \case
-- | Parse the given string into a 'Note'. -- | Parse the given string into a 'Note'.
pInput :: String -> Maybe Note pInput :: String -> Maybe Note
pInput inp = (`runParser` inp) . choice $ pInput inp = (`runParser` inp) . choice $
[ Scheduled <$> (getLast "+s" <* " ") <*> (Time <$> pDate <*> pOrgTime) <*> pPriority [ Scheduled <$> (getLast "+s" <* " ") <*> join (fixTime <$> pDate <*> pOrgTime) <*> pPriority
, Deadline <$> (getLast "+d" <* " ") <*> (Time <$> pDate <*> pOrgTime) <*> pPriority , Deadline <$> (getLast "+d" <* " ") <*> join (fixTime <$> pDate <*> pOrgTime) <*> pPriority
, do s <- munch1 (pure True) , do s <- munch1 (pure True)
let (s', p) = splitAt (length s - 3) s let (s', p) = splitAt (length s - 3) s
pure $ case tryPrio p of pure $ case tryPrio p of
@ -523,6 +523,12 @@ pInput inp = (`runParser` inp) . choice $
Nothing -> NormalMsg s NoPriority Nothing -> NormalMsg s NoPriority
] ]
where where
fixTime :: Maybe Date -> Maybe OrgTime -> Parser Time
fixTime d tod = case (d, tod) of
(Nothing, Nothing) -> mempty -- no day and no time
(Nothing, Just{}) -> pure (Time Today tod) -- no day, but a time
(Just d', _) -> pure (Time d' tod) -- day given
tryPrio :: String -> Maybe Priority tryPrio :: String -> Maybe Priority
tryPrio [' ', '#', x] tryPrio [' ', '#', x]
| x `elem` ("Aa" :: String) = Just A | x `elem` ("Aa" :: String) = Just A
@ -588,15 +594,14 @@ pOrgTime = option Nothing $
pHour :: Parser Int = pNumBetween 0 23 pHour :: Parser Int = pNumBetween 0 23
pMinute :: Parser Int = pNumBetween 0 59 pMinute :: Parser Int = pNumBetween 0 59
-- | Parse a 'Date'. -- | Try to parse a 'Date'.
pDate :: Parser Date pDate :: Parser (Maybe Date)
pDate = skipSpaces *> choice pDate = skipSpaces *> optional (choice
[ pPrefix "tod" "ay" Today [ pPrefix "tod" "ay" Today
, pPrefix "tom" "orrow" Tomorrow , pPrefix "tom" "orrow" Tomorrow
, Next <$> pNext , Next <$> pNext
, Date <$> pDate' , Date <$> pDate'
, pure Today -- Fallback to today if no date was given. ])
]
where where
pNext :: Parser DayOfWeek = choice pNext :: Parser DayOfWeek = choice
[ pPrefix "m" "onday" Monday , pPrefix "tu" "esday" Tuesday [ pPrefix "m" "onday" Monday , pPrefix "tu" "esday" Tuesday

6
tests/OrgMode.hs
View File

@ -61,13 +61,15 @@ spec = do
`shouldBe` Just (Scheduled "todo" (Time {date = Today, tod = Just $ MomentInTime(HHMM 12 0)}) NoPriority) `shouldBe` Just (Scheduled "todo" (Time {date = Today, tod = Just $ MomentInTime(HHMM 12 0)}) NoPriority)
pInput "todo +d 14:05 #B" pInput "todo +d 14:05 #B"
`shouldBe` Just (Deadline "todo" (Time {date = Today, tod = Just $ MomentInTime(HHMM 14 5)}) B) `shouldBe` Just (Deadline "todo" (Time {date = Today, tod = Just $ MomentInTime(HHMM 14 5)}) B)
it "parses `blah+d` and `blah +d` as normal messages, but `blah +d ` as a deadline for today" $ do it "parses `blah+d`, `blah +d`, `blah +d `, and `blah +d #B` as normal messages" $ do
pInput "blah+d" pInput "blah+d"
`shouldBe` Just (NormalMsg "blah+d" NoPriority) `shouldBe` Just (NormalMsg "blah+d" NoPriority)
pInput "blah +d" pInput "blah +d"
`shouldBe` Just (NormalMsg "blah +d" NoPriority) `shouldBe` Just (NormalMsg "blah +d" NoPriority)
pInput "blah +d " pInput "blah +d "
`shouldBe` Just (Deadline "blah" (Time {date = Today, tod = Nothing}) NoPriority) `shouldBe` Just (NormalMsg "blah +d " NoPriority)
pInput "blah +d #B"
`shouldBe` Just (NormalMsg "blah +d" B)
context "no priority#b" $ do context "no priority#b" $ do
it "parses to the correct thing" $ it "parses to the correct thing" $