#295 修复同步

package.json

@@ -1,6 +1,6 @@
 {
  "name": "zotero-style",
- "version": "2.5.3",
+ "version": "2.5.4",
  "description": "让你的Zotero看起来更有趣",
  "config": {
  "addonName": "Zotero Style",

src/modules/localStorage.ts

@@ -1,8 +1,8 @@
 import { config } from "../../package.json";
 
 class LocalStorage {
- private filename!: string;
- private cache: any;
+ public filename!: string;
+ public cache: any;
  public lock: _ZoteroPromiseObject;
  constructor(filename: string) {
  this.lock = Zotero.Promise.defer()
@@ -31,12 +31,12 @@ class LocalStorage {
 
  get(item: Zotero.Item, key: string) {
  if (this.cache == undefined) { return }
- return (this.cache[item.id] ??= {})[key]
+ return (this.cache[item.key] ??= {})[key]
  }
 
  async set(item: Zotero.Item, key: string, value: any) {
  await this.lock.promise;
- (this.cache[item.id] ??= {})[key] = value
+ (this.cache[item.key] ??= {})[key] = value
  window.setTimeout(async () => {
  await Zotero.File.putContentsAsync(this.filename, JSON.stringify(this.cache));
  })

src/modules/prefs.ts

@@ -62,6 +62,18 @@ export function registerPrefsScripts(_window: Window) {
  }
  } catch(e) {console.log(e)}
  })
+ Object.keys(storage.cache).forEach((_id: string) => {
+ let id = Number(_id)
+ let key = Zotero.Items.get(id).key
+ let data = storage.cache[key]
+ if (!data.readingTime?.data) {
+ storage.cache[key] = storage.cache[id]
+ }
+ })
+ window.setTimeout(async () => {
+ await Zotero.File.putContentsAsync(storage.filename, JSON.stringify(storage.cache));
+ ztoolkit.getGlobal("alert")("Please restart Zotero.")
+ })
  }
  })
 }

src/modules/tags.ts

@@ -342,19 +342,21 @@ export class Tags {
  margin: "0 5px"
  },
  properties: {
- value: this.searchText
+ value: this.searchText,
  },
  listeners: [
  {
  type: "focus",
  listener: () => {
  searchBox.style.opacity = "1"
+ searchBox.style.boxShadow = `0 0 0 1px rgba(0,0,0,0.5)`
  }
  },
  {
  type: "blur",
  listener: () => {
  searchBox.style.opacity = "0.6"
+ searchBox.style.boxShadow = ``
  }
  },
  {

src/modules/views.ts

@@ -947,7 +947,7 @@ export default class Views {
  let update = async (item: Zotero.Item) => {
  const cacheKey = `${item.key}-annoRecord`
  if (item.isRegularItem()) {
- let pdfItem
+ let pdfItem: Zotero.Item
  try {
  pdfItem = await item.getBestAttachment()
  } catch {
@@ -958,8 +958,18 @@ export default class Views {
  }
  let page: number = 0;
  try {
- page = Number(this.storage.get(item, "readingTime").page)
- } catch { }
+ const key = `${pdfItem.id} total-pages`
+ // this.cache[key] ??= (await Zotero.Fulltext.getPages(pdfItem.id)).total
+ // if (!this.cache[key]) {
+ // window.setTimeout(async () => {
+ // await Zotero.FullText.indexItems([pdfItem.id], { complete: true });
+ // })
+ // }
+ page = Number(this.storage.get(item, "readingTime").page) ||
+ (this.cache[key] ??= (await Zotero.Fulltext.getPages(pdfItem.id)).total) ||
+ page
+ } catch (e) { console.log(e) }
+ console.log(page)
  let annoRecord: any = { page, data: {} }
  const annoArray = pdfItem.getAnnotations()
  annoArray.forEach((anno: any) => {
@@ -3546,6 +3556,7 @@ export default class Views {
 
  // div.querySelector("span").style.backgroundColor = "#ffffff"
  // div.querySelector("span").style.color = "#ffffff"
+
  const row = ZoteroPane.collectionsView.getRow(index)
  const ref = row.ref!
  if (index > 0) {

update.json

@@ -3,7 +3,7 @@
  "[email protected]": {
  "updates": [
  {
- "version": "2.5.3",
+ "version": "2.5.4",
  "update_link": "https://github.com/muisedestiny/zotero-style/releases/latest/download/zotero-style.xpi",
  "applications": {
  "gecko": {
@@ -12,7 +12,7 @@
  }
  },
  {
- "version": "2.5.3",
+ "version": "2.5.4",
  "update_link": "https://github.com/muisedestiny/zotero-style/releases/latest/download/zotero-style.xpi",
  "applications": {
  "zotero": {

update.rdf

@@ -5,7 +5,7 @@
  <rdf:Seq>
  <rdf:li>
  <rdf:Description>
- <em:version>2.5.3</em:version>
+ <em:version>2.5.4</em:version>
  <em:targetApplication>
  <rdf:Description>
  <em:id>[email protected]</em:id>