git.iko.soy/typeable/timezone-olson
on master help sign in
.gitignorenew file+16
since splitsnapshots
unifiedsplit
@@ -0,0 +1,16 @@
1+dist
2+cabal-dev
3+*.o
4+*.hi
5+*.chi
6+*.chs.h
7+*.dyn_o
8+*.dyn_hi
9+.virtualenv
10+.hpc
11+.hsenv
12+.cabal-sandbox/
13+cabal.sandbox.config
14+*.prof
15+*.aux
16+*.hp
.travis.ymlnew file+107
@@ -0,0 +1,107 @@
1+# This Travis job script has been generated by a script via
2+#
3+# runghc make_travis_yml_2.hs 'timezone-olson.cabal'
4+#
5+# For more information, see https://github.com/hvr/multi-ghc-travis
6+#
7+language: c
8+sudo: false
9+
10+git:
11+ submodules: false # whether to recursively clone submodules
12+
13+cache:
14+ directories:
15+ - $HOME/.cabal/packages
16+ - $HOME/.cabal/store
17+
18+before_cache:
19+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
20+ # remove files that are regenerated by 'cabal update'
21+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
22+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
23+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
24+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
25+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
26+
27+ - rm -rfv $HOME/.cabal/packages/head.hackage
28+
29+matrix:
30+ include:
31+ - compiler: "ghc-8.0.1"
32+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
33+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.1], sources: [hvr-ghc]}}
34+ - compiler: "ghc-8.0.2"
35+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
36+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
37+ - compiler: "ghc-8.2.1"
38+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
39+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}
40+ - compiler: "ghc-8.2.2"
41+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
42+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
43+ - compiler: "ghc-8.4.1"
44+ # env: TEST=--disable-tests BENCH=--disable-benchmarks
45+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}
46+
47+before_install:
48+ - HC=${CC}
49+ - HCPKG=${HC/ghc/ghc-pkg}
50+ - unset CC
51+ - ROOTDIR=$(pwd)
52+ - mkdir -p $HOME/.local/bin
53+ - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
54+ - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
55+ - echo $HCNUMVER
56+
57+install:
58+ - cabal --version
59+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
60+ - BENCH=${BENCH---enable-benchmarks}
61+ - TEST=${TEST---enable-tests}
62+ - HADDOCK=${HADDOCK-true}
63+ - INSTALLED=${INSTALLED-true}
64+ - GHCHEAD=${GHCHEAD-false}
65+ - travis_retry cabal update -v
66+ - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
67+ - rm -fv cabal.project cabal.project.local
68+ - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
69+ - "printf 'packages: \".\"\\n' > cabal.project"
70+ - cat cabal.project
71+ - if [ -f "./configure.ac" ]; then
72+ (cd "." && autoreconf -i);
73+ fi
74+ - rm -f cabal.project.freeze
75+ - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
76+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
77+ - rm -rf .ghc.environment.* "."/dist
78+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
79+
80+# Here starts the actual work to be performed for the package under test;
81+# any command which exits with a non-zero exit code causes the build to fail.
82+script:
83+ # test that source-distributions can be generated
84+ - (cd "." && cabal sdist)
85+ - mv "."/dist/timezone-olson-*.tar.gz ${DISTDIR}/
86+ - cd ${DISTDIR} || false
87+ - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
88+ - "printf 'packages: timezone-olson-*/*.cabal\\n' > cabal.project"
89+ - cat cabal.project
90+ # this builds all libraries and executables (without tests/benchmarks)
91+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
92+
93+ # Build with installed constraints for packages in global-db
94+ - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
95+
96+ # build & run tests, build benchmarks
97+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all
98+
99+ # cabal check
100+ - (cd timezone-olson-* && cabal check)
101+
102+ # haddock
103+ - rm -rf ./dist-newstyle
104+ - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
105+
106+# REGENDATA ["timezone-olson.cabal"]
107+# EOF
Data/Time/LocalTime/TimeZone/Olson.hs+3−3
@@ -1,7 +1,7 @@
1-----------------------------------------------------------------------------
1-----------------------------------------------------------------------------
2-- |
2-- |
3-- Module : Data.Time.LocalTime.TimeZone.Olson
3-- Module : Data.Time.LocalTime.TimeZone.Olson
4−-- Copyright : Yitzchak Gale 2010
4+-- Copyright : Yitzchak Gale 2018
5--
5--
6-- Maintainer : Yitzchak Gale <gale@sefer.org>
6-- Maintainer : Yitzchak Gale <gale@sefer.org>
7-- Portability : portable
7-- Portability : portable
@@ -9,11 +9,11 @@
9-- A parser and renderer for binary Olson timezone files whose format
9-- A parser and renderer for binary Olson timezone files whose format
10-- are specified by the tzfile(5) man page on Unix-like systems. For
10-- are specified by the tzfile(5) man page on Unix-like systems. For
11-- more information about this format, see
11-- more information about this format, see
12−-- http://www.twinsun.com/tz/tz-link.htm. Functions are provided for
12+-- <http://www.twinsun.com/tz/tz-link.htm>. Functions are provided for
13-- converting the parsed data into @TimeZoneSeries@ and @TimeZone@
13-- converting the parsed data into @TimeZoneSeries@ and @TimeZone@
14-- objects.
14-- objects.
15
15
16−{- Copyright (c) 2010 Yitzchak Gale. All rights reserved.
16+{- Copyright (c) 2018 Yitzchak Gale. All rights reserved.
17For licensing information, see the BSD3-style license in the file
17For licensing information, see the BSD3-style license in the file
18LICENSE that was originally distributed by the author together with
18LICENSE that was originally distributed by the author together with
19this file. -}
19this file. -}
Data/Time/LocalTime/TimeZone/Olson/Parse.hs+46−21
@@ -3,19 +3,18 @@
3-----------------------------------------------------------------------------
3-----------------------------------------------------------------------------
4-- |
4-- |
5-- Module : Data.Time.LocalTime.TimeZone.Olson.Parse
5-- Module : Data.Time.LocalTime.TimeZone.Olson.Parse
6−-- Copyright : Yitzchak Gale 2010
6+-- Copyright : Yitzchak Gale 2018
7--
7--
8-- Maintainer : Yitzchak Gale <gale@sefer.org>
8-- Maintainer : Yitzchak Gale <gale@sefer.org>
9-- Portability : portable
9-- Portability : portable
10--
10--
11−-- A parser for binary Olson timezone files whose format are specified
11+-- A parser for binary Olson timezone files whose format is specified
12-- by the tzfile(5) man page on Unix-like systems. For more
12-- by the tzfile(5) man page on Unix-like systems. For more
13-- information about this format, see
13-- information about this format, see
14−-- http://www.twinsun.com/tz/tz-link.htm. Functions are provided for
14+-- <http://www.twinsun.com/tz/tz-link.htm>. Functions are provided for
15−-- converting the parsed data into @TimeZoneSeries@ and @TimeZone@
15+-- converting the parsed data into 'TimeZoneSeries' objects.
16−-- objects.
17
16
18−{- Copyright (c) 2010 Yitzchak Gale. All rights reserved.
17+{- Copyright (c) 2018 Yitzchak Gale. All rights reserved.
19For licensing information, see the BSD3-style license in the file
18For licensing information, see the BSD3-style license in the file
20LICENSE that was originally distributed by the author together with
19LICENSE that was originally distributed by the author together with
21this file. -}
20this file. -}
@@ -40,9 +39,12 @@ import Data.Binary.Get (Get, runGet, getWord8, getWord32be, getWord64be,
40import qualified Data.ByteString as B
39import qualified Data.ByteString as B
41import qualified Data.ByteString.Lazy as L
40import qualified Data.ByteString.Lazy as L
42import Data.Monoid (mappend)
41import Data.Monoid (mappend)
42+import Data.List (sortBy, groupBy)
43import Data.Maybe (listToMaybe, fromMaybe)
43import Data.Maybe (listToMaybe, fromMaybe)
44import Data.Word (Word8)
44import Data.Word (Word8)
45import Data.Int (Int32, Int64)
45import Data.Int (Int32, Int64)
46+import Data.Ord (comparing)
47+import Data.Function (on)
46import Data.Typeable (Typeable)
48import Data.Typeable (Typeable)
47import Control.Monad (guard, replicateM, replicateM_, when)
49import Control.Monad (guard, replicateM, replicateM_, when)
48import Control.Exception.Extensible (try, throw, Exception, ErrorCall)
50import Control.Exception.Extensible (try, throw, Exception, ErrorCall)
@@ -58,8 +60,8 @@ instance Exception OlsonError
58-- | Convert parsed Olson timezone data into a @TimeZoneSeries@.
60-- | Convert parsed Olson timezone data into a @TimeZoneSeries@.
59olsonToTimeZoneSeries :: OlsonData -> Maybe TimeZoneSeries
61olsonToTimeZoneSeries :: OlsonData -> Maybe TimeZoneSeries
60olsonToTimeZoneSeries (OlsonData ttimes ttinfos@(dflt0:_) _ _) =
62olsonToTimeZoneSeries (OlsonData ttimes ttinfos@(dflt0:_) _ _) =
61− fmap (TimeZoneSeries $ mkTZ dflt) . mapM (lookupTZ ttinfos) $
63+ fmap (TimeZoneSeries $ mkTZ dflt) . mapM (lookupTZ ttinfos) .
62− reverse ttimes
64+ uniqTimes . sortBy futureToPast $ ttimes
63 where
65 where
64 dflt = fromMaybe dflt0 . listToMaybe $ filter isStd ttinfos
66 dflt = fromMaybe dflt0 . listToMaybe $ filter isStd ttinfos
65 isStd (TtInfo _ isdst _ _) = not isdst
67 isStd (TtInfo _ isdst _ _) = not isdst
@@ -68,42 +70,58 @@ olsonToTimeZoneSeries (OlsonData ttimes ttinfos@(dflt0:_) _ _) =
68 lookupTZ ttinfos ttime = fmap (((,) $ toUTC ttime) . mkTZ) . listToMaybe $
70 lookupTZ ttinfos ttime = fmap (((,) $ toUTC ttime) . mkTZ) . listToMaybe $
69 drop (transIndex ttime) ttinfos
71 drop (transIndex ttime) ttinfos
70 toUTC = posixSecondsToUTCTime . fromIntegral . transTime
72 toUTC = posixSecondsToUTCTime . fromIntegral . transTime
73+ uniqTimes = map last . groupBy ((==) `on` transTime)
74+ futureToPast = comparing $ negate . transTime
71olsonToTimeZoneSeries _ = Nothing
75olsonToTimeZoneSeries _ = Nothing
72
76
73-- | Read timezone data from a binary Olson timezone file and convert
77-- | Read timezone data from a binary Olson timezone file and convert
74-- it into a @TimeZoneSeries@ for use together with the types and
78-- it into a @TimeZoneSeries@ for use together with the types and
75-- fucntions of "Data.Time". This is the function from this module
79-- fucntions of "Data.Time". This is the function from this module
76-- for which you are most likely to have use.
80-- for which you are most likely to have use.
81+--
82+-- If the values in the Olson timezone file exceed the standard size
83+-- limits (see 'defaultLimits'), this function throws an
84+-- exception. For other behavior, use 'getOlson' and
85+-- 'Data.Binary.Get.runGet' directly.
77getTimeZoneSeriesFromOlsonFile :: FilePath -> IO TimeZoneSeries
86getTimeZoneSeriesFromOlsonFile :: FilePath -> IO TimeZoneSeries
78getTimeZoneSeriesFromOlsonFile fp = getOlsonFromFile fp >>=
87getTimeZoneSeriesFromOlsonFile fp = getOlsonFromFile fp >>=
79 maybe (throwOlson fp "no timezone found in OlsonData") return .
88 maybe (throwOlson fp "no timezone found in OlsonData") return .
80 olsonToTimeZoneSeries
89 olsonToTimeZoneSeries
81
90
82-- | Parse a binary Olson timezone file.
91-- | Parse a binary Olson timezone file.
92+--
93+-- If the values in the Olson timezone file exceed the standard size
94+-- limits (see 'defaultLimits'), this function throws an
95+-- exception. For other behavior, use 'getOlson' and
96+-- 'Data.Binary.Get.runGet' directly.
83getOlsonFromFile :: FilePath -> IO OlsonData
97getOlsonFromFile :: FilePath -> IO OlsonData
84getOlsonFromFile fp = do
98getOlsonFromFile fp = do
85− e <- try . fmap (runGet getOlson) $ L.readFile fp
99+ e <- try . fmap (runGet $ getOlson defaultLimits) $ L.readFile fp
86 either (formatError fp) return e
100 either (formatError fp) return e
87
101
88formatError :: FilePath -> ErrorCall -> IO a
102formatError :: FilePath -> ErrorCall -> IO a
89formatError fp e = throwOlson fp $ show e
103formatError fp e = throwOlson fp $ show e
90
104
91-- | A binary parser for binary Olson timezone files
105-- | A binary parser for binary Olson timezone files
92−getOlson :: Get OlsonData
106+getOlson :: SizeLimits -> Get OlsonData
93−getOlson = do
107+getOlson limits = do
94− (version, part1) <- getOlsonPart True get32bitInteger
108+ (version, part1) <- getOlsonPart True limits get32bitInteger
95 -- There is one part for Version 1 format data, and two parts and a POSIX
109 -- There is one part for Version 1 format data, and two parts and a POSIX
96− -- TZ string for Version 2 format data
110+ -- TZ string for Version 2 or 3 format data
97− case version of
111+ case () of
98− 0 -> return part1
112+ _ | version == 0 -> return part1
113+ | version == 50 || version == 51 -> do
99− 50 -> do (_, part2) <- getOlsonPart False get64bitInteger
114+ (_, part2) <- getOlsonPart False limits get64bitInteger
100− posixTZ <- getPosixTZ
115+ posixTZ <- getPosixTZ
101− return $ part1 `mappend` part2 `mappend` posixTZ
116+ return $ part1 `mappend` part2 `mappend` posixTZ
117+ | otherwise -> do
118+ let msg = "getOlson: invalid tzfile version " ++ toASCII [version]
102− _ -> verify (const False) "invalid version number" undefined
119+ verify (const False) msg undefined
103
120
104-- Parse the part of an Olson file that contains timezone data
121-- Parse the part of an Olson file that contains timezone data
105−getOlsonPart :: Integral a => Bool -> Get a -> Get (Word8, OlsonData)
122+getOlsonPart :: Integral a => Bool -> SizeLimits -> Get a ->
123+ Get (Word8, OlsonData)
106−getOlsonPart verifyMagic getTime = do
124+getOlsonPart verifyMagic limits getTime = do
107 magic <- fmap (toASCII . B.unpack) $ getByteString 4
125 magic <- fmap (toASCII . B.unpack) $ getByteString 4
108 when verifyMagic $ verify_ (== "TZif") "missing magic number" magic
126 when verifyMagic $ verify_ (== "TZif") "missing magic number" magic
109 version <- getWord8
127 version <- getWord8
@@ -111,9 +129,15 @@ getOlsonPart verifyMagic getTime = do
111 tzh_ttisgmtcnt <- get32bitInt
129 tzh_ttisgmtcnt <- get32bitInt
112 tzh_ttisstdcnt <- get32bitInt
130 tzh_ttisstdcnt <- get32bitInt
113 tzh_leapcnt <- get32bitInt
131 tzh_leapcnt <- get32bitInt
132+ >>= verify (withinLimit maxLeaps) "too many leap second specifications"
114 tzh_timecnt <- get32bitInt
133 tzh_timecnt <- get32bitInt
134+ >>= verify (withinLimit maxTimes) "too many timezone transitions"
115 tzh_typecnt <- get32bitInt
135 tzh_typecnt <- get32bitInt
136+ >>= verify (withinLimit maxTypes) "too many timezone type specifications"
137+ verify (withinLimit maxTypes) "too many isgmt specifiers" tzh_ttisgmtcnt
138+ verify (withinLimit maxTypes) "too many isstd specifiers" tzh_ttisstdcnt
116 tzh_charcnt <- get32bitInt
139 tzh_charcnt <- get32bitInt
140+ >>= verify (withinLimit maxAbbrChars) "too many tilezone specifiers"
117 times <- fmap (map toInteger) $ replicateM tzh_timecnt getTime
141 times <- fmap (map toInteger) $ replicateM tzh_timecnt getTime
118 indexes <- replicateM tzh_timecnt get8bitInt
142 indexes <- replicateM tzh_timecnt get8bitInt
119 ttinfos <- replicateM tzh_typecnt getTtInfo
143 ttinfos <- replicateM tzh_typecnt getTtInfo
@@ -131,6 +155,7 @@ getOlsonPart verifyMagic getTime = do
131 Nothing
155 Nothing
132 )
156 )
133 where
157 where
158+ withinLimit limit value = maybe True (value <=) $ limit limits
134 lookupAbbr (TtInfo gmtoff isdst ttype abbrind) =
159 lookupAbbr (TtInfo gmtoff isdst ttype abbrind) =
135 TtInfo gmtoff isdst ttype . takeWhile (/= '\NUL') . drop abbrind
160 TtInfo gmtoff isdst ttype . takeWhile (/= '\NUL') . drop abbrind
136 setTtype ttinfo ttype = ttinfo {tt_ttype = ttype}
161 setTtype ttinfo ttype = ttinfo {tt_ttype = ttype}
Data/Time/LocalTime/TimeZone/Olson/Render.hs+81−60
@@ -2,17 +2,17 @@
2-----------------------------------------------------------------------------
2-----------------------------------------------------------------------------
3-- |
3-- |
4-- Module : Data.Time.LocalTime.TimeZone.Olson.Render
4-- Module : Data.Time.LocalTime.TimeZone.Olson.Render
5−-- Copyright : Yitzchak Gale 2010
5+-- Copyright : Yitzchak Gale 2018
6--
6--
7-- Maintainer : Yitzchak Gale <gale@sefer.org>
7-- Maintainer : Yitzchak Gale <gale@sefer.org>
8-- Portability : portable
8-- Portability : portable
9--
9--
10−-- Render Olson timezone data in the standard binary format as
10+-- Render Olson timezone data in the standard binary format as used in
11−-- used in Olson timezone files, and as specified by the
11+-- Olson timezone files, and as specified by the tzfile(5) man page on
12−-- tzfile(5) man page on Unix-like systems. For more information
12+-- Unix-like systems. For more information about this format, see
13−-- about this format, see http://www.twinsun.com/tz/tz-link.htm.
13+-- <http://www.twinsun.com/tz/tz-link.htm>.
14
14
15−{- Copyright (c) 2010 Yitzchak Gale. All rights reserved.
15+{- Copyright (c) 2018ZZ Yitzchak Gale. All rights reserved.
16For licensing information, see the BSD3-style license in the file
16For licensing information, see the BSD3-style license in the file
17LICENSE that was originally distributed by the author together with
17LICENSE that was originally distributed by the author together with
18this file. -}
18this file. -}
@@ -28,8 +28,9 @@ module Data.Time.LocalTime.TimeZone.Olson.Render
28 renderTimeZoneSeriesToOlsonFile,
28 renderTimeZoneSeriesToOlsonFile,
29 timeZoneSeriesToOlson,
29 timeZoneSeriesToOlson,
30 renderOlsonToFile,
30 renderOlsonToFile,
31+ verifyOlsonLimits,
31 putOlson,
32 putOlson,
32− splitOlson
33+ extractOlsonV1
33)
34)
34where
35where
35
36
@@ -46,9 +47,15 @@ import Data.Ord (comparing)
46import Data.Word (Word8)
47import Data.Word (Word8)
47import Data.Maybe (listToMaybe, maybeToList, isNothing, fromMaybe, catMaybes)
48import Data.Maybe (listToMaybe, maybeToList, isNothing, fromMaybe, catMaybes)
48import Data.Monoid (mempty)
49import Data.Monoid (mempty)
49−import Control.Monad (guard, replicateM_)
50+import Control.Monad (guard, replicateM_, unless)
50
51
51-- | Render a @TimeZoneSeries@ as a binary Olson timezone file.
52-- | Render a @TimeZoneSeries@ as a binary Olson timezone file.
53+--
54+-- If the values in the Olson timezone data exceed the standard size
55+-- limits (see 'defaultLimits'), this function throws an
56+-- exception. For other behavior, use 'timeZoneSeriesToOlson',
57+-- 'verifyOlsonLimits', 'putOlson' and 'Data.Binary.Put.runPut'
58+-- directly.
52renderTimeZoneSeriesToOlsonFile :: FilePath -> TimeZoneSeries -> IO ()
59renderTimeZoneSeriesToOlsonFile :: FilePath -> TimeZoneSeries -> IO ()
53renderTimeZoneSeriesToOlsonFile fp = renderOlsonToFile fp .
60renderTimeZoneSeriesToOlsonFile fp = renderOlsonToFile fp .
54 fromMaybe (error "Cannot render TimeZoneSeries: default is summer time") .
61 fromMaybe (error "Cannot render TimeZoneSeries: default is summer time") .
@@ -62,9 +69,9 @@ timeZoneSeriesToOlson (TimeZoneSeries dflt pairs)
62 | otherwise = Just $
69 | otherwise = Just $
63 OlsonData
70 OlsonData
64 [Transition secs ttinfo |
71 [Transition secs ttinfo |
65− (t, tzs) <- reverse pairs,
72+ (t, tz) <- reverse pairs,
66 let secs = round $ utcTimeToPOSIXSeconds t,
73 let secs = round $ utcTimeToPOSIXSeconds t,
67− ttinfo <- maybeToList $ lookup (mkTT tzs) ttAssocs]
74+ ttinfo <- maybeToList $ lookup (mkTT tz) ttAssocs]
68 ttinfos
75 ttinfos
69 []
76 []
70 Nothing
77 Nothing
@@ -76,72 +83,79 @@ timeZoneSeriesToOlson (TimeZoneSeries dflt pairs)
76 zip (uniq . sort . filter (/= dfltTT) $ map (mkTT . snd) pairs) [1..]
83 zip (uniq . sort . filter (/= dfltTT) $ map (mkTT . snd) pairs) [1..]
77 ttinfos = map fst ttAssocs
84 ttinfos = map fst ttAssocs
78
85
86+-- | Check whether @OlsonData@ is within size limits.
87+verifyOlsonLimits :: SizeLimits -> OlsonData -> Bool
88+verifyOlsonLimits limits (OlsonData transs ttinfos leaps _) =
89+ withinLimit maxTimes transs &&
90+ withinLimit maxTypes ttinfos &&
91+ withinLimit maxLeaps leaps &&
92+ withinLimit maxAbbrChars abbrChars
93+ where
94+ withinLimit limit items = maybe True (null . flip drop items) $
95+ limit limits
96+ abbrChars = concat abbrStrs ++ map (const '\NUL') abbrStrs
97+ abbrStrs = map tt_abbr ttinfos
98+
79-- | Render Olson timezone data as a binary Olson timezone file
99-- | Render Olson timezone data as a binary Olson timezone file
100+--
101+-- If the values in the Olson timezone data exceed the standard size
102+-- limits (see 'defaultLimits'), this function throws an
103+-- exception. For other behavior, use 'verifyOlsonLimits', 'putOlson'
104+-- and 'Data.Binary.Put.runPut' directly.
80renderOlsonToFile :: FilePath -> OlsonData -> IO ()
105renderOlsonToFile :: FilePath -> OlsonData -> IO ()
106+renderOlsonToFile fp olson = do
107+ unless (verifyOlsonLimits defaultLimits olson) $
108+ error "Olson timezone data exceeds size limits"
81−renderOlsonToFile fp = L.writeFile fp . runPut . putOlson
109+ L.writeFile fp . runPut . putOlson $ olson
82
110
83-- | Render Olson timezone data in binary Olson timezone file format
111-- | Render Olson timezone data in binary Olson timezone file format
84-- as a lazy @ByteString@
112-- as a lazy @ByteString@
85−putOlson :: OlsonData -> Put
113+putOlson olson@(OlsonData _ _ _ posix)
86−putOlson olson = putOlsonParts version olson1 olson2 posix >> flush
114+ | fitsInVersion1 = putOlsonPart 0 put32bitIntegral olson
115+ | otherwise = do putOlsonPart 50 put32bitIntegral olson1
116+ putOlsonPart 50 put64bitIntegral olson
117+ putPosixTZ posix
87 where
118 where
88− (olson1, olson2, posix) = splitOlson olson
119+ olson1 = extractOlsonV1 olson
89− version
120+ fitsInVersion1 = fmap null posix /= Just False &&
90− | olson2 /= mempty = 50
121+ olson1 == olson {olsonPosixTZ = Nothing}
91− | otherwise = maybe 0 (const 50) $ posix >>= guard . not . null
122+
92−
93−-- | Split Olson timezone data into three parts: timezone data that can
94−-- be rendered using Version 1 format, timezone data that can only be
123+-- | Extract Olson timezone data that can be rendered using Version 1 format
95−-- rendered using Version 2 format, and the POSIX-style TZ string
96−-- if specified
97−splitOlson :: OlsonData -> (OlsonData, OlsonData, Maybe String)
124+extractOlsonV1 :: OlsonData -> OlsonData
125+extractOlsonV1 (OlsonData transs ttinfos leaps _)
98−splitOlson (OlsonData transs ttinfos leaps posix) =
126+ | allV1 = OlsonData transs ttinfos leaps Nothing
99− (OlsonData transs1 ttinfos1 leaps1 Nothing,
127+ | otherwise = OlsonData transs1 ttinfos1 leaps1 Nothing
100− OlsonData transs2 ttinfos2 leaps2 Nothing,
101− posix)
102 where
128 where
103 cutoff = 0x80000000 -- 2^31
129 cutoff = 0x80000000 -- 2^31
104 fitsIn32bits x = x < cutoff && x >= negate cutoff
130 fitsIn32bits x = x < cutoff && x >= negate cutoff
105− ( leaps1 , leaps2 ) = partition (fitsIn32bits . leapTime) leaps
131+ leaps1 = filter (fitsIn32bits . leapTime) leaps
106− (transs1', transs2') = partition (fitsIn32bits . transTime) transs
132+ transs1' = filter (fitsIn32bits . transTime) transs
107− assoc1 = mkAssoc [0] transs1'
133+ allV1 = length leaps1 == length leaps && length transs1' == length transs
108− assoc2 = mkAssoc [] transs2'
134+ assoc1 = zip
109− transs1 = mkTranss transs1' assoc1
110− transs2 = mkTranss transs2' assoc2
111− ttinfos1 = mkTtinfos assoc1
112− ttinfos2 = mkTtinfos assoc2
113− mkAssoc prepend transs' = zip
114 (sortBy (comparing $ fmap tt_ttype . listToMaybe . flip drop ttinfos) .
135 (sortBy (comparing $ fmap tt_ttype . listToMaybe . flip drop ttinfos) .
115− uniq . sort . (prepend ++) $ map transIndex transs')
136+ uniq . sort . (0 :) $ map transIndex transs1')
116 [0..]
137 [0..]
117− mkTranss transs' assoc = [t {transIndex = i} |
138+ transs1 = [t {transIndex = i} |
118− t <- transs', i <- maybeToList $ lookup (transIndex t) assoc]
139+ t <- transs1', i <- maybeToList $ lookup (transIndex t) assoc1]
119− mkTtinfos assoc = map snd . dropWhile (isNothing . fst) .
140+ ttinfos1 = map snd . dropWhile (isNothing . fst) .
120− sortBy (comparing fst) $ zip (map (flip lookup assoc) [0..]) ttinfos
141+ sortBy (comparing fst) $ zip (map (flip lookup assoc1) [0..]) ttinfos
121−
122−putOlsonParts :: Word8 -> OlsonData -> OlsonData -> Maybe String -> Put
123−putOlsonParts 0 olson1 _ _ = putOlsonPart 0 put32bitIntegral olson1
124−putOlsonParts v2 olson1 olson2 posix = do
125− putOlsonPart v2 put32bitIntegral olson1
126− putOlsonPart v2 put64bitIntegral olson2
127− putPosixTZ posix
128
142
129putOlsonPart :: Word8 -> (Integer -> Put) -> OlsonData -> Put
143putOlsonPart :: Word8 -> (Integer -> Put) -> OlsonData -> Put
130putOlsonPart version putTime (OlsonData transs ttinfos leaps _) = do
144putOlsonPart version putTime (OlsonData transs ttinfos leaps _) = do
131− putASCII "TZif"
145+ putASCII "magic number" "TZif"
132 putWord8 version
146 putWord8 version
133 putByteString . B.pack $ replicate 15 0 -- padding nulls
147 putByteString . B.pack $ replicate 15 0 -- padding nulls
134 replicateM_ 2 $ putCount ttinfosWithTtype
148 replicateM_ 2 $ putCount ttinfosWithTtype
135− -- tzh_ttisgmtcnt
149+ -- tzh_ttisgmtcnt
136− -- tzh_ttisstdcnt
150+ -- tzh_ttisstdcnt
137− putCount leaps -- tzh_leapcnt
151+ putCount leaps -- tzh_leapcnt
138− putCount transs -- tzh_timecnt
152+ putCount transs -- tzh_timecnt
139− putCount ttinfos -- tzh_typecnt
153+ putCount ttinfos -- tzh_typecnt
140− putCount abbrChars -- tzh_charcnt
154+ put32bitIntegral abbrChars -- tzh_charcnt
141 mapM_ (putTime . transTime ) transs
155 mapM_ (putTime . transTime ) transs
142 mapM_ (put8bitIntegral . transIndex) transs
156 mapM_ (put8bitIntegral . transIndex) transs
143 mapM_ putTtInfo ttinfosIndexed
157 mapM_ putTtInfo ttinfosIndexed
144− putASCII abbrChars
158+ mapM_ putAbbr abbrStrings
145 mapM_ (putLeapInfo putTime) leaps
159 mapM_ (putLeapInfo putTime) leaps
146 mapM_ (putBool . (== Std) . tt_ttype) ttinfosWithTtype -- isstd
160 mapM_ (putBool . (== Std) . tt_ttype) ttinfosWithTtype -- isstd
147 mapM_ (putBool . (== UTC) . tt_ttype) ttinfosWithTtype -- isgmt
161 mapM_ (putBool . (== UTC) . tt_ttype) ttinfosWithTtype -- isgmt
@@ -149,7 +163,8 @@ putOlsonPart version putTime (OlsonData transs ttinfos leaps _) = do
149 putCount = put32bitIntegral . length
163 putCount = put32bitIntegral . length
150 ttinfosWithTtype = takeWhile ((<= UTC) . tt_ttype) ttinfosIndexed
164 ttinfosWithTtype = takeWhile ((<= UTC) . tt_ttype) ttinfosIndexed
151 abbrStrings = uniq . sort $ map tt_abbr ttinfos
165 abbrStrings = uniq . sort $ map tt_abbr ttinfos
152− abbrChars = concatMap (++ "\NUL") abbrStrings
166+ abbrChars = sum (map length abbrStrings) + length abbrStrings
167+ putAbbr abbr = putASCII "time zone abbreviation" abbr >> putWord8 0
153 abbrAssocs = zip abbrStrings . scanl (+) 0 $
168 abbrAssocs = zip abbrStrings . scanl (+) 0 $
154 map ((+ 1) . length) abbrStrings
169 map ((+ 1) . length) abbrStrings
155 ttinfosIndexed = [TtInfo gmtoff isdst ttype i |
170 ttinfosIndexed = [TtInfo gmtoff isdst ttype i |
@@ -159,7 +174,7 @@ putOlsonPart version putTime (OlsonData transs ttinfos leaps _) = do
159putPosixTZ :: Maybe String -> Put
174putPosixTZ :: Maybe String -> Put
160putPosixTZ posix = do
175putPosixTZ posix = do
161 putWord8 10
176 putWord8 10
162− putASCII $ fromMaybe "" posix
177+ putASCII "POSIX TZ string"$ fromMaybe "" posix
163 putWord8 10
178 putWord8 10
164
179
165putTtInfo :: TtInfo Int -> Put
180putTtInfo :: TtInfo Int -> Put
@@ -192,5 +207,11 @@ putBool True = putWord8 1
192uniq :: Eq a => [a] -> [a]
207uniq :: Eq a => [a] -> [a]
193uniq = map head . group
208uniq = map head . group
194
209
195−putASCII :: String -> Put
210+putASCII :: String -> String -> Put
211+putASCII what =
196−putASCII = putByteString . B.pack . map (fromIntegral . fromEnum)
212+ putByteString . B.pack . map (fromIntegral . verify . fromEnum)
213+ where
214+ verify c
215+ | c >= 32 && c <= 126 = c
216+ | otherwise = error $ "Cannot render TimeZoneSeries: " ++
217+ what ++ " contains non-ASCII characters"
Data/Time/LocalTime/TimeZone/Olson/Types.hs+89−22
@@ -1,8 +1,9 @@
1{-# OPTIONS_HADDOCK hide #-}
1{-# OPTIONS_HADDOCK hide #-}
2+{-# LANGUAGE CPP #-}
2-----------------------------------------------------------------------------
3-----------------------------------------------------------------------------
3-- |
4-- |
4-- Module : Data.Time.LocalTime.TimeZone.Olson.Types
5-- Module : Data.Time.LocalTime.TimeZone.Olson.Types
5−-- Copyright : Yitzchak Gale 2010
6+-- Copyright : Yitzchak Gale 2018
6--
7--
7-- Maintainer : Yitzchak Gale <gale@sefer.org>
8-- Maintainer : Yitzchak Gale <gale@sefer.org>
8-- Portability : portable
9-- Portability : portable
@@ -10,11 +11,11 @@
10-- Data types to represent timezone data as used in Olson timezone
11-- Data types to represent timezone data as used in Olson timezone
11-- files, and as specified by the tzfile(5) man page on Unix-like
12-- files, and as specified by the tzfile(5) man page on Unix-like
12-- systems. For more information about this format, see
13-- systems. For more information about this format, see
13−-- http://www.twinsun.com/tz/tz-link.htm.
14+-- <http://www.twinsun.com/tz/tz-link.htm>.
14--
15--
15-- Both Version 1 and Version 2 timezone data can be represented.
16-- Both Version 1 and Version 2 timezone data can be represented.
16
17
17−{- Copyright (c) 2010 Yitzchak Gale. All rights reserved.
18+{- Copyright (c) 2018 Yitzchak Gale. All rights reserved.
18For licensing information, see the BSD3-style license in the file
19For licensing information, see the BSD3-style license in the file
19LICENSE that was originally distributed by the author together with
20LICENSE that was originally distributed by the author together with
20this file. -}
21this file. -}
@@ -26,38 +27,73 @@ module Data.Time.LocalTime.TimeZone.Olson.Types
26 Transition(..),
27 Transition(..),
27 TransitionType(..),
28 TransitionType(..),
28 TtInfo(..),
29 TtInfo(..),
29− LeapInfo(..)
30+ LeapInfo(..),
31+
32+ -- ** Size limits for Olson timezone data
33+ SizeLimits(..),
34+ defaultLimits,
35+ limitsNoSolar,
36+ noLimits
30)
37)
31where
38where
32
39
40+#if MIN_VERSION_base(4,11,0)
41+import Data.Semigroup (Semigroup(..))
42+#endif
33import Data.Monoid (Monoid(..))
43import Data.Monoid (Monoid(..))
34import Control.Monad (mplus)
44import Control.Monad (mplus)
35
45
36-- | @OlsonData@ represents a full set of timezone data for a location.
46-- | @OlsonData@ represents a full set of timezone data for a location.
37--
47--
38−-- @OlsonData@ can represent timezone data from files in Version 1 format
48+-- @OlsonData@ can represent timezone data from files in Version 1, 2,
49+-- or 3 format.
50+--
39−-- or Version 2 format. Version 1 format files can only contain timestamp
51+-- Version 1 format files can only contain timestamp values that can
40−-- values that can be represented in less than 32 bits, and cannot contain
52+-- be represented in less than 32 bits, and cannot contain a POSIX TZ
41−-- a POSIX TZ string.
53+-- string.
54+--
55+-- In a Version 2 format file, the timezone data is split into two
56+-- parts. The first part contains timezone data for which all
57+-- timestamp values can be represented in less than 32 bits, and the
58+-- second part contains timezone data for which 32 bits or more are
59+-- required to represent timestamp values. The POSIX TZ string, if
60+-- present, can only be rendered in a Version 2 file, and appears
61+-- after both parts of the timezone data.
42--
62--
43−-- In a Version 2 format file, the timezone data is split into two parts.
63+-- Version 3 format files relax certain syntax requirements for the
44−-- The first part contains timezone data for which all timestamp values
64+-- POSIX TZ string. Since we represent the POSIX TZ string as an
45−-- can be represented in less than 32 bits, and the second part contains
65+-- unparsed 'String', Version 3 is identical to Version 2 for our
46−-- timezone data for which 32 bits or more are required to represent
66+-- purposes.
47−-- timestamp values. The POSIX TZ string, if present, can only be rendered
48−-- in a Version 2 file, and appears after both parts of the timezone data.
49data OlsonData =
67data OlsonData =
50− OlsonData
68+ OlsonData {
51− [Transition]
69+ olsonTransitions :: [Transition],
52− [TtInfo String]
70+ olsonTypes :: [TtInfo String],
53− [LeapInfo]
71+ olsonLeaps :: [LeapInfo],
72+ olsonPosixTZ :: (Maybe String)
54− (Maybe String) -- ^ Optional POSIX TZ string for the last @Transition@
73+ -- ^ Optional POSIX TZ string for
74+ -- times after the last @Transition@
75+ }
55 deriving (Eq, Show)
76 deriving (Eq, Show)
56
77
78+#if MIN_VERSION_base(4,11,0)
79+instance Semigroup OlsonData where
80+ OlsonData a b c d <> OlsonData a' b' c' d' =
81+ OlsonData (a ++ map (shiftBy $ length b) a')
82+ (b ++ b') (c ++ c') (d `mplus` d')
83+ where
84+ shiftBy n trans = trans {transIndex = n + transIndex trans}
85+
86+instance Monoid OlsonData where
87+ mempty = OlsonData [] [] [] Nothing
88+#else
57instance Monoid OlsonData where
89instance Monoid OlsonData where
58 mempty = OlsonData [] [] [] Nothing
90 mempty = OlsonData [] [] [] Nothing
59− mappend (OlsonData a b c d ) (OlsonData a' b' c' d')
91+ mappend (OlsonData a b c d ) (OlsonData a' b' c' d') =
60− = OlsonData (a++a') (b++b') (c++c') (d `mplus` d')
92+ OlsonData (a ++ map (shiftBy $ length b) a')
93+ (b ++ b') (c ++ c') (d `mplus` d')
94+ where
95+ shiftBy n trans = trans {transIndex = n + transIndex trans}
96+#endif
61
97
62-- | A @Transition@ represents a moment when the clocks change in a
98-- | A @Transition@ represents a moment when the clocks change in a
63-- timezone. It consists of a Unix timestamp value that indicates the
99-- timezone. It consists of a Unix timestamp value that indicates the
@@ -100,7 +136,7 @@ data TtInfo abbr =
100 deriving (Eq, Ord, Show)
136 deriving (Eq, Ord, Show)
101
137
102-- | Olson timezone files can contain leap second specifications, though
138-- | Olson timezone files can contain leap second specifications, though
103−-- the official files have not done so since the late 1980s.
139+-- most do not.
104data LeapInfo =
140data LeapInfo =
105 LeapInfo
141 LeapInfo
106 {leapTime :: Integer, -- ^ A Unix timestamp indicating the time
142 {leapTime :: Integer, -- ^ A Unix timestamp indicating the time
@@ -109,3 +145,34 @@ data LeapInfo =
109 -- after this leap second
145 -- after this leap second
110 }
146 }
111 deriving (Eq, Show)
147 deriving (Eq, Show)
148+
149+-- | The reference C implentation imposes size limits on the data
150+-- structures in a timezone file.
151+data SizeLimits = SizeLimits
152+ {maxTimes :: Maybe Int, -- ^ The maximum number of transition times
153+ maxTypes :: Maybe Int, -- ^ The maximum number of TtInfo
154+ -- clock settings
155+ maxAbbrChars :: Maybe Int, -- ^ The maximum total number of bytes in
156+ -- all timezone abbreviations.
157+ maxLeaps :: Maybe Int -- ^ The maximum number of leap second
158+ -- specifications.
159+ }
160+
161+-- | The size limits in @defaultLimits@ are taken from the file
162+-- tzfile.h from tzcode version 2010f. These are the limits for the C
163+-- implementation on many platforms.
164+defaultLimits :: SizeLimits
165+defaultLimits = SizeLimits { maxTimes = Just 1200, maxTypes = Just 256,
166+ maxAbbrChars = Just 50, maxLeaps = Just 50 }
167+
168+-- | @limitsNoSolar@ contains the tighter size limits imposed on some
169+-- platforms that do not allow timezones that are based on solar time.
170+limitsNoSolar :: SizeLimits
171+limitsNoSolar = defaultLimits { maxTypes = Just 20 }
172+
173+-- | @noLimits@ imposes no size limits. If you use @noLimits@ when
174+-- parsing, you may exhaust all available memory when reading a faulty
175+-- or malicious timezone file. If you use @noLimits@ when rendering,
176+-- the rendered timezone file might not be readable on some systems.
177+noLimits :: SizeLimits
178+noLimits = SizeLimits Nothing Nothing Nothing Nothing
LICENSE+1−1
@@ -1,4 +1,4 @@
1−Copyright (c) 2010 Yitzchak Gale. All rights reserved.
1+Copyright (c) 2010-2018 Yitzchak Gale. All rights reserved.
2
2
3Redistribution and use in source and binary forms, with or without
3Redistribution and use in source and binary forms, with or without
4modification, are permitted provided that the following conditions are
4modification, are permitted provided that the following conditions are
README.mdnew file+43
@@ -0,0 +1,43 @@
1+# timezone-olson
2+
3+On Hackage: [timezone-olson](http://hackage.haskell.org/package/timezone-olson)
4+
5+This package provides a parser and renderer for binary Olson timezone
6+files whose format is specified by the tzfile(5) man page on Unix-like
7+systems. For more information about this format, see
8+[the IANA timezone database site](https://www.iana.org/time-zones).
9+
10+Functions are provided for
11+converting the parsed data into `TimeZoneSeries` objects from the
12+[timezone-series](http://hackage.haskell.org/package/timezone-series)
13+package. On many platforms, binary Olson timezone
14+files suitable for use with this package are available in the
15+directory `/usr/share/zoneinfo` and its subdirectories on your computer.
16+
17+See also the
18+[timezone-olson-th](http://hackage.haskell.org/package/timezone-olson-th)
19+package for a way to include timezone informaton from a binary Olson
20+timezone file at compile time.
21+
22+Copyright (c) 2010-2018 Yitzchak Gale. All rights reserved.
23+
24+For licensing information, see the BSD3-style license in the file
25+LICENSE that was originally distributed by the author together with
26+this file.
27+
28+This package is part of the [time-ng project](http://projects.haskell.org/time-ng/).
29+
30+## Testing utilities
31+
32+This package also provides two Haskell files, each of which can be
33+compiled into a command-line utility that might be helpful for testing
34+purposes.
35+
36+zhdump.hs: A clone of zdump(8), including most of its bugs, that
37+ is usually present on systems that have an Olson timezone
38+ database, except hzdump takes paths to timezone files
39+ instead of timezone identifiers on the command line.
40+
41+catTZ: Read and parse a timezone file, then render it. With the
42+ -i flag, interprets the timezone data as a TimeZoneSeries
43+ object before rendering.
Setup.hsnew file+2
@@ -0,0 +1,2 @@
1+import Distribution.Simple
2+main = defaultMain
catTZ.hsnew file+14
@@ -0,0 +1,14 @@
1+-- | Parse an Olson timezone file, then render it.
2+-- If -i is specified, interpret it as a TimeZoneSeries before rendering.
3+module Main where
4+
5+import Data.Time.LocalTime.TimeZone.Olson
6+import Data.Time.LocalTime.TimeZone.Series
7+import System.Environment
8+
9+main = do
10+ args <- getArgs
11+ if head args == "-i"
12+ then getTimeZoneSeriesFromOlsonFile (args !! 1) >>=
13+ renderTimeZoneSeriesToOlsonFile (args !! 2)
14+ else getOlsonFromFile (args !! 0) >>= renderOlsonToFile (args !! 1)
hzdump.hs+22−9
@@ -15,6 +15,7 @@ import Data.Maybe (listToMaybe)
15import System.Environment (getArgs)
15import System.Environment (getArgs)
16import System.Exit (exitWith, exitSuccess, ExitCode(ExitFailure))
16import System.Exit (exitWith, exitSuccess, ExitCode(ExitFailure))
17import System.Locale (defaultTimeLocale)
17import System.Locale (defaultTimeLocale)
18+import Control.Monad (guard)
18
19
19version :: IO a
20version :: IO a
20version = do
21version = do
@@ -33,7 +34,8 @@ illegalOpt opt = do
33 putStrLn $ "hzdump: illegal option -- " ++ [opt]
34 putStrLn $ "hzdump: illegal option -- " ++ [opt]
34 usage
35 usage
35
36
36−data Option = Version | Illegal Char | Verbose (Maybe Integer) | Now
37+data Option = Version | Illegal Char |
38+ Verbose (Maybe Integer, Maybe Integer) | Now
37 deriving (Eq, Ord, Show)
39 deriving (Eq, Ord, Show)
38
40
39main = do
41main = do
@@ -41,7 +43,7 @@ main = do
41 (getTimes, displayTime) <- case opts of
43 (getTimes, displayTime) <- case opts of
42 Version -> version
44 Version -> version
43 Illegal opt -> illegalOpt opt
45 Illegal opt -> illegalOpt opt
44− Verbose yr -> return (transitionTimesUntil yr, displayVerbose)
46+ Verbose rng -> return (transitionTimes rng, displayVerbose)
45 _ -> do now <- getCurrentTime
47 _ -> do now <- getCurrentTime
46 return (const [now], displayConcise)
48 return (const [now], displayConcise)
47 tzss <- mapM getZone zones
49 tzss <- mapM getZone zones
@@ -56,17 +58,26 @@ main = do
56
58
57parseArgs :: [String] -> (Option, [FilePath])
59parseArgs :: [String] -> (Option, [FilePath])
58parseArgs args | "--version" `elem` args = (Version, [])
60parseArgs args | "--version" `elem` args = (Version, [])
59−parseArgs args = getOpts False Nothing args
61+parseArgs args = getOpts False (Nothing, Nothing) args
60 where
62 where
61 getOpts _ cutoff ("-v":args) = getOpts True cutoff args
63 getOpts _ cutoff ("-v":args) = getOpts True cutoff args
62− getOpts v Nothing ("-c":c:args) = maybe (Illegal 'c', [])
64+ getOpts v _ ("-c":c:args) = maybe (Illegal 'c', [])
63− (\y -> getOpts v (Just y) args) $
65+ (\y -> getOpts v y args) $
64− maybeRead c
66+ parseCutoff c
65 getOpts v cutoff ("--":zones ) = (opts v cutoff, zones)
67 getOpts v cutoff ("--":zones ) = (opts v cutoff, zones)
66 getOpts _ _ (('-':x:_):_) = (Illegal x, [])
68 getOpts _ _ (('-':x:_):_) = (Illegal x, [])
67 getOpts v cutoff zones = (opts v cutoff, zones)
69 getOpts v cutoff zones = (opts v cutoff, zones)
70+
68 opts v cutoff = if v then Verbose cutoff else Now
71 opts v cutoff = if v then Verbose cutoff else Now
69
72
73+ parseCutoff c = let p0 = listToMaybe $ reads c
74+ los = fmap fst p0
75+ his = do str <- fmap snd p0
76+ let (comma, str1) = splitAt 1 str
77+ guard $ comma == ","
78+ maybeRead str1
79+ in los >> Just (maybe (Nothing, los) ((,) los . Just) his)
80+
70displayConcise :: TimeZoneSeries -> UTCTime -> String
81displayConcise :: TimeZoneSeries -> UTCTime -> String
71displayConcise tzs t = formatTime defaultTimeLocale format $
82displayConcise tzs t = formatTime defaultTimeLocale format $
72 ZoneSeriesTime t tzs
83 ZoneSeriesTime t tzs
@@ -79,9 +90,11 @@ displayVerbose tzs t = concat [displayConcise utcTZ t, " = ",
79 where
90 where
80 isdst = timeZoneSummerOnly $ timeZoneFromSeries tzs t
91 isdst = timeZoneSummerOnly $ timeZoneFromSeries tzs t
81
92
82−transitionTimesUntil :: Maybe Integer -> TimeZoneSeries -> [UTCTime]
93+transitionTimes :: (Maybe Integer, Maybe Integer) -> TimeZoneSeries ->
83−transitionTimesUntil yr =
94+ [UTCTime]
95+transitionTimes (lo, hi) =
96+ maybe id (takeWhile . (>)) (fmap happyNewYear hi) .
84− maybe id (dropWhile . (>=)) (fmap happyNewYear yr) .
97+ maybe id (dropWhile . (>)) (fmap happyNewYear lo) .
85 addBugs . addPrevSecond . actualTransitions
98 addBugs . addPrevSecond . actualTransitions
86 where
99 where
87 happyNewYear y = UTCTime (fromGregorian y 1 1) 0
100 happyNewYear y = UTCTime (fromGregorian y 1 1) 0
timezone-olson.cabalnew file+45
@@ -0,0 +1,45 @@
1+Name: timezone-olson
2+Version: 0.1.9
3+Synopsis: A pure Haskell parser and renderer for binary Olson timezone files
4+Description: A parser and renderer for binary Olson timezone
5+ files whose format is specified by the tzfile(5)
6+ man page on Unix-like systems. For more
7+ information about this format, see
8+ <http://www.iana.org/time-zones/repository/tz-link.html>.
9+ Functions are provided for converting the parsed data into
10+ 'TimeZoneSeries' objects from the timezone-series
11+ package. On many platforms, binary Olson timezone
12+ files suitable for use with this package are
13+ available in the directory /usr/share/zoneinfo
14+ and its subdirectories on your computer.
15+ For a way to read binary Olson timezone files at compile
16+ time, see the timezone-olson-th package
17+ (<http://hackage.haskell.org/package/timezone-olson-th>).
18+Homepage: http://projects.haskell.org/time-ng/
19+License: BSD3
20+License-file: LICENSE
21+Author: Yitzchak Gale
22+Maintainer: yitz@sefer.org
23+Copyright: Copyright (c) 2010-2018 Yitzchak Gale. All rights reserved.
24+Category: Data
25+Build-type: Simple
26+Extra-source-files: README.md, catTZ.hs, hzdump.hs
27+Cabal-version: >=1.10
28+Tested-with: GHC > 8.0 && < 8.5
29+
30+Source-repository HEAD
31+ type: git
32+ location: https://github.com/ygale/timezone-olson.git
33+
34+Library
35+ Default-language: Haskell2010
36+ Exposed-modules: Data.Time.LocalTime.TimeZone.Olson
37+ , Data.Time.LocalTime.TimeZone.Olson.Parse
38+ , Data.Time.LocalTime.TimeZone.Olson.Render
39+ , Data.Time.LocalTime.TimeZone.Olson.Types
40+ Build-depends: base >= 3.0 && < 5.0,
41+ timezone-series >= 0.1.0 && < 0.2,
42+ time >= 1.6 && < 1.10,
43+ binary >= 0.4.1 && < 0.9,
44+ bytestring >= 0.9 && < 1.0,
45+ extensible-exceptions >= 0.1.0 && < 0.2