.gitignore @@ -1,9 +1,6 @@ (ns mire.rooms) (def rooms) -(def default-rooms-dir - (str (.getParent (.getParentFile (.getAbsoluteFile (java.io.File. *file*)))) - "/data/rooms/")) (defn load-room [rooms file] (let [room (read-string (slurp (.getAbsolutePath file)))] @@ -18,8 +15,7 @@ (defn load-rooms ([dir] (def rooms (reduce load-room {} - (.listFiles (java.io.File. dir))))) - ([] (load-rooms default-rooms-dir))) + (.listFiles (java.io.File. dir)))))) (defn room-contains? [room thing] src/mire/rooms.clj @@ -37,9 +37,9 @@ (finally (cleanup)))))) (defn -main - ([data-dir port] - (load-rooms) + ([rooms-dir port] + (load-rooms rooms-dir) (defonce server (create-server (Integer. port) mire-handle-client)) (println "Launching Mire server on port" port)) - ([data-dir] (-main data-dir 3333)) - ([] (-main "data/"))) + ([rooms-dir] (-main rooms-dir 3333)) + ([] (-main "data/rooms"))) src/mire/server.clj 68a8e9a1c370d7115160617ebf8f69f340d4984b Phil Hagelberg technomancy@gmail.com http://github.com/technomancy/mire/commit/d1683871253eaf46edf0a2ffe0cb9cf4781ebb38 d1683871253eaf46edf0a2ffe0cb9cf4781ebb38 2009-03-11T17:34:53-07:00 2009-03-11T17:28:16-07:00 Always use data-dir from the command-line. 9210a7b762d260adb734791306a16a56a20771dc Phil Hagelberg technomancy@gmail.com