SimpleOperations.hs @@ -4,6 +4,7 @@ import System.Console.CmdArgs import Control.Applicative hiding (empty) import System.Environment import SrtParser +import qualified SimpleOperations main :: IO () main = do @@ -12,9 +13,6 @@ main = do v <- verbosity runapp m v -data AppSettings = AppSettings { appMode :: HSubMode - , appVerb :: Verbosity - } deriving Show data Verbosity = Quiet | Normal | Verbose deriving (Show, Eq, Ord, Enum) @@ -22,9 +20,11 @@ data Verbosity = Quiet | Normal | Verbose runapp :: HSubMode -> Verbosity -> IO () runapp (Shift sec inf outf) v = do - print ("Running shift! In:" ++ inf ++ " Out: " ++ outf) + pr <- parsesrt inf + print ("Shifting sub by: " ++ (show sec)) + print (SimpleOperations.shiftsubtitles pr sec) + - verbosity :: IO Verbosity verbosity = do @@ -32,12 +32,16 @@ verbosity = do loud <- fromEnum <$> isLoud return $ toEnum $ norm + loud + + + +-- Command line modes data HSubMode = Shift {seconds :: Double, input :: FilePath, out :: FilePath} deriving (Data,Typeable,Show) shift = mode $ Shift - {seconds = def &= typ "SECONDS" & text "Seconds to shift by" & argPos 0 - ,input = "input.srt" &= typ "INPUTFILE" & text "Source file" & typFile & argPos 1 - ,out = "out.srt" &= typ "OUTPUTFILE" & text "Output file" & typFile & argPos 2 - } &= prog "shift" & text "usage: HSub shift [FLAGS] seconds inputfile outputfile" + {seconds = 0.0 &= typ "SECONDS" & text "Seconds to shift by" + ,input = "input.srt" &= typ "INPUTFILE" & text "Source file" & typFile & argPos 0 + ,out = "out.srt" &= typ "OUTPUTFILE" & text "Output file" & typFile & argPos 1 + } &= prog "shift" & text "usage: HSub [FLAGS] -s=SECONDS inputfile outputfile\n ex: HSub -s=2.5 in.srt out.srt" HSub.hs @@ -25,7 +25,7 @@ module SrtParser where import Text.ParserCombinators.Parsec -data Subtitle = Subtitle Int [Double] String +data Subtitle = Subtitle {subtitleId :: Int, subtitleTimes :: [Double], subtitleLines :: String} deriving (Show) @@ -42,7 +42,9 @@ newlinechar = do twonewlines :: Parser () twonewlines = do - count 2 (newlinechar) + newlinechar + skipMany (char ' ') -- Consider empty lines.. + newlinechar return () ending :: Parser () SrtParser.hs 31266e66f8ba31aa79de5e90b326a284bbb11d86 Jean-Nicolas Jolivet silvertab@Jean-Nicolas-Jolivets-iMac.local http://github.com/SilverTab/HSubParser/commit/fd836b5f644a982fb657314254e1dc26095df7e3 fd836b5f644a982fb657314254e1dc26095df7e3 2009-10-13T00:18:05-07:00 2009-10-13T00:18:05-07:00 Improved Command Line module 5162c4794fe2108ce95d5aa698a8b1f207035426 Jean-Nicolas Jolivet silvertab@Jean-Nicolas-Jolivets-iMac.local