From 9361d6444548748445db1548d0e3a6291d802bd3 Mon Sep 17 00:00:00 2001 From: Miguel Ángel Moreno Date: Mon, 26 Dec 2022 21:46:15 +0100 Subject: feat: Abstract away result items into standalone namespace --- src/backend/tau/api/kiosk.clj | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/backend/tau/api/kiosk.clj') diff --git a/src/backend/tau/api/kiosk.clj b/src/backend/tau/api/kiosk.clj index 7ae2150..4243a32 100644 --- a/src/backend/tau/api/kiosk.clj +++ b/src/backend/tau/api/kiosk.clj @@ -1,10 +1,8 @@ (ns tau.api.kiosk (:require [clojure.java.data :as j] - [tau.api.stream :as stream] - [tau.api.channel :as channel] - [tau.api.playlist :as playlist] - [ring.util.codec :refer [url-decode]]) + [ring.util.codec :refer [url-decode]] + [tau.api.result :as result]) (:import org.schabi.newpipe.extractor.StreamingService org.schabi.newpipe.extractor.Page @@ -20,14 +18,6 @@ (defrecord KioskPage [next-page related-streams]) -(defn get-results - [items] - (map #(case (.name (.getInfoType %)) - "STREAM" (stream/get-result %) - "CHANNEL" (channel/get-result %) - "PLAYLIST" (playlist/get-result %)) - items)) - (defn get-info ([kiosk-id service-id] (let [service (NewPipe/getService service-id) @@ -37,7 +27,7 @@ {:id (.getId info) :url (.getUrl info) :next-page (j/from-java (.getNextPage info)) - :related-streams (get-results (.getRelatedItems info))}))) + :related-streams (result/get-results (.getRelatedItems info))}))) ([kiosk-id service-id page-url] (let [service (NewPipe/getService service-id) extractor (.getExtractorById (.getKioskList service) kiosk-id nil) @@ -46,7 +36,7 @@ info (KioskInfo/getMoreItems service (.getUrl kiosk-info) (Page. url))] (map->KioskPage {:next-page (j/from-java (.getNextPage info)) - :related-streams (get-results (.getItems info))})))) + :related-streams (result/get-results (.getItems info))})))) (defn get-kiosks [service-id] -- cgit v1.2.3