MyFavMirrors/RSSPAPER
1
0
Fork 0
mirror of https://github.com/tanrax/RSSPAPER.git synced 2025-04-18 18:05:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix format

Browse Source
This commit is contained in:
Andros Fenollosa 2021-07-18 13:12:59 +02:00
parent f0b426da7e
commit 207601a5ef
4 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
project.clj
View File

@ -29,7 +29,8 @@
[lein-cljfmt "0.6.4"]]
;; ALIAS
:aliases {"check-idiomatic" ["kibit" "src"]
"check-format" ["cljfmt" "check"]}
"check-format" ["cljfmt" "check"]
"fix-format" ["cljfmt" "fix"]}
;; LEIN
:main ^:skip-aot rsspaper.core
:aot [rsspaper.core]

16
resources/themes/light.html
View File

@ -106,13 +106,14 @@
.article__title, .article__feed {
font-weight: normal;
}
.article__header-img > a > img {
height: var(--height-img);
object-position: center;
object-fit: contain;
}
.article__random-background {
height: var(--height-img);
height: 100%;
width: 100%;
}
</style>
@ -235,9 +236,6 @@
{
font-size: 1rem;
}
.article__main {
position: fixed;
left: -100%;
@ -246,9 +244,13 @@
overflow-y: auto;
}
.feed__article:nth-child(1) .article__random-background {
height: initial;
.feed__article:nth-child(1) .article__header {
display: flex;
flex-direction: column;
height: 100%;
}
.feed__article:nth-child(1) .article__header-img {
height: 100%;
}
</style>
<!-- End CSS -->

15
src/rsspaper/feeds.clj
View File

@ -8,13 +8,11 @@
(def date-custom-formatter (f/formatter "dd MM yyyy"))
(defn datetimes-to-unixtime
[articles]
(map (fn [article]
(assoc article :published-date (c/to-long (:published-date article)))) articles))
(defn filter-edition
[articles]
(let [daily (c/to-long (t/minus (t/now) (t/days 1)))
@ -24,13 +22,11 @@
"weekly" (filter (fn [article] (and (not (nil? (:published-date article))) (>= (:published-date article) weekly))) articles)
:else articles)))
(defn add-datetimes-formatter
[articles]
(map (fn [article]
(assoc article :published-date-formatter (f/unparse date-custom-formatter (c/from-long (:published-date article))))) articles))
(defn zip-feeds-in-articles
[feeds]
;; Flat all articles
@ -38,22 +34,18 @@
;; Add in every article, all information from feed
(concat articles (map (fn [article] (assoc article :feed (:feed (update-in feed [:feed] dissoc :entries)))) (get-in feed [:feed :entries])))) [] feeds))
(defn add-cover-article
[articles]
;; Add cover to article search first image in description
;; Iterate every blog
(map (fn [article]
(let [url-article (second (re-find #"<img[^>]+src=\"([^\">]+)\"" (str (get-in article [:description :value]))))]
(assoc article :cover (if (nil? url-article) (get-in article [:feed :image :url]) url-article)))
) articles))
(assoc article :cover (if (nil? url-article) (get-in article [:feed :image :url]) url-article)))) articles))
(defn order-published
[articles]
(reverse (sort-by :published-date articles)))
(defn get-articles
[]
;; Get all feeds from config -> feeds
@ -63,7 +55,7 @@
; Read feed
(let [feed (parse-url feed-url {:insecure? true :throw-exceptions false})]
; Check is not null
(if (not (nil? feed))
(if-not (nil? feed)
; Add feed
(conj feeds feed)
; Alert fail
@ -74,5 +66,4 @@
filter-edition
order-published
add-cover-article
add-datetimes-formatter
))
add-datetimes-formatter))

7
src/rsspaper/html.clj
View File

@ -4,7 +4,6 @@
[rsspaper.config :refer [config]]
[selmer.parser :as s]))
(defn make-html
[articles]
;; Render html in dist/index.html
@ -16,7 +15,5 @@
(.mkdir (java.io.File. dir))
;; Make dist/index.html
(with-open [wrtr (io/writer path)]
(.write wrtr (s/render-file (str "themes/" (:theme config) ".html") {
:title (:title config)
:articles articles
})))))
(.write wrtr (s/render-file (str "themes/" (:theme config) ".html") {:title (:title config)
:articles articles})))))