From 8b9381d5e1cd930ed433e8500f688de568e110bd Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Tue, 30 Aug 2022 21:39:53 +1000 Subject: [PATCH] refactor shaarli so tag isn't hardcoded --- src/dhyan/connections/shaarli.clj | 12 ++++++------ src/dhyan/main.clj | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/dhyan/connections/shaarli.clj b/src/dhyan/connections/shaarli.clj index 7b54752..3cbe5f4 100644 --- a/src/dhyan/connections/shaarli.clj +++ b/src/dhyan/connections/shaarli.clj @@ -40,18 +40,18 @@ (def token (generate-token (System/getenv "SHAARLI_TOKEN"))) -(defn shaarli-request [limit offset] - (-> (curl/get (str "http://links.mossnet.lan/api/v1/links?searchtags=music&limit=" limit "&offset=" offset) {:headers {"Authorization" (str "Bearer " token)}}) +(defn shaarli-request [tag limit offset] + (-> (curl/get (str "http://links.mossnet.lan/api/v1/links?searchtags=" tag "&limit=" limit "&offset=" offset) {:headers {"Authorization" (str "Bearer " token)}}) (:body) (json/parse-string true))) -(defn get-all-shaarli-data +(defn get-all-shaarli-music-data [] - (shaarli-request "all" 0)) + (shaarli-request "music" "all" 0)) (comment - (shaarli-request 100 0) - (count (get-all-shaarli-data)) + (shaarli-request "" 20 0) + (count (get-all-shaarli-music-data)) (url-filterer {:url "bandcamp"} "bandcamp") (filter (fn [x] (.contains (get x :url) "bandcamp")) [{:url "bandcamp"}]) (println "somestring") diff --git a/src/dhyan/main.clj b/src/dhyan/main.clj index 4679dc5..4571ff8 100644 --- a/src/dhyan/main.clj +++ b/src/dhyan/main.clj @@ -1,12 +1,11 @@ (ns dhyan.main (:require [dhyan.connections.shaarli :as shaarli] - [clojure.java.shell :refer [sh]] [dhyan.connections.matrix :as matrix])) (defn -main [& _args] (matrix/setup) - (let [shaarli-data (shaarli/get-all-shaarli-data) + (let [shaarli-data (shaarli/get-all-shaarli-music-data) ; filter to bandcamp (and maybe others?) filtered-shaarli-data (shaarli/url-filterer shaarli-data "bandcamp") album-of-the-day (->> filtered-shaarli-data