HaskerDeux: Check-in [06a6b89ac2]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Follow-up to previous commit - remove all trailing slashes from apiurls And add to the put and delete where needed. This is better and more consistent. Also works. Odd that things magically broke before though.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| origin/issue1 \| trunk \| master
Files:	files \| file ages \| folders
SHA3-256:	06a6b89ac275066a738820011cfd6f321e6c7583e84390f1922d824da3b75b7b
User & Date:	atomicules 2020-03-14 15:15:59

Context

2020-05-14
06:16		Add `nextweek` command to move todos to "next" Monday I.e. whatever day of the week the todo is on it'll be moved to the next Monday. I find myself doing this a fair bit and it's actually fiddly via the web interface. I could do with figuring out handling multiple todos at once at some point. check-in: ca6b54431e user: atomicules tags: origin/issue1, trunk, master
2020-03-14
15:15		Follow-up to previous commit - remove all trailing slashes from apiurls And add to the put and delete where needed. This is better and more consistent. Also works. Odd that things magically broke before though. check-in: 06a6b89ac2 user: atomicules tags: origin/issue1, trunk, master
15:09		Always reference cookie files from home dir; API url changes I forgot to commit the cookie changes awhile back so they've got caught up in a commit fixing the API urls. The cookie stuff just makes sense. Previously the cookie files were stored in the same directory we were running haskerdeux from, which could lead to multiple files. Makes sense to reference one location (home directory). The API changes I found when this stopped working: https://atomicules.co.uk/2017/08/27/Remind-to-Teuxdeux.html Which is friggin' annoying as I almost forgot about Mothering Sunday. Anyway, it seems some of the URLs haven't so much changed, but now don't like trailing slashes in some cases. - new, post, can't have trailing slash - crossoff, put, needs trailing slash - putoff, put, can't have trailing slash - moveto, put, can't have trailing slash - remove, delete, needs trailing slash Yay for consistency! Hmm... actually I might tweak this further on a following commit as the puts don't make sense to me. check-in: 4af11b69a0 user: atomicules tags: origin/issue1, trunk, master

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to haskerdeux.hs.


curldelete (token, [date, apiurl, okresponse]) number = do
	home <- getHomeDirectory
	let cookies = home ++ "/haskerdeux.cookies"
	tdsf <- curlget (token, date)
	let itemid = Main.id $ tdsf!!(read number::Int)
	let curlheader = "X-CSRF-Token: " ++ token
	body <- readProcess "curl" ["-s", "-XDELETE", apiurl++show itemid, "-c", cookies, "-b", cookies, "-H", curlheader] []
	let ok = not ("Invalid CSRF Token" `isInfixOf` body)
	if ok
		then
			if "done_updated_at" `isInfixOf` body
				then putStrLn okresponse
				else putStrLn "Uh Oh! Didn't work!"
		else do
................................................................................

curlput (token, [date, json, apiurl, okresponse]) number = do
	home <- getHomeDirectory
	let cookies = home ++ "/haskerdeux.cookies"
	tdsf <- curlget (token, date)
	let itemid = Main.id $ tdsf!!(read number::Int)
	let curlheader = "X-CSRF-Token: " ++ token
	body <- readProcess "curl" ["-s", "-XPUT", apiurl++show itemid, "-L", "-c", cookies, "-b", cookies, "-H", curlheader, "-H", "Content-Type: application/json", "-d", json] []
	let ok = not ("Invalid CSRF Token" `isInfixOf` body)
	if ok
		then
			if "done_updated_at" `isInfixOf` body
				then putStrLn okresponse
				else putStrLn "Uh Oh! Didn't work!"
		else do
................................................................................

new (token, [todos_date, todo]) = do 
	let encodedtodo = Network.URI.Encode.encode todo
	curlpost (token, [todos_date, "text", todo, "https://teuxdeux.com/api/v1/todos", "Added!"]) Nothing


crossoff (token, [todos_date, number]) =
	curlput (token, [todos_date, "{ \"done\": true }", "https://teuxdeux.com/api/v1/todos/", "Crossed Off!"]) number


putoff (token, [todos_date, number]) = do
	let tomorrows_date = show (addDays 1 $ read todos_date::Data.Time.Day)
	curlpost (token, [todos_date, "current_date", tomorrows_date, "https://teuxdeux.com/api/v1/todos/reposition", "Put Off!"]) (Just number)


moveto (token, [todos_date, number, new_date]) =
	--TODO: Need to figure out moving to bottom of a list
	curlpost (token, [todos_date, "current_date", new_date, "https://teuxdeux.com/api/v1/todos/reposition", "Moved!"]) (Just number)


remove (token, [todos_date, number]) =
	curldelete (token, [todos_date, "https://teuxdeux.com/api/v1/todos/", "Deleted!"]) number


--Thanks to http://www.amateurtopologist.com/blog/2010/11/05/a-haskell-newbies-guide-to-text-json/ and http://hpaste.org/41263/parsing_json_with_textjson
data Teuxdeux = Teuxdeux {
    id :: Integer,
	current_date :: String, 
	text :: String,
	done :: Bool
} deriving (Eq, Show, Data, Typeable) 

--Another data type here probably for lists


curldelete (token, [date, apiurl, okresponse]) number = do
	home <- getHomeDirectory
	let cookies = home ++ "/haskerdeux.cookies"
	tdsf <- curlget (token, date)
	let itemid = Main.id $ tdsf!!(read number::Int)
	let curlheader = "X-CSRF-Token: " ++ token
	body <- readProcess "curl" ["-s", "-XDELETE", apiurl++"/"++show itemid, "-c", cookies, "-b", cookies, "-H", curlheader] []
	let ok = not ("Invalid CSRF Token" `isInfixOf` body)
	if ok
		then
			if "done_updated_at" `isInfixOf` body
				then putStrLn okresponse
				else putStrLn "Uh Oh! Didn't work!"
		else do
................................................................................

curlput (token, [date, json, apiurl, okresponse]) number = do
	home <- getHomeDirectory
	let cookies = home ++ "/haskerdeux.cookies"
	tdsf <- curlget (token, date)
	let itemid = Main.id $ tdsf!!(read number::Int)
	let curlheader = "X-CSRF-Token: " ++ token
	body <- readProcess "curl" ["-s", "-XPUT", apiurl++"/"++show itemid, "-L", "-c", cookies, "-b", cookies, "-H", curlheader, "-H", "Content-Type: application/json", "-d", json] []
	let ok = not ("Invalid CSRF Token" `isInfixOf` body)
	if ok
		then
			if "done_updated_at" `isInfixOf` body
				then putStrLn okresponse
				else putStrLn "Uh Oh! Didn't work!"
		else do
................................................................................

new (token, [todos_date, todo]) = do 
	let encodedtodo = Network.URI.Encode.encode todo
	curlpost (token, [todos_date, "text", todo, "https://teuxdeux.com/api/v1/todos", "Added!"]) Nothing


crossoff (token, [todos_date, number]) =
	curlput (token, [todos_date, "{ \"done\": true }", "https://teuxdeux.com/api/v1/todos", "Crossed Off!"]) number


putoff (token, [todos_date, number]) = do
	let tomorrows_date = show (addDays 1 $ read todos_date::Data.Time.Day)
	curlpost (token, [todos_date, "current_date", tomorrows_date, "https://teuxdeux.com/api/v1/todos/reposition", "Put Off!"]) (Just number)


moveto (token, [todos_date, number, new_date]) =
	--TODO: Need to figure out moving to bottom of a list
	curlpost (token, [todos_date, "current_date", new_date, "https://teuxdeux.com/api/v1/todos/reposition", "Moved!"]) (Just number)


remove (token, [todos_date, number]) =
	curldelete (token, [todos_date, "https://teuxdeux.com/api/v1/todos", "Deleted!"]) number


--Thanks to http://www.amateurtopologist.com/blog/2010/11/05/a-haskell-newbies-guide-to-text-json/ and http://hpaste.org/41263/parsing_json_with_textjson
data Teuxdeux = Teuxdeux {
    id :: Integer,
	current_date :: String, 
	text :: String,
	done :: Bool
} deriving (Eq, Show, Data, Typeable) 

--Another data type here probably for lists