Dropped dependency on generic-data for now.

1 files changed, 12 insertions, 4 deletions

diff --git a/Announcer.hs b/Announcer.hs
index 2b96c421..72d70a1e 100644
--- a/Announcer.hs
+++ b/Announcer.hs
@@ -35,7 +35,7 @@ import Data.Maybe
 import Data.Ord
 import Data.Time.Clock.POSIX
 import qualified GHC.Generics as Generics
-import Generic.Data.Internal.Meta as Lyxia
+-- import Generic.Data.Internal.Meta as Lyxia
 
 newtype AnnounceKey = AnnounceKey ByteString
  deriving (Hashable,Ord,Eq)
@@ -54,13 +54,21 @@ data ScheduledItem
     | SearchResult (STM (IO ()))
     | StopAnnouncer
  -- Can't use Data because STM and IO. :(
- -- deriving Data {- itemStatusNum sch = constrIndex $ toConstr sch -}
- -- Using Generic to accomplish the job.
+ --   deriving Data {- itemStatusNum sch = constrIndex $ toConstr sch -}
+ -- Using Generic works with Lyxia's generic-data package...
+ --                 {- itemStatusNum sch = Lyxia.conIdToInt $ Lyxia.conId sch -}
+ -- For now, make sure to keep 'itemStatusNum' up to date with 'ScheduledItem'.
  deriving Generics.Generic
 
 
 itemStatusNum :: ScheduledItem -> Int
-itemStatusNum sch = Lyxia.conIdToInt $ Lyxia.conId sch
+itemStatusNum (DeleteAnnouncement   ) = 0
+itemStatusNum (NewAnnouncement    {}) = 1
+itemStatusNum (SearchFinished     {}) = 2
+itemStatusNum (Announce           {}) = 3
+itemStatusNum (SearchResult       {}) = 4
+itemStatusNum (StopAnnouncer        ) = 5
+itemStatusNum _                       = error "itemStatusNum not in sync with ScheduledItem declaration."
 
 data Announcer = Announcer
     { scheduled       :: TVar (PSQ' AnnounceKey POSIXTime ScheduledItem)