Merged lots of stuff into MusicBrainz.Versioning

musicbrainz-data.cabal

@@ -39,17 +39,9 @@ Library
     MusicBrainz.Artist
     MusicBrainz.ArtistCredit
     MusicBrainz.Class.Cleanup
-    MusicBrainz.Class.Create
-    MusicBrainz.Class.FindLatest
-    MusicBrainz.Class.GetEntity
-    MusicBrainz.Class.ResolveReference
     MusicBrainz.Class.Update
-    MusicBrainz.Class.ViewRevision
     MusicBrainz.Country
-    MusicBrainz.Edit
     MusicBrainz.EditApplication
-    MusicBrainz.Editor
-    MusicBrainz.Entity
     MusicBrainz.Gender
     MusicBrainz.IPI
     MusicBrainz.ISNI
@@ -60,22 +52,18 @@ Library
     MusicBrainz.MBID
     MusicBrainz.PartialDate
     MusicBrainz.Recording
-    MusicBrainz.Ref
     MusicBrainz.Relationship
     MusicBrainz.Relationship.Internal
     MusicBrainz.Release
     MusicBrainz.ReleaseGroup
-    MusicBrainz.Revision
-    MusicBrainz.Revision.Internal
     MusicBrainz.Script
-    MusicBrainz.Tree
     MusicBrainz.URL
     MusicBrainz.Work
     MusicBrainz.Util
+    MusicBrainz.Versioning
   other-modules:
     MusicBrainz.Generic
     MusicBrainz.Merge
-    MusicBrainz.Class.RealiseTree
     MusicBrainz.Lens
   ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2
                -fno-warn-unused-do-bind

src/MusicBrainz/Alias.hs

@@ -19,13 +19,10 @@ import Database.PostgreSQL.Simple.FromRow (FromRow(..), field)
 import Database.PostgreSQL.Simple.ToField (ToField(..))
 import Database.PostgreSQL.Simple.ToRow (ToRow(..))
 
-import MusicBrainz.Entity
-import MusicBrainz.Monad
-import MusicBrainz.Class.ResolveReference
 import MusicBrainz.Class.RootTable
+import MusicBrainz.Monad
 import MusicBrainz.PartialDate (PartialDate)
-import MusicBrainz.Ref (Ref, Referenceable(..), reference, dereference)
-import MusicBrainz.Revision (Revision)
+import MusicBrainz.Versioning
 
 import qualified Data.Set as Set
 
@@ -135,3 +132,10 @@ class ViewAliases a where
            , "JOIN " ++ entityName ++ "_revision USING (" ++ entityName ++ "_tree_id) "
            , "WHERE revision_id = ?"
            ]
+
+
+--------------------------------------------------------------------------------
+{-| Provide a single lens to view all aliases inside a 'Tree'. -}
+class TreeAliases a where
+  {-| A 'Lens' into all aliases for any 'Tree'. -}
+  aliases :: Lens' (Tree a) (Set (Alias a))

src/MusicBrainz/Annotation.hs

@@ -6,6 +6,7 @@
 module MusicBrainz.Annotation where
 
 import Control.Applicative
+import Control.Lens
 import Control.Monad.IO.Class (MonadIO)
 import Data.String (fromString)
 import Data.Tagged (Tagged, untag)
@@ -14,8 +15,7 @@ import Database.PostgreSQL.Simple (Only(..))
 
 import MusicBrainz.Monad
 import MusicBrainz.Class.RootTable
-import MusicBrainz.Ref (Ref)
-import MusicBrainz.Revision (Revision)
+import MusicBrainz.Versioning
 
 --------------------------------------------------------------------------------
 {-| This type class provides functions for working with annotations for specific
@@ -37,3 +37,10 @@ class ViewAnnotation a where
         , "JOIN " ++ entityName ++ "_revision USING (" ++ entityName ++ "_tree_id) "
         , "WHERE revision_id = ?"
         ]
+
+
+--------------------------------------------------------------------------------
+{-| Provide a single lens to view the annotation inside a 'Tree'. -}
+class TreeAnnotation a where
+  {-| A 'Lens' into the annotation for any 'Tree'. -}
+  annotation :: Lens' (Tree a) Text

src/MusicBrainz/Artist.hs

@@ -33,38 +33,25 @@ import Database.PostgreSQL.Simple.ToRow (ToRow(..))
 
 import qualified Data.Set as Set
 
-import MusicBrainz.Merge
-import MusicBrainz.Monad
-import MusicBrainz.Annotation
 import MusicBrainz.Alias
-import MusicBrainz.Class.Create
-import MusicBrainz.Class.FindLatest
-import MusicBrainz.Class.MasterRevision
-import MusicBrainz.Class.NewEntityRevision
-import MusicBrainz.Class.RealiseTree
-import MusicBrainz.Class.ResolveReference
+import MusicBrainz.Annotation
 import MusicBrainz.Class.RootTable
 import MusicBrainz.Class.Update
-import MusicBrainz.Class.ViewRevision
 import MusicBrainz.Country (Country)
-import MusicBrainz.Entity (Add(..), coreData)
 import MusicBrainz.Gender (Gender)
 import MusicBrainz.IPI
 import MusicBrainz.ISNI
 import MusicBrainz.MBID
+import MusicBrainz.Merge
+import MusicBrainz.Monad
 import MusicBrainz.PartialDate (PartialDate)
-import MusicBrainz.Ref (Ref, Referenceable(..), reference, dereference)
 import MusicBrainz.Relationship
-import MusicBrainz.Relationship.Internal (HoldsRelationships(..), viewRelationships)
-import MusicBrainz.Revision (Revision)
-import MusicBrainz.Revision.Internal (CloneRevision(..))
-import MusicBrainz.Tree
+import MusicBrainz.Relationship.Internal
 import MusicBrainz.Util (viewOnce)
+import MusicBrainz.Versioning hiding (merge)
 
 import {-# SOURCE #-} qualified MusicBrainz.Generic as Generic
 
-import MusicBrainz.Edit (Editable(..))
-
 --------------------------------------------------------------------------------
 {-| The data about an artist in MusicBrainz. -}
 data Artist = Artist

src/MusicBrainz/Artist.hs-boot

@@ -2,7 +2,7 @@
 module MusicBrainz.Artist where
 
 import Database.PostgreSQL.Simple.FromField (FromField)
-import MusicBrainz.Ref (Ref)
+import MusicBrainz.Versioning
 
 data Artist
 

src/MusicBrainz/ArtistCredit.hs

@@ -21,8 +21,7 @@ import Database.PostgreSQL.Simple.ToRow (ToRow(..))
 import MusicBrainz.Util (groupMapTotal)
 import MusicBrainz.Monad
 import MusicBrainz.Artist (Artist)
-import MusicBrainz.Class.ResolveReference
-import MusicBrainz.Ref (Ref, Referenceable(..), reference, dereference)
+import MusicBrainz.Versioning
 
 import qualified Data.Map as Map
 import qualified Data.Set as Set

src/MusicBrainz/Class/Cleanup.hs

@@ -8,9 +8,8 @@ import Control.Monad.Loops (orM)
 import qualified Data.Set as Set
 
 import MusicBrainz.Monad
-import MusicBrainz.Ref
-import MusicBrainz.Revision
 import MusicBrainz.Relationship.Internal
+import MusicBrainz.Versioning
 
 eligibleForCleanup :: (Functor m, MonadIO m, HoldsRelationships a) =>
   Ref (Revision a) -> MusicBrainzT m Bool