enhance(zotero): better multi-profile experience

src/main/frontend/extensions/pdf/assets.cljs

@@ -18,6 +18,7 @@
  [frontend.util :as util]
  [frontend.extensions.pdf.utils :as pdf-utils]
  [frontend.extensions.pdf.windows :as pdf-windows]
+ [frontend.extensions.zotero.setting :as setting]
  [logseq.common.path :as path]
  [logseq.graph-parser.config :as gp-config]
  [logseq.graph-parser.util.block-ref :as block-ref]
@@ -152,7 +153,7 @@
  (when-let [page-name (util/trim-safe (:key pdf-current))]
  (let [page-name (str "hls__" page-name)
  page (db-model/get-page page-name)
- file-path (:original-path pdf-current)
+ file-path (clojure.string/replace (:original-path pdf-current) #"^file://" "")
  format (state/get-preferred-format)
  repo-dir (config/get-repo-dir (state/get-current-repo))
  asset-dir (util/node-path.join repo-dir gp-config/local-assets-dir)
@@ -237,6 +238,37 @@
  (state/set-current-pdf! (inflate-asset file-path)))
  (js/console.debug "[Unmatched highlight ref]" block)))))))
 
+(defn zotero-update-pdf-path [pdf-path]
+ ;; Check if pdf-path is a sub-path of any of the base-dirs in profiles
+ ;; FEAT Suggest users to check profiles if pdf-path is not a sub-path of any of the base-dirs in the config
+ (when-let [base-dirs (->> (setting/sub-zotero-config) vals
+ (map :zotero-linked-attachment-base-directory)
+ vec rest)]
+ (let [pollution-source
+ (reduce (fn [longest-path path]
+ (if (and (clojure.string/includes? pdf-path path)
+ (> (count path) (count longest-path)))
+ path longest-path))
+ nil base-dirs)]
+ (if pollution-source
+ (string/replace pdf-path pollution-source
+ (setting/setting :zotero-linked-attachment-base-directory))
+ nil))))
+
+(defn handle-missing-pdf-error!
+ ;; Handle "MissingPDFException" error.
+ ;; Return true if missing pdf is found and then handled, 
+ ;; otherwise return false
+ ;; For now it only deals with :file-path pollution caused by zotero multi-profiles workflow
+ [pdf-current]
+ (let [file-path (-> (:original-path pdf-current)
+ (zotero-update-pdf-path))]
+ (if file-path
+ (do
+ (state/set-state! :pdf/current (inflate-asset file-path))
+ true)
+ false)))
+
 (defn goto-block-ref!
  [{:keys [id] :as hl}]
  (when id

src/main/frontend/extensions/pdf/core.cljs

@@ -945,11 +945,14 @@
  (case (.-name error)
  "MissingPDFException"
  (do
- (notification/show!
- (str "Error: " (.-message error) "\n Is this the correct path?")
- :error
- false)
- (state/set-state! :pdf/current nil))
+ (if (pdf-assets/handle-missing-pdf-error! pdf-current)
+ (set-loader-state! {:error nil})
+ (do
+ (notification/show!
+ (str "Error: " (.-message error) "\n Is this the correct path?")
+ :error
+ false)
+ (state/set-state! :pdf/current nil))))
 
  "InvalidPDFException"
  (do