checking response to return 2xx
This commit is contained in:
parent
86d5adbc83
commit
0a055af3e2
28
src/Main.hs
28
src/Main.hs
|
@ -6,13 +6,13 @@ import System.Environment
|
||||||
import Data.Time.Clock
|
import Data.Time.Clock
|
||||||
import Data.Time.Format
|
import Data.Time.Format
|
||||||
import Data.Time.Clock.POSIX
|
import Data.Time.Clock.POSIX
|
||||||
import Network.HTTP.Conduit (simpleHttp)
|
import Network.HTTP.Conduit
|
||||||
|
import Network.HTTP.Simple (getResponseStatusCode, getResponseBody)
|
||||||
import Data.List.Split
|
import Data.List.Split
|
||||||
import Data.Algorithm.Diff
|
import Data.Algorithm.Diff
|
||||||
import Data.Algorithm.DiffOutput
|
import Data.Algorithm.DiffOutput
|
||||||
import Data.ByteString.Lazy.UTF8 (toString)
|
import Data.ByteString.Lazy.UTF8 (toString)
|
||||||
import System.IO
|
import System.IO
|
||||||
|
|
||||||
data GeneratorState = IsRunning | IsFinished
|
data GeneratorState = IsRunning | IsFinished
|
||||||
deriving (Eq)
|
deriving (Eq)
|
||||||
|
|
||||||
|
@ -52,16 +52,25 @@ genOutput (Just changes) time timecodeFile= do
|
||||||
genOutput Nothing _ _ = return()
|
genOutput Nothing _ _ = return()
|
||||||
|
|
||||||
-- Returning fetched url as a string separated by \n
|
-- Returning fetched url as a string separated by \n
|
||||||
fetchFile :: String -> IO [String]
|
fetchFile :: String -> IO (Either String [String])
|
||||||
fetchFile url = do
|
fetchFile url = do
|
||||||
html <- simpleHttp url
|
request <- parseRequest url
|
||||||
return $ (splitOn ("\n")) . toString $ html
|
manager <- newManager tlsManagerSettings
|
||||||
|
response <- httpLbs request manager
|
||||||
|
let statusCode = getResponseStatusCode response
|
||||||
|
if statusCode `div` 100 == 2 then do
|
||||||
|
return $ Right ((splitOn ("\n")) . toString $ getResponseBody response)
|
||||||
|
else do
|
||||||
|
return $ Left (show statusCode)
|
||||||
|
|
||||||
|
|
||||||
-- Main Loop
|
-- Main Loop
|
||||||
timecodeGenerator :: GeneratorState -> [String] -> UTCTime -> String -> String -> IO ()
|
timecodeGenerator :: GeneratorState -> [String] -> UTCTime -> String -> String -> IO ()
|
||||||
timecodeGenerator IsFinished _ _ _ _ = return ()
|
timecodeGenerator IsFinished _ _ _ _ = return ()
|
||||||
timecodeGenerator IsRunning prevFile time url timecodeFile = do
|
timecodeGenerator IsRunning prevFile time url timecodeFile = do
|
||||||
newFile <- fetchFile url
|
fetched <- fetchFile url
|
||||||
|
case fetched of
|
||||||
|
Right newFile -> do
|
||||||
currTime <- getCurrentTime
|
currTime <- getCurrentTime
|
||||||
let changes = getChanges newFile prevFile
|
let changes = getChanges newFile prevFile
|
||||||
let diffTime = myFormatDiffTime (currTime, time)
|
let diffTime = myFormatDiffTime (currTime, time)
|
||||||
|
@ -74,6 +83,9 @@ timecodeGenerator IsRunning prevFile time url timecodeFile = do
|
||||||
timecodeGenerator IsRunning newFile time url timecodeFile
|
timecodeGenerator IsRunning newFile time url timecodeFile
|
||||||
else
|
else
|
||||||
timecodeGenerator IsFinished newFile time url timecodeFile
|
timecodeGenerator IsFinished newFile time url timecodeFile
|
||||||
|
Left err -> do
|
||||||
|
print err
|
||||||
|
timecodeGenerator IsRunning prevFile time url timecodeFile
|
||||||
|
|
||||||
-- Commandline arguments:
|
-- Commandline arguments:
|
||||||
-- 1. Link to markdown file
|
-- 1. Link to markdown file
|
||||||
|
@ -84,6 +96,10 @@ main = do
|
||||||
let url:timecodeFile:xs = args
|
let url:timecodeFile:xs = args
|
||||||
time <- getCurrentTime
|
time <- getCurrentTime
|
||||||
file <- fetchFile url
|
file <- fetchFile url
|
||||||
|
case file of
|
||||||
|
Left e -> do
|
||||||
|
putStrLn $ (++) "Error: " $ show e
|
||||||
|
Right file -> do
|
||||||
appendToFile timecodeFile $ "New Timecodes starts here \n "
|
appendToFile timecodeFile $ "New Timecodes starts here \n "
|
||||||
appendToFile timecodeFile $ show time
|
appendToFile timecodeFile $ show time
|
||||||
timecodeGenerator IsRunning file time url timecodeFile
|
timecodeGenerator IsRunning file time url timecodeFile
|
||||||
|
|
Loading…
Reference in a new issue