zip-archive 0.2.3.3 → 0.2.3.4

raw patch · 3 files changed

+19/−7 lines, 3 files

Files

• changelog +7/−1
• src/Codec/Archive/Zip.hs +11/−5
• zip-archive.cabal +1/−1

@@ -1,4 +1,10 @@-zip-archive 0.2.3.2+zip-archive 0.2.3.4++  * Make sure all path comparisons compare normalized paths.+    So, findEntryByPath "foo" will find something stored as "./foo"+    in the zip container.++zip-archive 0.2.3.3    * Better normalization of file paths:  "./foo/bar" and "foo/./bar"     are now treated the same, for example.  Note that we do not

@@ -164,14 +164,13 @@ -- | Deletes an entry from a zip archive. deleteEntryFromArchive :: FilePath -> Archive -> Archive deleteEntryFromArchive path archive =-  let path'      = normalizePath path-      newEntries = filter (\e -> eRelativePath e /= path') $ zEntries archive-  in  archive { zEntries = newEntries }+  archive { zEntries = [e | e <- zEntries archive+                       , not (eRelativePath e `matches` path)] }  -- | Returns Just the zip entry with the specified path, or Nothing. findEntryByPath :: FilePath -> Archive -> Maybe Entry findEntryByPath path archive =-  find (\e -> normalizePath path == eRelativePath e) (zEntries archive)+  find (\e -> path `matches` eRelativePath e) (zEntries archive)  -- | Returns uncompressed contents of zip entry. fromEntry :: Entry -> B.ByteString@@ -214,7 +213,10 @@ readEntry opts path = do   isDir <- doesDirectoryExist path   -- make sure directories end in / and deal with the OptLocation option-  let path' = let p = normalizePath $ path ++ if isDir then "/" else "" in+  let path' = let p = path ++ (case reverse path of+                                    ('/':_) -> ""+                                    _ | isDir -> "/"+                                      | otherwise -> "") in               (case [(l,a) | OptLocation l a <- opts] of                     ((l,a):_) -> if a then l </> p else l                     _         -> p)@@ -293,6 +295,10 @@       -- note: some versions of filepath return ["."] if no dir       dirParts = filter (/=".") $ splitDirectories dir'   in  intercalate "/" (dirParts ++ [fn])++-- Equality modulo normalization.  So, "./foo" `matches` "foo".+matches :: FilePath -> FilePath -> Bool+matches fp1 fp2 = normalizePath fp1 == normalizePath fp2  -- | Uncompress a lazy bytestring. compressData :: CompressionMethod -> B.ByteString -> B.ByteString

@@ -1,5 +1,5 @@ Name:                zip-archive-Version:             0.2.3.3+Version:             0.2.3.4 Cabal-Version:       >= 1.10 Build-type:          Simple Synopsis:            Library for creating and modifying zip archives.