Move modules under the Vimus namespace

driver/Main.hs

@@ -1,5 +1,5 @@
 module Main where
-import qualified Run
+import qualified Vimus.Run
 
 main :: IO ()
-main = Run.main
+main = Vimus.Run.main

src/Content.hs

@@ -10,8 +10,8 @@ import qualified Data.Map as Map
 import qualified Network.MPD as MPD hiding (withMPD)
 import qualified System.FilePath as FilePath
 
-import           Widget.Type
-import           Song.Format (SongFormat(..))
+import           Vimus.Widget.Type
+import           Vimus.Song.Format (SongFormat(..))
 
 pathFileName :: MPD.Path -> String
 pathFileName = FilePath.takeFileName . MPD.toString

src/Type.hs → src/Instances.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
--- | Common types an instances.
-module Type where
+-- | orphan instances
+module Instances where
 
 import           Control.Monad.State.Strict
 import           Network.MPD.Core

src/PlaybackState.hs

@@ -20,7 +20,7 @@ import qualified Network.MPD.Applicative as MPDA
 
 import           Timer
 
-import           Type ()
+import           Instances ()
 
 data State = State {
   timer       :: Maybe Timer

src/Command.hs → src/Vimus/Command.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings, QuasiQuotes, TupleSections, RecordWildCards #-}
-module Command (
+module Vimus.Command (
   runCommand
 , autoComplete
 , source
@@ -45,25 +45,25 @@ import           UI.Curses hiding (wgetch, ungetch, mvaddstr, err)
 
 import           Paths_vimus (getDataFileName)
 
-import           Util
-import           Vimus
-import           Widget.ListWidget (ListWidget)
-import qualified Widget.ListWidget as ListWidget
-import           Widget.HelpWidget
+import           Vimus.Util
+import           Vimus.Type
+import           Vimus.Widget.ListWidget (ListWidget)
+import qualified Vimus.Widget.ListWidget as ListWidget
+import           Vimus.Widget.HelpWidget
 import           Content
-import           WindowLayout
-import           Key (ExpandKeyError (..), keyNames, expandKeys)
-import qualified Macro
-import           Input (CompletionFunction)
-import           Command.Core
-import           Command.Help (help)
-import           Command.Parser
-import           Command.Completion
-
-import           Tab (Tabs)
-import qualified Tab
-import           Song.Format (SongFormat)
-import           Widget.Type (Renderable, renderItem, toPlainText)
+import           Vimus.WindowLayout
+import           Vimus.Key (ExpandKeyError (..), keyNames, expandKeys)
+import qualified Vimus.Macro as Macro
+import           Vimus.Input (CompletionFunction)
+import           Vimus.Command.Core
+import           Vimus.Command.Help (help)
+import           Vimus.Command.Parser
+import           Vimus.Command.Completion
+
+import           Vimus.Tab (Tabs)
+import qualified Vimus.Tab as Tab
+import           Vimus.Song.Format (SongFormat)
+import           Vimus.Widget.Type (Renderable, renderItem, toPlainText)
 
 {-# ANN module ("HLint: ignore Redundant do" :: String) #-}
 

src/Command/Completion.hs → src/Vimus/Command/Completion.hs

@@ -1,4 +1,4 @@
-module Command.Completion (
+module Vimus.Command.Completion (
   completeCommand
 , parseCommand
 , completeOptions
@@ -8,8 +8,8 @@ module Command.Completion (
 import           Data.List
 import           Data.Char
 
-import           Util
-import           Command.Type
+import           Vimus.Util
+import           Vimus.Command.Type
 
 completeCommand :: [Command] -> CompletionFunction
 completeCommand commands input_ = (pre ++) `fmap` case parseCommand_ input of

src/Command/Core.hs → src/Vimus/Command/Core.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE TypeSynonymInstances, FlexibleInstances, MultiParamTypeClasses, FlexibleContexts, ScopedTypeVariables #-}
-module Command.Core (
+module Vimus.Command.Core (
   Command
 , commandName
 , commandAction
@@ -27,17 +27,17 @@ import           Control.Applicative
 import           Control.Monad (unless)
 import           Data.Char
 
-import           Vimus (Vimus)
+import           Vimus.Type (Vimus)
 import           Text.Read (readMaybe)
-import           WindowLayout (WindowColor(..), defaultColor)
+import           Vimus.WindowLayout (WindowColor(..), defaultColor)
 import           UI.Curses (Color, black, red, green, yellow, blue, magenta, cyan, white)
-import           Command.Type
-import           Command.Help () -- for the (IsString Help) instance
-import           Command.Completion
-import           Command.Parser
-import           Song.Format (SongFormat)
-import qualified Song.Format as SongFormat
-import qualified Song
+import           Vimus.Command.Type
+import           Vimus.Command.Help () -- for the (IsString Help) instance
+import           Vimus.Command.Completion
+import           Vimus.Command.Parser
+import           Vimus.Song.Format (SongFormat)
+import qualified Vimus.Song.Format as SongFormat
+import qualified Vimus.Song as Song
 
 runAction :: Action a -> String -> Either String a
 runAction action s = either (Left . show) (Right . fst) $ runParser (unAction action <* endOfInput) s

src/Command/Help.hs → src/Vimus/Command/Help.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-module Command.Help (
+module Vimus.Command.Help (
   Help (..)
 , help
 , commandShortHelp
@@ -14,8 +14,8 @@ import           Language.Haskell.TH
 import           Language.Haskell.TH.Quote
 import           Language.Haskell.TH.Syntax
 
-import           Command.Type
-import           Util (strip)
+import           Vimus.Command.Type
+import           Vimus.Util (strip)
 
 -- | A `QuasiQuoter` for help text.
 help :: QuasiQuoter

src/Command/Parser.hs → src/Vimus/Command/Parser.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE DeriveFunctor #-}
-module Command.Parser where
+module Vimus.Command.Parser where
 
 import           Prelude hiding (takeWhile)
 import           Data.List (intercalate)

src/Command/Type.hs → src/Vimus/Command/Type.hs

@@ -1,15 +1,15 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-module Command.Type (
-  module Command.Type
+module Vimus.Command.Type (
+  module Vimus.Command.Type
 , CompletionFunction
 , noCompletion
 ) where
 
 import           Control.Applicative
 
-import           Vimus
-import           Input (CompletionFunction, noCompletion)
-import           Command.Parser
+import           Vimus.Type
+import           Vimus.Input (CompletionFunction, noCompletion)
+import           Vimus.Command.Parser
 
 newtype Action a = Action {unAction :: Parser a}
   deriving (Functor, Applicative, Alternative)

src/Input.hs → src/Vimus/Input.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# OPTIONS_GHC -fno-warn-unused-do-bind #-}
-module Input (
+module Vimus.Input (
   InputT
 , runInputT
 , unGetString
@@ -30,8 +30,8 @@ import           UI.Curses (Window)
 import qualified UI.Curses as Curses
 import           UI.Curses.Key
 
-import           WindowLayout
-import           Key
+import           Vimus.WindowLayout
+import           Vimus.Key
 
 import           Data.List.Zipper as ListZipper
 import           Data.List.Pointed hiding (modify)

src/Key.hs → src/Vimus/Key.hs

@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
-module Key (
+module Vimus.Key (
   keyNames
 , ExpandKeyError (..)
 , expandKeys

src/Macro.hs → src/Vimus/Macro.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving, PatternGuards #-}
-module Macro (
+module Vimus.Macro (
   Macros
 , addMacro
 , removeMacro
@@ -18,9 +18,9 @@ import qualified Data.Map as Map
 
 import           Data.Default
 
-import           Key (unExpandKeys)
+import           Vimus.Key (unExpandKeys)
 
-import           Input
+import           Vimus.Input
 
 newtype Macros = Macros (Map String String)
 

src/Queue.hs → src/Vimus/Queue.hs

@@ -1,7 +1,7 @@
 -- | A simple unbounded queue.
 --
 -- All operations are non-blocking.
-module Queue (
+module Vimus.Queue (
   Queue
 , newQueue
 , putQueue

src/Render.hs → src/Vimus/Render.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-module Render (
+module Vimus.Render (
   Render
 , runRender
 , getWindowSize
@@ -20,8 +20,8 @@ import           Control.Monad.Reader
 import           UI.Curses hiding (wgetch, ungetch, mvaddstr, err, mvwchgat, addstr, wcolor_set)
 import           Data.Char.WCWidth
 
-import           Widget.Type
-import           WindowLayout
+import           Vimus.Widget.Type
+import           Vimus.WindowLayout
 
 data Environment = Environment {
   environmentWindow  :: Window

src/Ruler.hs → src/Vimus/Ruler.hs

@@ -1,11 +1,11 @@
 {-# OPTIONS_GHC -fno-warn-unused-do-bind #-}
-module Ruler where
+module Vimus.Ruler where
 
 import           Text.Printf (printf)
 
-import           WindowLayout
-import           Render
-import           Widget.Type
+import           Vimus.WindowLayout
+import           Vimus.Render
+import           Vimus.Widget.Type
 
 type PositionIndicator = Maybe (Int, Int)
 

src/Run.hs → src/Vimus/Run.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -fno-warn-unused-do-bind #-}
-module Run (main) where
+module Vimus.Run (main) where
 
 import           Prelude hiding (getChar)
 import           UI.Curses hiding (err, wgetch, wget_wch, ungetch, mvaddstr)
@@ -19,17 +19,17 @@ import           System.Directory (doesFileExist)
 import           Control.Concurrent (forkIO)
 import           Text.Printf (printf)
 
-import qualified WindowLayout
-import qualified Input
-import           Input (HistoryNamespace(..), noCompletion)
-import           Macro
+import qualified Vimus.WindowLayout as WindowLayout
+import qualified Vimus.Input as Input
+import           Vimus.Input (HistoryNamespace(..), noCompletion)
+import           Vimus.Macro
 import qualified PlaybackState
 import           Option (getOptions)
-import           Util (expandHome)
-import           Queue
-import           Vimus
-import qualified Command as Command
-import qualified Song
+import           Vimus.Util (expandHome)
+import           Vimus.Queue
+import           Vimus.Type
+import qualified Vimus.Command as Command
+import qualified Vimus.Song as Song
 
 ------------------------------------------------------------------------
 -- The main event loop

src/Song.hs → src/Vimus/Song.hs

@@ -1,5 +1,5 @@
 -- | Songs metadata
-module Song (
+module Vimus.Song (
   metaQueries
 , album
 , artist

src/Song/Format.hs → src/Vimus/Song/Format.hs

@@ -1,5 +1,5 @@
 -- | Song format parser
-module Song.Format (
+module Vimus.Song.Format (
   SongFormat(..)
 , parser
 
@@ -23,9 +23,9 @@ import           Text.Printf (printf)
 
 import qualified Network.MPD as MPD
 
-import qualified Command.Parser as Parser
+import qualified Vimus.Command.Parser as Parser
 
-import Song
+import Vimus.Song
 
 
 infixr 4 :+:

src/Tab.hs → src/Vimus/Tab.hs

@@ -1,4 +1,4 @@
-module Tab (
+module Vimus.Tab (
   Tab (..)
 , TabName (..)
 , CloseMode (..)

src/Vimus.hs → src/Vimus/Type.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving, ExistentialQuantification #-}
 {-# OPTIONS_GHC -fno-warn-unused-do-bind #-}
-module Vimus (
+module Vimus.Type (
   Vimus
 , runVimus
 
@@ -81,23 +81,23 @@ import qualified Network.MPD as MPD hiding (withMPD)
 
 import           UI.Curses hiding (mvwchgat)
 
-import qualified Macro
-import           Macro (Macros)
+import qualified Vimus.Macro as Macro
+import           Vimus.Macro (Macros)
 
 import           Content
-import           Type ()
-import           Widget.Type
+import           Instances ()
+import           Vimus.Widget.Type
 
-import           Tab (Tab(..), TabName(..), CloseMode(..))
-import qualified Tab
-import           WindowLayout (WindowColor(..), mvwchgat)
+import           Vimus.Tab (Tab(..), TabName(..), CloseMode(..))
+import qualified Vimus.Tab as Tab
+import           Vimus.WindowLayout (WindowColor(..), mvwchgat)
 
 import           Control.Monad.Error.Class
-import           Util (expandHome)
-import           Render
-import           Ruler
+import           Vimus.Util (expandHome)
+import           Vimus.Render
+import           Vimus.Ruler
 
-import           Song.Format (SongFormat)
+import           Vimus.Song.Format (SongFormat)
 
 class Widget a where
   render      :: a -> Render Ruler

src/Util.hs → src/Vimus/Util.hs

@@ -1,4 +1,4 @@
-module Util where
+module Vimus.Util where
 
 import           Control.Applicative
 import           Data.List (isPrefixOf)