|
|
@@ -241,25 +241,32 @@
|
|
|
(update-src-full-content content)
|
|
|
(collect-page-properties)))
|
|
|
(catch js/Error e
|
|
|
- (log/error :edn/convert-failed e)
|
|
|
+ (js/console.error e)
|
|
|
[]))
|
|
|
(log/error :edn/wrong-content-type content)))
|
|
|
|
|
|
(defn ->edn-async
|
|
|
- [content config]
|
|
|
- (if util/node-test?
|
|
|
- (p/resolved (->edn content config))
|
|
|
- (try
|
|
|
- (if (string/blank? content)
|
|
|
- (p/resolved [])
|
|
|
- (p/let [v (pool/add-parse-job! content config)]
|
|
|
- (-> v
|
|
|
- (util/json->clj)
|
|
|
- (update-src-full-content content)
|
|
|
- (collect-page-properties))))
|
|
|
- (catch js/Error e
|
|
|
- (log/error :edn/convert-failed e)
|
|
|
- (p/resolved [])))))
|
|
|
+ ([content config]
|
|
|
+ (->edn-async nil content config))
|
|
|
+ ([file content config]
|
|
|
+ (if util/node-test?
|
|
|
+ (p/resolved (->edn content config))
|
|
|
+ (try
|
|
|
+ (if (string/blank? content)
|
|
|
+ (p/resolved [])
|
|
|
+ (p/let [v (pool/add-parse-job! content config)]
|
|
|
+ (try
|
|
|
+ (-> v
|
|
|
+ (util/json->clj)
|
|
|
+ (update-src-full-content content)
|
|
|
+ (collect-page-properties))
|
|
|
+ (catch js/Error e
|
|
|
+ (println :parser/failed file)
|
|
|
+ (js/console.error e)
|
|
|
+ (p/resolved [])))))
|
|
|
+ (catch js/Error e
|
|
|
+ (log/error :parser/failed e)
|
|
|
+ (p/resolved []))))))
|
|
|
|
|
|
(defn opml->edn
|
|
|
[content]
|