jammittools 0.5.3 → 0.5.3.2

raw patch · 2 files changed

+11/−9 lines, 2 filesdep ~jammittoolsdep ~processPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: jammittools, process

API changes (from Hackage documentation)

Files

• jammittools.cabal +3/−3
• src/Sound/Jammit/Base.hs +8/−6

@@ -1,5 +1,5 @@ Name:               jammittools-Version:            0.5.3+Version:            0.5.3.2 Synopsis:           Export sheet music and audio from Windows/Mac app Jammit Description: @@ -39,7 +39,7 @@     , directory     >= 1.2.0.1   && < 1.4     , filepath      >= 1.3.0.1   && < 1.5     , containers    >= 0.5.0.0   && < 0.6-    , process       >= 1.1.0.2   && < 1.6+    , process       >= 1.1.0.2   && < 1.7     , temporary     >= 1.1.2.5   && < 1.3     , transformers  >= 0.3.0.0   && < 0.6     , JuicyPixels   >= 3.2.7     && < 3.3@@ -61,7 +61,7 @@     , directory     >= 1.2.0.1 && < 1.4     , filepath      >= 1.3.0.1 && < 1.5     , boxes         >= 0.1.3   && < 0.2-    , jammittools   == 0.5.3+    , jammittools   ghc-options:      -Wall -O2  source-repository head

@@ -33,7 +33,7 @@ import System.Environment (lookupEnv) import qualified Data.Map as Map import qualified System.Directory as Dir-import System.FilePath ((</>))+import System.FilePath ((</>), takeFileName, dropTrailingPathSeparator) import qualified System.Info as Info  import Sound.Jammit.Internal.PropertyList@@ -233,11 +233,13 @@ -- | Searches a directory and all subdirectories for folders containing a Jammit -- info file. songSubdirs :: FilePath -> IO [FilePath]-songSubdirs dir = do-  isSong <- Dir.doesFileExist $ dir </> "info.plist"-  let here = [dir | isSong]-  subdirs <- lsAbsolute dir >>= filterM Dir.doesDirectoryExist-  (here ++) . concat <$> mapM songSubdirs subdirs+songSubdirs dir = case takeFileName $ dropTrailingPathSeparator dir of+  fn@('.' : _ : _) | fn /= ".." -> return []+  _                             -> do+    isSong <- Dir.doesFileExist $ dir </> "info.plist"+    let here = [dir | isSong]+    subdirs <- lsAbsolute dir >>= filterM Dir.doesDirectoryExist+    (here ++) . concat <$> mapM songSubdirs subdirs  data Beat = Beat   { isDownbeat  :: Bool