directory 1.3.1.5 → 1.3.2.0

raw patch · 7 files changed

+91/−3 lines, 7 filesdep ~timePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: time

API changes (from Hackage documentation)

Files

• System/Directory.hs +45/−0
• System/Directory/Internal/Windows.hsc +3/−0
• changelog.md +7/−0
• directory.cabal +3/−2
• tests/CopyFileWithMetadata.hs +1/−1
• tests/Main.hs +2/−0
• tests/Xdg.hs +30/−0

@@ -42,6 +42,8 @@     , getHomeDirectory     , XdgDirectory(..)     , getXdgDirectory+    , XdgDirectoryList(..)+    , getXdgDirectoryList     , getAppUserDataDirectory     , getUserDocumentsDirectory     , getTemporaryDirectory@@ -1825,7 +1827,50 @@         Just path | isRelative path -> fallback'                   | otherwise       -> return path       where fallback' = (</> fallback) <$> getHomeDirectory+#endif +-- | Search paths for various application data, as specified by the+--   <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html XDG Base Directory Specification>.+--+--   Note: On Windows, 'XdgDataDirs' and 'XdgConfigDirs' yield the same result.+--+--   @since 1.3.2.0+data XdgDirectoryList+  = XdgDataDirs+    -- ^ For data files (e.g. images).+    --   Defaults to @/usr/local/share/@ and @/usr/share/@ and can be+    --   overridden by the @XDG_DATA_DIRS@ environment variable.+    --   On Windows, it is @%PROGRAMDATA%@ or @%ALLUSERSPROFILE%@+    --   (e.g. @C:\/ProgramData@).+  | XdgConfigDirs+    -- ^ For configuration files.+    --   Defaults to @/etc/xdg@ and can be+    --   overridden by the @XDG_CONFIG_DIRS@ environment variable.+    --   On Windows, it is @%PROGRAMDATA%@ or @%ALLUSERSPROFILE%@+    --   (e.g. @C:\/ProgramData@).+  deriving (Bounded, Enum, Eq, Ord, Read, Show)++getXdgDirectoryList :: XdgDirectoryList -- ^ which special directory list+                    -> IO [FilePath]+getXdgDirectoryList xdgDir =+  modifyIOError (`ioeAddLocation` "getXdgDirectoryList") $+  case xdgDir of+    XdgDataDirs   -> get "XDG_DATA_DIRS"   ["/usr/local/share/", "/usr/share/"]+    XdgConfigDirs -> get "XDG_CONFIG_DIRS" ["/etc/xdg"]+  where+#if defined(mingw32_HOST_OS)+    get _ _ =+      return <$> Win32.sHGetFolderPath nullPtr win32_cSIDL_COMMON_APPDATA+                                       nullPtr 0+#else+    get name fallback = do+      env <- lookupEnv name+      case env of+        Nothing    -> return fallback+        Just paths -> return (splitSearchPath paths)+#endif++#if !defined(mingw32_HOST_OS) -- | Return the value of an environment variable, or 'Nothing' if there is no --   such value.  (Equivalent to "lookupEnv" from base-4.6.) lookupEnv :: String -> IO (Maybe String)

@@ -32,6 +32,9 @@ win32_cSIDL_LOCAL_APPDATA = (#const CSIDL_LOCAL_APPDATA) #endif +win32_cSIDL_COMMON_APPDATA :: Win32.CSIDL+win32_cSIDL_COMMON_APPDATA = (#const CSIDL_COMMON_APPDATA)+ win32_eRROR_INVALID_FUNCTION :: Win32.ErrCode win32_eRROR_INVALID_FUNCTION = 0x1 

@@ -1,6 +1,13 @@ Changelog for the [`directory`][1] package ========================================== +## 1.3.2.0 (January 2018)++  * Relax `time` version bounds to support 1.9.++  * Implement `getXdgDirectoryList` and `XdgDirectoryList`.+    ([#78](https://github.com/haskell/directory/issues/78))+ ## 1.3.1.5 (October 2017)    * Rename the internal header `windows.h` to avoid GHC#14312.

@@ -1,5 +1,5 @@ name:           directory-version:        1.3.1.5+version:        1.3.2.0 -- NOTE: Don't forget to update ./changelog.md license:        BSD3 license-file:   LICENSE@@ -56,7 +56,7 @@      build-depends:         base     >= 4.5 && < 4.12,-        time     >= 1.4 && < 1.9,+        time     >= 1.4 && < 1.10,         filepath >= 1.3 && < 1.5     if os(windows)         build-depends: Win32 >= 2.2.2 && < 2.7@@ -109,4 +109,5 @@         Safe         T8482         WithCurrentDirectory+        Xdg         -- test-modules-end

@@ -29,7 +29,7 @@    where     contents = "This is the data\n"-    mtime = read "2000-01-01 00:00:00"+    mtime = read "2000-01-01 00:00:00Z"      cleanup = do       -- needed to ensure the test runner can clean up our mess

@@ -28,6 +28,7 @@ import qualified Safe import qualified T8482 import qualified WithCurrentDirectory+import qualified Xdg  main :: IO () main = T.testMain $ \ _t -> do@@ -59,3 +60,4 @@   T.isolatedRun _t "Safe" Safe.main   T.isolatedRun _t "T8482" T8482.main   T.isolatedRun _t "WithCurrentDirectory" WithCurrentDirectory.main+  T.isolatedRun _t "Xdg" Xdg.main

@@ -0,0 +1,30 @@+{-# LANGUAGE CPP #-}+module Xdg where+#if !defined(mingw32_HOST_OS) && MIN_VERSION_base(4,7,0)+import System.Environment (setEnv, unsetEnv)+#endif+#include "util.inl"++main :: TestEnv -> IO ()+main _t = do++  -- smoke tests+  _ <- getXdgDirectoryList XdgDataDirs+  _ <- getXdgDirectoryList XdgConfigDirs++  T(expect) () True -- avoid warnings about redundant imports++#if !defined(mingw32_HOST_OS) && MIN_VERSION_base(4,7,0)+  unsetEnv "XDG_DATA_DIRS"+  unsetEnv "XDG_CONFIG_DIRS"+  T(expectEq) () ["/usr/local/share/", "/usr/share/"] =<<+    getXdgDirectoryList XdgDataDirs+  T(expectEq) () ["/etc/xdg"] =<< getXdgDirectoryList XdgConfigDirs++  setEnv "XDG_DATA_DIRS" "/a:/b:/c"+  setEnv "XDG_CONFIG_DIRS" "/d:/e:/f"+  T(expectEq) () ["/a", "/b", "/c"] =<< getXdgDirectoryList XdgDataDirs+  T(expectEq) () ["/d", "/e", "/f"] =<< getXdgDirectoryList XdgConfigDirs+#endif++  return ()