photoname 3.0.1 → 3.1

raw patch · 13 files changed

+20/−22 lines, 13 files

Files

LICENSE +1/−1
photoname.cabal +8/−4
src/Photoname/Common.hs +3/−4
src/Photoname/Date.hs +0/−2
src/Photoname/DateFormat.hs +0/−1
src/Photoname/Exif.hs +1/−2
src/Photoname/Opts.hs +7/−2
src/Photoname/SerialFormat.hs +0/−1
src/photoname.hs +0/−1
testsuite/TestHelp.hs +0/−1
testsuite/TestLink.hs +0/−1
testsuite/Util.hs +0/−1
testsuite/runtests.hs +0/−1

LICENSE view

@@ -1,4 +1,4 @@-Copyright (c) 2007-2012 Dino Morelli+Copyright (c) 2007-2015 Dino Morelli All rights reserved.  Redistribution and use in source and binary forms, with or without

photoname.cabal view

@@ -1,15 +1,15 @@ name:                photoname cabal-version:       >= 1.8-version:             3.0.1+version:             3.1 build-type:          Simple license:             BSD3 license-file:        LICENSE-copyright:           2007-2012 Dino Morelli +copyright:           2007-2015 Dino Morelli author:              Dino Morelli  maintainer:          Dino Morelli <dino@ui3.info> stability:           stable-homepage:            http://ui3.info/d/proj/photoname.html-synopsis:            Rename JPEG photo files based on shoot date+homepage:            http://hub.darcs.net/dino/photoname+synopsis:            Rename photo image files based on EXIF shoot date description:             Command-line utility for renaming/moving photo image files based on     EXIF tags.@@ -17,6 +17,10 @@ tested-with:         GHC >= 7.6.1  extra-source-files:  testsuite/resources/*.jpg++source-repository    head+   type:             darcs+   location:         http://hub.darcs.net/dino/photoname  executable           photoname    main-is:          photoname.hs

src/Photoname/Common.hs view

@@ -1,4 +1,3 @@--- Copyright: 2007-2012 Dino Morelli -- License: BSD3 (see LICENSE) -- Author: Dino Morelli <dino@ui3.info> @@ -13,14 +12,14 @@    )    where -import Control.Monad.Error+import Control.Monad.Except import Control.Monad.Reader  import Photoname.Opts ( Options (..) )  -type Ph a = ReaderT Options (ErrorT String IO) a+type Ph a = ReaderT Options (ExceptT String IO) a   runRename :: Options -> Ph a -> IO (Either String a)-runRename env action = runErrorT $ runReaderT action env+runRename env action = runExceptT $ runReaderT action env

src/Photoname/Date.hs view

@@ -1,4 +1,3 @@--- Copyright: 2007-2012 Dino Morelli -- License: BSD3 (see LICENSE) -- Author: Dino Morelli <dino@ui3.info> @@ -13,7 +12,6 @@ import Data.Time.Calendar import Data.Time.Format import Data.Time.LocalTime-import System.Locale ( defaultTimeLocale ) import Text.ParserCombinators.Parsec

src/Photoname/DateFormat.hs view

@@ -1,4 +1,3 @@--- Copyright: 2007-2012 Dino Morelli -- License: BSD3 (see LICENSE) -- Author: Dino Morelli <dino@ui3.info>

src/Photoname/Exif.hs view

@@ -1,4 +1,3 @@--- Copyright: 2007-2012 Dino Morelli -- License: BSD3 (see LICENSE) -- Author: Dino Morelli <dino@ui3.info> @@ -8,7 +7,7 @@    where  import Control.Exception-import Control.Monad.Error+import Control.Monad.Except import Graphics.Exif ( fromFile, getTag, Exif ) import System.IO.Error

src/Photoname/Opts.hs view

@@ -1,7 +1,10 @@--- Copyright: 2007-2012 Dino Morelli -- License: BSD3 (see LICENSE) -- Author: Dino Morelli <dino@ui3.info> +-- This is for GHC 7.8/7.10 compatibility with the+-- Control.Applicative import below+{-# OPTIONS_GHC -fno-warn-unused-imports #-}+ module Photoname.Opts    ( Options (..)    , parseOpts, usageText@@ -9,6 +12,8 @@    where  import Control.Applicative+import Data.Version ( showVersion )+import Paths_photoname ( version ) import System.Console.GetOpt import System.Directory @@ -183,5 +188,5 @@          , "photoname invoked with --suffix=_dwm :"          , "   20020502-132307_dwm.jpg"          , ""-         , "Version 3.0.1  Dino Morelli <dino@ui3.info>"+         , "Version " ++ (showVersion version) ++ "  Dino Morelli <dino@ui3.info>"          ]

src/Photoname/SerialFormat.hs view

@@ -1,4 +1,3 @@--- Copyright: 2007-2012 Dino Morelli -- License: BSD3 (see LICENSE) -- Author: Dino Morelli <dino@ui3.info>

src/photoname.hs view

@@ -1,4 +1,3 @@--- Copyright: 2007-2012 Dino Morelli -- License: BSD3 (see LICENSE) -- Author: Dino Morelli <dino@ui3.info>

testsuite/TestHelp.hs view

@@ -1,4 +1,3 @@--- Copyright: 2007-2012 Dino Morelli -- License: BSD3 (see LICENSE) -- Author: Dino Morelli <dino@ui3.info>

testsuite/TestLink.hs view

@@ -1,4 +1,3 @@--- Copyright: 2007-2012 Dino Morelli -- License: BSD3 (see LICENSE) -- Author: Dino Morelli <dino@ui3.info>

testsuite/Util.hs view

@@ -1,4 +1,3 @@--- Copyright: 2007-2012 Dino Morelli -- License: BSD3 (see LICENSE) -- Author: Dino Morelli <dino@ui3.info>

testsuite/runtests.hs view

@@ -1,4 +1,3 @@--- Copyright: 2007-2012 Dino Morelli -- License: BSD3 (see LICENSE) -- Author: Dino Morelli <dino@ui3.info>