ryuslash/hypo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Define view functions separately from classes

Browse source 
Using `lambda' the way it was being used is not pretty.
This commit is contained in:
Tom Willemse 2013-12-26 01:05:37 +01:00
parent 9788df48a9
commit 8e599478f7
1 changed files with 59 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
hypo.hy
View file

@ -65,19 +65,16 @@ If no lexer is found fallback onto the text lexer."
(catch [ClassNotFound] (catch [ClassNotFound]
(get-lexer-by-name "text")))) (get-lexer-by-name "text"))))
(defclass raw [] (defun get-raw [self name]
[[GET (lambda [self name]
(let ((dirname (+ "files/" (os.path.dirname name))) (let ((dirname (+ "files/" (os.path.dirname name)))
(repo (and (os.path.exists dirname) (repo (and (os.path.exists dirname)
(Gittle dirname))) (Gittle dirname)))
(resp (if repo (resp (if repo
(get (.commit-file (get (.commit-file repo "HEAD" (os.path.basename name))
repo "HEAD" (os.path.basename name))
"data")))) "data"))))
(or resp (no-such-file))))]]) (or resp (no-such-file))))
(defclass download [] (defun get-attachment [self name]
[[GET (lambda [self name]
(let ((dirname (+ "files/" (os.path.dirname name))) (let ((dirname (+ "files/" (os.path.dirname name)))
(repo (and (os.path.exists dirname) (repo (and (os.path.exists dirname)
(Gittle dirname)))) (Gittle dirname))))
@ -85,9 +82,8 @@ If no lexer is found fallback onto the text lexer."
(progn (progn
(web.header "Content-Disposition" (web.header "Content-Disposition"
(+ "attachment; filename=\"" name "\"")) (+ "attachment; filename=\"" name "\""))
(get (.commit-file repo "HEAD" (get (.commit-file repo "HEAD" (os.path.basename name)) "data"))
(os.path.basename name)) "data")) (no-such-file))))
(no-such-file))))]])
(defun render-file [hash repo ref filename] (defun render-file [hash repo ref filename]
(if (not (os.path.isdir filename)) (if (not (os.path.isdir filename))
@ -107,8 +103,7 @@ If no lexer is found fallback onto the text lexer."
(kwapply (render.main) args)) (kwapply (render.main) args))
"")) ""))
(defclass html [] (defun get-html [self name]
[[GET (lambda [self name]
(let ((dirname (+ "files/" name)) (let ((dirname (+ "files/" name))
(repo (and (os.path.exists dirname) (repo (and (os.path.exists dirname)
(Gittle dirname)))) (Gittle dirname))))
@ -117,16 +112,15 @@ If no lexer is found fallback onto the text lexer."
[f (.iterkeys (.commit-tree repo "HEAD"))] [f (.iterkeys (.commit-tree repo "HEAD"))]
(not (or (= f ".") (not (or (= f ".")
(= f ".."))))) (= f "..")))))
(no-such-file))))] (no-such-file))))
[DELETE (lambda [self name] (defun delete-dir [self name]
(let ((dirname (+ "files/" name))) (let ((dirname (+ "files/" name)))
(if (os.path.exists dirname) (if (os.path.exists dirname)
(shutil.rmtree dirname) (shutil.rmtree dirname)
(no-such-file))))]]) (no-such-file))))
(defclass upload [] (defun upload-file [self name]
[[PUT (lambda [self name]
(let ((h (hashes name)) (let ((h (hashes name))
(dirname (+ "files/" (get h 0)))) (dirname (+ "files/" (get h 0))))
(os.mkdir dirname) (os.mkdir dirname)
@ -139,7 +133,20 @@ If no lexer is found fallback onto the text lexer."
"email" "hypo@ryuslash.org" "email" "hypo@ryuslash.org"
"message" "Initial commit"})) "message" "Initial commit"}))
(setv web.ctx.status (str "201 Created")) (setv web.ctx.status (str "201 Created"))
(+ web.ctx.home "/" *prefix* (get h 0) "\n")))]]) (+ web.ctx.home "/" *prefix* (get h 0) "\n")))
(defclass raw []
[[GET get-raw]])
(defclass download []
[[GET get-attachment]])
(defclass html []
[[GET get-html]
[DELETE delete-dir]])
(defclass upload []
[[PUT upload-file]])
(defclass index [] (defclass index []
[[GET (lambda [self] (render.index))]]) [[GET (lambda [self] (render.index))]])