[bibliographie] UX improvements and new external resource view for pdfs that allows to import

SQUASHED: bibliographie-UX-improvements-and-new-external-resource-view-for-pdfs-that-allows-to-import,

Author: JensLincke

[object Object]

@@ -104,7 +104,7 @@ Bibliography.cleanTitle("{{This is my Title}}")
   MD*/
 
   static cleanTitle(titleString="") {
-     return titleString.replace(/[{}:\[\]]/g,"").replace(/[—]/g," ")
+     return titleString.replace(/[{}\[\]]/g,"").replace(/[—“”'`,.;:"] ?/g," ")
   }
 
   // #TODO this method obviously will need a lot of tweaking...

src/client/bibliography.js

@@ -119,7 +119,15 @@ export default class Files {
 
 
   static async copyURLtoURL(fromURL, toURL) {
-    var blob = await fetch(fromURL, {method: 'GET'}).then(r => r.blob())
+    try {
+      var getResp = await fetch(fromURL, {method: 'GET'})
+    } catch(e) {
+      console.log("[files] copyURLtoURL... falling back to server side download for: " + fromURL)
+      var lively4serverurl = lively4url.replace(/[^/]*$/,"")
+      getResp = await fetch(lively4serverurl = "/_curl/?target=" + fromURL)
+      // Error maybe due to CORS?
+    }
+    var blob = await getResp.blob()
     return fetch(toURL, {method: 'PUT', body: blob})
   }
 

src/client/files.js

@@ -446,9 +446,6 @@ export class Paper {
   }
 
   async toHTML() {
-    await this.resolveReferences() // .then(() => lively.notify("resolved references for " + this.key))
-    await this.findReferencedBy()
-    
     var bibtexEntries = await this.findBibtexFileEntries()
     var pdfs = this.value.S && this.value.S.filter(ea => ea.Ty == 3).map(ea => ea.U);
 
@@ -490,8 +487,18 @@ export class Paper {
   
       </div>
       ${
-        pdfs && pdfs.length > 0 ? 
-           "<h3>Online PDFs</h3>" + pdfs.map(url => `<a href="${url}">${url.replace(/.*\//,"")}</a>`) : ""
+        pdfs && pdfs.length > 0 ? "<h3>Import PDFs</h3>" + 
+`<lively-script><script>
+  var pdfs = ${JSON.stringify(pdfs)}
+  var container = lively.query(this, "lively-container")
+  var result = <span>{...pdfs.map(ea => <a click={async () => {
+    var comp = await lively.openComponentInWindow("external-resource")
+    comp.importURL = ${JSON.stringify(await this.toImportURL())}
+    comp.src = ea
+}}>{ea.replace(/.*\\//,"")} </a>)}</span> 
+  result
+</script></lively-script>`: ""
+            // + pdfs.map(url => `<a href="${url}" onclick="${}">${url.replace(/.*\//,"")}</a>`) 
       }
       <h3>Bibliographies</h3>
       <div>${
@@ -520,10 +527,49 @@ export class Paper {
       <h3>Abstract</h3>
       <div class="abstract">${this.abstract}</div>
       <h3>References</h3>
-      ${this.papersToBibtex(this.references)}
+      ${`
+<lively-script><script>
+  var paper = Paper.byId(${this.microsoftid})
+  paper.resolveReferences().then(() => paper.papersToBibtex(paper.references))
+</script></lively-script>`}
+    
       <h3>Referenced By</h3>
-      ${this.papersToBibtex(this.referencedBy)}     
+      ${`
+<lively-script><script>
+    var paper = Paper.byId(${this.microsoftid})
+    paper.findReferencedBy().then(() => paper.papersToBibtex(paper.referencedBy))
+</script></lively-script>`}
+    
   </div>`
+
+    
+  /*
+      
+    await this.resolveReferences() // .then(() => lively.notify("resolved references for " + this.key))
+    await this.findReferencedBy()
+    
+      ${this.papersToBibtex(this.references)}
+      
+      ${this.papersToBibtex(this.referencedBy)}     
+  */
+  
+  }
+  
+  async generateFilename() {
+    var entry = this.toBibtexEntry()
+    var bibentry = await (<lively-bibtex-entry></lively-bibtex-entry>)
+    bibentry.value = entry
+    var filename = bibentry.generateFilename(entry)
+    return filename + ".pdf"
+  }
+  
+  async toImportURL() {
+    var filename = await this.generateFilename()
+    var baseURL = await Paper.importBaseURL()
+    if (!baseURL) {
+      throw new Error("[Paper] toImportURL error: could not find baseURL " + Paper.importBaseURLDirName())
+    }
+    return baseURL + filename 
   }
 
   toBibtex() {
@@ -536,6 +582,17 @@ export class Paper {
     contentNode.appendChild(inspector.display(this.toBibtex(), false, "#bibtex", this))
   }
 
+  static importBaseURLDirName() {
+    return "_incoming" // #TODO add to preferences....
+  }
+  
+  static async importBaseURL() {
+    // #TODO make this also more customizeable
+    var files =  await FileIndex.current().db.files.toArray()
+    var file = files.find(ea => ea.url.match(`/${this.importBaseURLDirName()}/`))
+    return file && file.url.replace(/[^/]*$/,"")
+  }
+  
 }
 
 

src/client/literature.js

@@ -96,7 +96,6 @@ export default class AcademicScheme extends Scheme {
       return focalStorage.setItem(academicSubscriptionKeyId, key);
   }
 
-  
   static async getSubscriptionKey() {
     var key = await focalStorage.getItem(academicSubscriptionKeyId);
     if (!key) {

src/client/protocols/academic.js

@@ -0,0 +1,13 @@
+<template id="external-resource" >
+  <style data-src="/src/external/font-awesome/css/font-awesome.css"></style>
+  <style data-src="/templates/livelystyle.css"></style>
+  <style>
+    :host {
+
+    }
+  </style>
+  <button id="import">import</button>
+  <button id="open">open</button>
+  <lively-iframe src=""></lively-iframe>
+</template>
+

src/components/tools/external-resource.html

@@ -0,0 +1,67 @@
+
+import Morph from 'src/components/widgets/lively-morph.js';
+
+export default class ExternalResource extends Morph {
+  async initialize() {
+ 
+    this.updateView()
+    this.registerButtons()
+  }
+  
+  
+  get src() {
+    return this.getAttribute("src")
+  }
+
+  set src(url) {
+    this.setAttribute("src", url)
+    this.updateView()
+  }
+
+  get importURL() {
+    return this.getAttribute("import-url")
+  }
+
+  set importURL(url) {
+    this.setAttribute("import-url", url)
+    this.updateView()
+  }
+
+  async onImport() {
+    if (!this.src) throw new Error('src url missing')
+    if(!this.importURL) throw new Error('import url missing')
+    await lively.files.copyURLtoURL(this.src, this.importURL)
+    lively.notify("imported", this.importURL, undefined, () => {
+      lively.openBrowser(this.importURL)
+    })
+    this.get("#open").hidden = false
+  }
+  
+  async onOpen() {
+    lively.openBrowser(this.importURL)
+  }
+  
+  async updateView() {
+    var frame = this.get('lively-iframe')
+    frame.setURL(this.src) 
+    frame.hideMenubar()
+    if (this.importURL == null) {
+      this.get("#import").hidden = true
+    } else {
+      this.get("#import").hidden = false
+    }      
+    this.get("#open").hidden = true
+    if (this.importURL && await lively.files.existFile(this.importURL)) {
+      this.get("#open").hidden = false  
+    }
+
+  }
+  
+ 
+  async livelyExample() {
+    this.importURL = "http://localhost:9005/Dropbox/Thesis/Literature/_misc/LatozaTest.pdf"
+    this.src = "https://www.st.cs.uni-saarland.de/edu/empirical-se/2006/PDFs/latoza06.pdf"
+  }
+  
+  
+}

src/components/tools/external-resource.js

@@ -172,7 +172,6 @@ export default class LiteratureListing extends Morph {
   }
 
   renderLiteratureFile(literatureFile) {
-    debugger
     var entryDetails = literatureFile.entry ? 
         <span>
           <span class="authors">{literatureFile.entry.authors.join(", ")}</span>.

src/components/tools/literature-listing.js

@@ -11,6 +11,15 @@ describe('Bibliography', () => {
       expect(Bibliography.threeSignificantInitialsFromTitle(title)).to.equal("OSU")
     });
   })
+
+  describe('cleanTitle', () => {
+    it('it strips special chars', async function() {
+     expect(Bibliography.cleanTitle(`Hello:World`)).to.equal("Hello World")
+    });
+    it('it does not insert extra whitespace', async function() {
+     expect(Bibliography.cleanTitle(`Hello: World`)).to.equal("Hello World")
+    });
+  })
 
   describe('filenameToKey', () => {
     it('converts normal filename', async function() {