gered/toascii
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

little bit of cleanup

Browse source
This commit is contained in:
Gered 2014-04-06 09:34:02 -04:00
parent 1732ccf341
commit 59a829b9ef
1 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/toascii/models/image.clj
View file

@ -1,13 +1,11 @@
(ns toascii.models.image (ns toascii.models.image
(:import (java.awt.image BufferedImage) (:import (java.awt.image BufferedImage)
(java.io Writer) (javax.imageio.stream ImageInputStream)
(javax.imageio.stream ImageInputStream)) (java.io Writer))
(:require [clojure.string :as str] (:require [clojure.java.io :as io]
[clojure.java.io :as io]
[ring.util.io :refer [piped-input-stream]] [ring.util.io :refer [piped-input-stream]]
[clj-image2ascii.core :as i2a] [clj-image2ascii.core :as i2a]
[toascii.util :refer [query-param-url->java-url]]) [toascii.util :refer [query-param-url->java-url]]))
(:use hiccup.core))
(def js-gif-animation (slurp (io/resource "gif-animation.js"))) (def js-gif-animation (slurp (io/resource "gif-animation.js")))
@ -21,33 +19,11 @@
(let [java-url (query-param-url->java-url url)] (let [java-url (query-param-url->java-url url)]
(i2a/get-image-stream-by-url java-url))) (i2a/get-image-stream-by-url java-url)))
(defn- wrap-pre-tag [s & {:keys [hidden? delay]}]
(str
"<pre style=\""
ascii-pre-css
(if hidden?
" display: none;")
"\""
(if delay
(str " data-delay=\"" delay "\""))
">" s "</pre>"))
(defn- get-open-pre-tag [hidden? delay]
(str
"<pre style=\""
ascii-pre-css
(if hidden?
" display: none;")
"\""
(if delay
(str " data-delay=\"" delay "\""))
">"))
(defn image->ascii [^BufferedImage image scale-to-width color? html?] (defn image->ascii [^BufferedImage image scale-to-width color? html?]
(let [converted (i2a/convert-image image scale-to-width color?) (let [converted (i2a/convert-image image scale-to-width color?)
ascii (:image converted)] ascii (:image converted)]
(if html? (if html?
(wrap-pre-tag ascii) (str "<pre style=\"" ascii-pre-css "\">" ascii "</pre>")
ascii))) ascii)))
(defn- write-out [^Writer w s] (defn- write-out [^Writer w s]
@ -61,7 +37,7 @@
(i2a/stream-animated-gif-frames! (i2a/stream-animated-gif-frames!
image-stream scale-to-width color? image-stream scale-to-width color?
(fn [{:keys [image delay]}] (fn [{:keys [image delay]}]
(write-out w (get-open-pre-tag true delay)) (write-out w (str "<pre style=\"" ascii-pre-css " display: none;\" data-delay=\"" delay "\">"))
(write-out w image) (write-out w image)
(write-out w "</pre>"))) (write-out w "</pre>")))
(write-out w "</div>") (write-out w "</div>")