Merge pull request #8231 from NBKelly/flip-card-browser-flip-arts

fix cardbrowser flip arts

Author: NBKelly

resources/public/i18n/en.ftl

@@ -1240,6 +1240,27 @@ set_name = {$name ->
     [world-champion-2015] World Champion 2015
     [world-champion-2016] World Champion 2016
     [world-champion-2017] World Champion 2017
+    [nin419-alt-arts] nin419 Alt Arts
+    [ams-alt-arts] Ams Alt Arts
+    [adam-s-doyle-alt-arts] Adam S. Doyle Alt Arts
+    [brindelmold-alt-arts] Brindelmold Alt Arts
+    [ezbior-alt-arts] Ezbior Alt Arts
+    [kalypso-alt-arts] Kalypso Alt Arts
+    [elessarellie-alt-arts] ElessarEllie Alt Arts
+    [mr-alt-arts] M.R. Alt Arts
+    [maysleyline-alt-arts] mays.leyline Alt Arts
+    [nicky-cheng-alt-arts] Nicky Cheng Alt Arts
+    [scott-uminga-alt-arts] Scott Uminga Alt Arts
+    [the-tag-mill-alt-arts] The Tag Mill Alt Arts
+    [valenetrunner-alt-arts] ValeNetrunner Alt Arts
+    [igor-lebedev-alt-arts] Igor Lebedev Alt Arts
+    [gnk-2013] 2013 FFG GNK
+    [gnk-2014] 2014 FFG GNK
+    [gnk-2015] 2015 FFG GNK
+    [gnk-2016] 2016 FFG GNK
+    [gnk-2017] 2017 FFG GNK
+    [nsg-2024-prizing] 2024 NSG Prizing
+    [nsg-2025-prizing] 2025 NSG Prizing
     *[unknown] Unknown Set {$name}
 }
 

src/clj/tasks/images.clj

@@ -59,7 +59,7 @@
         prev-k-root (if (= :stock art-set) code (name art-set))
         prev-k (str/join "." ["faces" face "images" (name lang) (name resolution) prev-k-root])
         path (str/join "/" [base-path (name lang) (name resolution) (name art-set) filename])]
-    (mc/update db card-collection {:code code} {$set {k path}})
+    (mc/update db card-collection {:code code} {$addToSet {k path}})
     (mc/update db card-collection {:previous-versions {$elemMatch {:code code}}} {$set {prev-k path}})))
 
 (def ^:const cards-to-skip #{"08012" "09001" "26066" "26120" "35023" "35057"})

src/clj/tasks/update_alt_arts.clj

@@ -32,7 +32,7 @@
             (recur (.read in-stream buffer))))))
     (format "%040x" (BigInteger. 1 (.digest digest)))))
 
-(defn list-content [token key lang high]
+(defn list-content [token key lang high verbose]
   (let [url (str "https://api.github.com/repos/"
                  owner "/" repo "/contents/images/"
                  lang "/"
@@ -43,7 +43,8 @@
         {:keys [status body error]} @(http/get url {:headers headers})]
     (if (= 200 status)
       (json/read-str body :key-fn keyword)
-      (println "Error fetching files for url:" url "\n  -- " status body))))
+      (if (or verbose (not high))
+        (println "Error fetching files for url:" url "\n  -- " status body)))))
 
 (defn write-to-file
   [filename data]
@@ -87,18 +88,18 @@
 
 (defn- get-promo-paths
   []
-  (->> "data/promos.edn" slurp edn/read-string (mapv :version)))
+  (->> "data/promos.edn" slurp edn/read-string (mapv :version) (filterv #(not= % "prev"))))
 
 (defn update-promos
-  [{:keys [token lang force]}]
+  [{:keys [token lang force verbose]}]
   (println "updating promo cards...")
   (let [token (str/trim (slurp token))]
     (if (download-github-file token "promos.edn" "data/promos.edn")
       (doseq [path (get-promo-paths)]
         ;; get standard res images
-        (when-let [content (list-content token path lang nil)]
+        (when-let [content (list-content token path lang nil verbose)]
           (cp/pmap 3 #(fetch-image token path lang nil % force) content))
-        (when-let [content (list-content token path lang :high-res)]
+        (when-let [content (list-content token path lang :high-res verbose)]
           (cp/pmap 3 #(fetch-image token path lang :high-res % force) content)))
       (println "Unable to read promo data from remote source - is your key accurate?"))))
 
@@ -117,6 +118,8 @@
    ["-l" "--language LANG" "Which language fragment to check/update. Default is 'en'"
     :id :lang
     :default "en"]
+   ["-v " "--verbose" "Nags you for every path it can't find (ie, high-res images dont exist)"
+    :id :verbose]
    ["-t" "--token PATH" "Path to fetch token from"
     :id :token
     :validate [#(.exists (io/file %))

src/cljs/nr/cardbrowser.cljs

@@ -591,7 +591,7 @@
           ^{:key n}
           [:option {:value n :key n}
            (if indent
-             (str "* " (tr-set n))
+             (str "• " (tr-set n))
              (tr-set n))]))]]
      [simple-filter-builder (tr [:card-browser-form_side "Side"])
       state :side-filter ["Corp" "Runner"] tr-side]
@@ -620,11 +620,14 @@
             alts (:alt-info @app-state)
             info (first (filter #(= (:version %) art) alts))
             blurb (:artist-blurb info)
+            about (:artist-about info)
             link (:artist-link info)]
         (when blurb
           [:div.panel.green-shade.artist-blurb
            [:h4 (tr [:card-browser_artist-info "Artist Info"])]
            [:div blurb]
+           (when (and about (not= about blurb))
+             [:div about])
            (when link
              [:a {:href link} (tr [:card-browser_more-info "More Info"])])])))))
 

src/cljs/nr/translations.cljs

@@ -19,6 +19,8 @@
   (-> (or s "")
       (str/replace " " "-")
       (str/replace "&" "-")
+      (str/replace "'" "-")
+      (str/replace "." "")
       (str/lower-case)))
 
 (defn tr-fix-server-name