rtorrent-state 0.1.0.0 → 0.1.0.1

raw patch · 3 files changed

+30/−6 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• rtorrent-state.cabal +1/−1
• src/Data/Rtorrent/StateFile.hs +24/−5
• test/Data/Rtorrent/StateFileSpec.hs +5/−0

@@ -1,5 +1,5 @@ name:                rtorrent-state-version:             0.1.0.0+version:             0.1.0.1 synopsis:            Parsing and manipulation of rtorrent state file contents description:         Parsing and manipulation of rtorrent state file contents homepage:            http://github.com/Fuuzetsu/rtorrent-state

@@ -3,6 +3,8 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE DeriveDataTypeable #-}+{-# LANGUAGE TupleSections #-}+{-# LANGUAGE ScopedTypeVariables #-} -- | -- Module      :  Data.Rtorrent.StateFile -- Copyright   :  (c) Mateusz Kowalczyk 2014@@ -27,7 +29,8 @@ -- @'overFilesIn' "rtorrent/session/dir" 'stopTorrent'@ module Data.Rtorrent.StateFile where -import           Control.Applicative ((<$>), (<*>))+import           Control.Applicative ((<$>))+import           Control.Exception (catch, IOException) import           Control.Lens ((.~), set, view) import           Control.Monad ((>=>)) import           Data.BEncode (decode, encode, Result)@@ -38,18 +41,25 @@ import           Data.Map (Map, mapEither, fromList) import           Data.Rtorrent.StateFile.Types import           Prelude hiding (readFile, writeFile, length)-import           System.Directory-import           System.FilePath+import           System.Directory (getDirectoryContents)+import           System.FilePath ((</>)) + -- | Takes a directory, 'StateFile' modification function and does an -- ‘in-place’ modifications to all .rtorrent files it can find and -- parse in that directory. Returns the list of all file paths and any -- potential errors that with each.+--+-- See 'getRtorrentFiles' for the type of exception this function can throw. overFilesIn ∷ FilePath → StateMod → IO [(FilePath, Maybe String)] overFilesIn fp f =-  getRtorrentFiles fp >>= mapM (\x → (,) <$> return x <*> withRtorrentState x f)+  getRtorrentFiles fp >>= mapM (\x → (x,) <$> withRtorrentState x f)  -- | Gets a list of all @.rtorrent@ files in the specified directory.+--+-- This function uses 'getDirectoryContents' which can throw various+-- IOExceptions. It's up to the user to catch these if they wish to do+-- so. getRtorrentFiles ∷ FilePath → IO [FilePath] getRtorrentFiles t =   map (t </>) . filter (".rtorrent" `isSuffixOf`) <$> getDirectoryContents t@@ -74,6 +84,9 @@  -- | Given a directory path, produces a 'Map' of file paths from -- individual files to their parsing results.+--+-- This function uses 'getRtorrentFiles' which can throw an+-- IOException in case there is a problem reading the directory. parseFiles ∷ FilePath → IO (Map FilePath (Result StateFile)) parseFiles t = getRtorrentFiles t >>= mapM parseFile' >>= return . fromList @@ -85,7 +98,13 @@ -- | Parses a file and returns a pair of of its path and the parsing -- result. The path is useful if we're processing whole directories. parseFile' ∷ FilePath → IO (FilePath, Result StateFile)-parseFile' f = readFile f >>= \c → return (f, length c `seq` decodeState c)+parseFile' f = readFileE >>= return . (f,) . \case+  Left (e ∷ IOException) → Left $ show e+  Right c → length c `seq` decodeState c+  where+    readFileE ∷ IO (Either IOException ByteString)+    readFileE = (Right <$> readFile f) `catch` (return . Left)+  -- | Sets the torrent to started state. startTorrent ∷ StateMod

@@ -69,6 +69,11 @@   prop "can start all torrents" . withRtorrentFiles stopTorrent $ \d →     afterRunning d startTorrent `shouldSatisfyIO` allStarted +  it "parseFile deals with inexistent path" $+    let f = "nofile-rtorrent-state" in+    parseFile f `shouldReturn`+    Left (f ++ ": openBinaryFile: does not exist (No such file or directory)")+   where     allSatisfy ∷ M.Map FilePath (Result StateFile) -- ^ parsed files                → (Result StateFile → Bool) -- ^ predicate