Moved utility funcs

2 files changed, 23 insertions, 24 deletions

diff --git a/src/site.clj b/src/site.clj
index 4da77b4..ec58e46 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -2,10 +2,8 @@
   (:import java.lang.System
            java.text.SimpleDateFormat
            java.util.Date
-           java.util.TimeZone
            java.io.File
            javax.imageio.ImageIO
-           org.apache.commons.codec.digest.DigestUtils
            javax.servlet.http.Cookie)
   (:use clojure.xml
         clojure.contrib.command-line
@@ -70,27 +68,6 @@
 (.mkdir (new File *image-directory*))
 (.mkdir (new File *avatar-directory*))
 
-;; Utils
-
-(defn open-file [dir-comps filename]
-  (let [d (str-join (System/getProperty "file.separator")
-                    (cons *root-directory* dir-comps))
-        f (str-join (System/getProperty "file.separator")
-                    [d filename])]
-    (.mkdir (new File d))
-    (new File f)))
-
-(defn sha1-hash [& more]
-  (DigestUtils/shaHex (apply str more)))
-
-(defn gmt-string 
-  ([] (gmt-string (new Date)))
-  ([dt]
-     (let [df (new SimpleDateFormat "EEE, dd MMM yyyy kk:mm:ss z")]
-       (.setTimeZone df (TimeZone/getTimeZone "GMT"))
-       (.format df dt))))
-
-
 ;; Room handling
 
 (defn lookup-room [key]
@@ -626,7 +603,7 @@
 (defn strip-params [s]
   (.replaceFirst s "\\?.*$" ""))
 
-; TODO: is-image? has *long* been broken wrt messages w/ multiple image links.
+; TODO: is-image? is broken for messages w/ multiple image links.
 
 (defn is-image? [content]
   (boolean (and (re-find single-url-regex content)
diff --git a/src/utils.clj b/src/utils.clj
index d2575c6..16cd28d 100755
--- a/src/utils.clj
+++ b/src/utils.clj
@@ -1,10 +1,14 @@
 (ns utils
   (:import java.text.SimpleDateFormat
            java.util.Date
+           java.util.TimeZone
+           java.io.File
            java.net.URLDecoder
+           org.apache.commons.codec.digest.DigestUtils
            org.antlr.stringtemplate.StringTemplateGroup)
   (:use clojure.contrib.json.write
         clojure.contrib.sql
+        clojure.contrib.str-utils
         compojure))
 
 (let [db-host "localhost"
@@ -57,6 +61,24 @@
 (defn kbytes [b] (* b 1024))
 (defn mbytes [b] (* b 1024 1024))
 
+(defn open-file [dir-comps filename]
+  (let [d (str-join (System/getProperty "file.separator")
+                    dir-comps)
+        f (str-join (System/getProperty "file.separator")
+                    [d filename])]
+    (.mkdir (new File d))
+    (new File f)))
+
+(defn sha1-hash [& more]
+  (DigestUtils/shaHex (apply str more)))
+
+(defn gmt-string
+  ([] (gmt-string (new Date)))
+  ([dt]
+     (let [df (new SimpleDateFormat "EEE, dd MMM yyyy kk:mm:ss z")]
+       (.setTimeZone df (TimeZone/getTimeZone "GMT"))
+       (.format df dt))))
+
 ;; Formatters
 
 (def yyyy-mm-dd-formatter (new SimpleDateFormat "yyyy-MM-dd"))