Merge pull request #12 from e-e-e/development

0.1.3
samiz-dat · Jul 27, 2017 · be37a53 · be37a53
2 parents 2d8d29c + bd0b718
commit be37a53
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dat-library",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "author": "e-e-e <e-e-e@users.noreply.github.com>",
   "description": "A tool for searching, building and sharing distributed p2p libraries.",
   "license": "ISC",
@@ -60,7 +60,8 @@
   "dependencies": {
     "axios": "^0.16.2",
     "babel-polyfill": "^6.23.0",
-    "dat-cardcat": "^0.3.5",
+    "dat-cardcat": "^0.4.0",
+    "dat-cardcat-formats": "^0.0.1",
     "element-ui": "1.3.7",
     "lodash": "^4.17.4",
     "pretty-bytes": "^4.0.2",

diff --git a/src/renderer/components/datBook.vue b/src/renderer/components/datBook.vue
@@ -31,6 +31,7 @@
   import path from 'path';
   import { shell } from 'electron';
   import { mapActions, mapGetters } from 'vuex';
+  import { formatPath } from 'dat-cardcat-formats';
 
   export default {
     name: 'datBook',
@@ -48,10 +49,15 @@
     computed: {
       ...mapGetters(['datWithKey']),
       filepath: function filepath() {
-        return this.book.files.map(file => path.join(this.datWithKey(file.dat).dir, this.book.author, this.book.title, file.file));
-      },
-      bookpath: function bookpath() {
-        return this.book.files.map(file => path.join(this.datWithKey(file.dat).dir, this.book.author, this.book.title));
+        return this.book.files.map(file => path.join(
+          this.datWithKey(file.dat).dir, 
+          formatPath({ 
+            author: this.book.author, 
+            title: this.book.title, 
+            file: file.file,
+            format: this.datWithKey(file.dat).format,
+          })
+        ));
       },
     },
     methods: {

diff --git a/src/renderer/components/libraryStats.vue b/src/renderer/components/libraryStats.vue
@@ -9,7 +9,7 @@
         <el-badge :value="stats.peers.complete || '0'" class="item">Complete</el-badge>
       </el-col>
       <el-col :span="4">
-        &uarr; {{ stats.uploadSpeed || 0 }} &bull; &darr; {{ stats.downloadSpeed || 0 }}
+        &uarr; {{ upload || 0 }} &bull; &darr; {{ download || 0 }}
       </el-col>
       <el-col :span="12"/>
     </el-row>
@@ -84,6 +84,14 @@
         const stats = this.stats;
         return prettyBytes(stats.size);
       },
+      download() {
+        const stats = this.stats;
+        return prettyBytes(stats.downloadSpeed || 0);
+      },
+      upload() {
+        const stats = this.stats;
+        return prettyBytes(stats.uploadSpeed || 0);
+      },
     },
     methods: {
       sanitisePercentage: (value) => {

diff --git a/src/renderer/store/store.js b/src/renderer/store/store.js
@@ -156,11 +156,7 @@ const store = new Vuex.Store({
         commit('setDownloadStat', data);
         dispatch('getDatStats');
         if (data.progress === 100) {
-          // @TODO: rather than crudely parsing file here -
-          // we should make dat-cardcat pass over format type,
-          // and make formatter into a seporate module
-          const x = _.split(data.file, '/');
-          commit('setDownloadedResult', { author: x[1], title: x[2], file: x[3], dat: data.key });
+          commit('setDownloadedResult', { ...data.parsed, dat: data.key });
         }
         // SD: possible to re-run current results query if desired
         // if (state.resultsQuery && state.resultsQuery.func) {