Remove deprecated :use directives and add some aliases

master
Aaron Mueller 8 years ago
parent 7cce88f523
commit c3380a2860
  1. 5
      project.clj
  2. 6
      src/ldview/db.clj
  3. 4
      src/ldview/models/competition.clj
  4. 6
      src/ldview/models/entry.clj
  5. 4
      src/ldview/models/source.clj
  6. 4
      src/ldview/models/user.clj
  7. 6
      src/ldview/repl.clj
  8. 4
      src/ldview/routes.clj
  9. 5
      src/ldview/tasks/images.clj
  10. 8
      src/ldview/tasks/runner.clj
  11. 4
      src/ldview/tasks/scrape.clj

@ -23,8 +23,9 @@
:init ldview.handler/init
:destroy ldview.handler/destroy
:open-browser? false}
:profiles {
:production {:ring {:stacktraces? false}}
:aliases {"start-over" ["run" "-m" "ldview.tasks.runner/reset-all!"]
"fetch-competition" ["run" "-m" "ldview.tasks.runner/load-competition" "28"]}
:profiles {:production {:ring {:stacktraces? false}}
:dev {:ring {:auto-reload? true
:auto-refresh? true}
:dependencies [[ring-mock "0.1.5"]

@ -1,7 +1,7 @@
(ns ldview.db
(:use korma.core
[korma.db :only (defdb)])
(:require [ldview.models.schema :as schema]))
(:require [ldview.models.schema :as schema]
[korma.core :refer :all]
[korma.db :refer [defdb]]))
(defdb db schema/db-spec)

@ -1,6 +1,6 @@
(ns ldview.models.competition
(:use korma.core
[ldview.db]))
(:require [korma.core :refer :all]
[ldview.db :refer :all]))
(defn latest []
(first (select competitions

@ -1,7 +1,7 @@
(ns ldview.models.entry
(:use korma.core
[ldview.db])
(:require [ldview.models.user :as user]
(:require [korma.core :refer :all]
[ldview.db :refer :all]
[ldview.models.user :as user]
[ldview.models.competition :as competition]
[ldview.models.source :as source]))

@ -1,6 +1,6 @@
(ns ldview.models.source
(:use korma.core
[ldview.db]))
(:require [korma.core :refer :all]
[ldview.db :refer :all]))
(defn create! [entry_id uri title]
; (if (empty? (select sources (where {:entry_id entry_id :type title})))

@ -1,6 +1,6 @@
(ns ldview.models.user
(:use korma.core
[ldview.db]))
(:require [korma.core :refer :all]
[ldview.db :refer :all]))
(defn user-id [username]
(first (select users

@ -1,7 +1,7 @@
(ns ldview.repl
(:use ldview.handler
ring.server.standalone
[ring.middleware file-info file]))
(:require [ldview.handler :refer :all]
[ring.server.standalone :refer :all]
[ring.middleware :refer [file-info file]]))
(defonce server (atom nil))

@ -1,7 +1,7 @@
(ns ldview.routes
(:use compojure.core)
(:require [ldview.models.entry :as entry]
[ldview.templates :as templates]))
[ldview.templates :as templates]
[compojure.core :refer :all]))
; TODO: Replace with enlive template stuff
(defn entries-page []

@ -6,8 +6,9 @@
[clojure.java.io :as io]
[noir.io :as noir-io]))
(defn base-path [competition-id]
(str (noir-io/resource-path) "img/ld" competition-id "/"))
(defn base-path
([] (str (noir-io/resource-path) "img"))
([competition-id] (str (base-path) "/ld" competition-id "/")))
(defn image-name [competition-id folder entry-id number]
(str (base-path competition-id) folder "/" entry-id "_" number ".png"))

@ -7,6 +7,7 @@
[ldview.models.schema :as schema]
[noir.io :as io]))
(defn delete-database! []
(let [db-file (str (io/resource-path) schema/db-store)]
(if (fs/exists? db-file) (fs/delete db-file))))
@ -44,13 +45,12 @@
(save-entry! competition-id (scrape/entry-details competition-id ld-uid))))))
(defn load-competition [competition-id]
(if-not (schema/initialized?)
(schema/create-initial-tables))
(if-not (schema/initialized?) (schema/create-initial-tables))
(initialize-file-structure! competition-id)
(competition/create! competition-id (scrape/theme competition-id))
(fetch-all-content competition-id))
(defn wipe-all!! []
(defn reset-all! []
(delete-database!)
(fs/delete-dir (images/base-path))
(schema/create-initial-tables))

@ -1,8 +1,8 @@
(ns ldview.tasks.scrape
(:require [net.cgrand.enlive-html :as html]
[clj-http.client :as http]
[clojure.java.io :as io])
(:use [clojure.string :only (split)]))
[clojure.java.io :as io]
[clojure.string :refer [split]]))
(defn url-action [competition-id action]
(str "http://www.ludumdare.com/compo/ludum-dare-" competition-id "/?action=" action))

Loading…
Cancel
Save