clarifai 0.1.1.0 → 0.2.0.0

raw patch · 3 files changed

+16/−14 lines, 3 files

Files

• Network/Clarifai.hs +12/−13
• Network/Utilities.hs +3/−0
• clarifai.cabal +1/−1

@@ -178,22 +178,21 @@                       return (Right (V.map objToTagSet extractedVec))                     where -vecOfObjects :: V.Vector Value -> V.Vector HObj-vecOfObjects = V.map value2Map---- | Given an API Info type and a list of FilePaths, we verify each of the files.+-- | Given an API Info type and a list of FilePaths, we verify each file. -- If the file has an extension, we decide which Info attribute to use -- to verify the file. If it has no extension, we choose not to verify. This--- function maps each FilePath to a tuple of (FilePath, VerificationStatus),--- where VerificationStatus = Good | Bad | Unknown-verifyFiles :: Info -> [FilePath] -> IO [(FilePath, IO VerificationStatus)]+-- function maps each FilePath to a tuple of IO (FilePath, VerificationStatus),+-- where VerificationStatus = Good | Bad | Unknown.+verifyFiles :: Info -> [FilePath] -> IO [IO (FilePath, VerificationStatus)] verifyFiles info fs = do-  let zipped = zip fs (map getFileSize fs)-  return (map (verify info) zipped)-  where verify (Info _ _ _ ib _ _ _ _ vb) (path, ioSize)-          | ext `elem` imageExtensions = (path, fmap imgC ioSize)-          | ext `elem` videoExtensions = (path, fmap vidC ioSize)-          | otherwise = (path, return Unknown)+  let zipped = zipWith (\path size -> do+                          fsize <- size+                          return (path, fsize)) fs (map getFileSize fs)+  return (map (fmap (verify info)) zipped)+  where verify (Info _ _ _ ib _ _ _ _ vb) (path, size)+          | ext `elem` imageExtensions = (path, imgC size)+          | ext `elem` videoExtensions = (path, vidC size)+          | otherwise = (path, Unknown)           where ext = takeExtension path                 vidC = fileCheck vb                 imgC = fileCheck ib

@@ -72,6 +72,9 @@ value2Vector (Array a) = a value2Vector _ = V.empty +vecOfObjects :: V.Vector Value -> V.Vector HObj+vecOfObjects = V.map value2Map+ -- Composes the definite and value2* functions into -- a single function that gets and converts from a map. -- Data.Map

@@ -10,7 +10,7 @@ -- PVP summary:      +-+------- breaking API changes --                   | | +----- non-breaking API additions --                   | | | +--- code changes with no API change-version:             0.1.1.0+version:             0.2.0.0  -- A short (one-line) description of the package. synopsis:            API Client for the Clarifai API.