Update users table info #94, Reorder libraries in config #95, Use dropdown for library menu #96, update mobi reader

Merge branch 'master' of https://github.com/advplyr/audiobookshelf

.dockerignore

@@ -6,6 +6,7 @@ npm-debug.log
 /config
 /audiobooks
 /audiobooks2
+/media/
 /metadata
 dev.js
 test/

.gitignore

@@ -4,6 +4,7 @@ node_modules/
 /config/
 /audiobooks/
 /audiobooks2/
+/media/
 /metadata/
 test/
 /client/.nuxt/

client/assets/app.css

@@ -1,4 +1,5 @@
 @import url('./transitions.css');
+@import url('./draggable.css');
 
 .page {
   width: 100%;
@@ -51,6 +52,19 @@
   opacity: 0;
 }
 
+/* Chrome, Safari, Edge, Opera */
+.no-spinner::-webkit-outer-spin-button,
+.no-spinner::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+/* Firefox */
+input[type=number] {
+  -moz-appearance: textfield;
+}
+
+
 .tracksTable {
   border-collapse: collapse;
   width: 100%;
@@ -66,10 +80,10 @@
   background-color: #474747;
 }
 .tracksTable td {
-  padding: 4px;
+  padding: 4px 8px;
 }
 .tracksTable th {
-  padding: 4px;
+  padding: 4px 8px;
   font-size: 0.75rem;
 }
 

client/assets/draggable.css

@@ -0,0 +1,38 @@
+.flip-list-move {
+  transition: transform 0.5s;
+}
+.no-move {
+  transition: transform 0s;
+}
+.ghost {
+  opacity: 0.5;
+  background-color: rgba(255, 255, 255, 0.25);
+}
+.list-group {
+  min-height: 30px;
+}
+#librariesTable .item {
+  cursor: n-resize;
+}
+.list-group-item:not(.exclude) {
+  cursor: n-resize;
+}
+.list-group-item.exclude {
+  cursor: not-allowed;
+}
+.list-group-item:not(.ghost):not(.exclude):hover {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+.list-group-item:nth-child(even):not(.ghost):not(.exclude) {
+  background-color: rgba(0, 0, 0, 0.25);
+}
+.list-group-item:nth-child(even):not(.ghost):not(.exclude):hover {
+  background-color: rgba(0, 0, 0, 0.1);
+}
+
+.list-group-item.exclude:not(.ghost) {
+  background-color: rgba(255, 0, 0, 0.25);
+}
+.list-group-item.exclude:not(.ghost):hover {
+  background-color: rgba(223, 0, 0, 0.25);
+}

client/assets/ebooks/basic.js

@@ -0,0 +1,506 @@
+/*
+Calibres stylesheet
+*/
+
+export default `
+@charset "UTF-8";
+
+/*
+  Calibre styles
+*/
+.arabic {
+    display: block;
+    list-style-type: decimal;
+    margin-bottom: 1em;
+    margin-right: 0;
+    margin-top: 1em;
+    text-align: justify
+    }
+.attribution {
+    display: block;
+    font-size: 1em;
+    line-height: 1.2;
+    text-align: left;
+    margin: 0.3em 0
+    }
+.big {
+    font-size: 1.375em;
+    line-height: 1.2
+    }
+.big1 {
+    font-size: 1em
+    }
+.block {
+    display: block;
+    text-align: justify;
+    margin: 1em 1em 2em
+    }
+.block1 {
+    display: block;
+    text-align: justify;
+    margin: 1em 4em
+    }
+.block2 {
+    display: block;
+    text-align: justify;
+    margin: 1em 1em 1em 2em
+    }
+.bullet {
+    display: block;
+    list-style-type: disc;
+    margin-bottom: 1em;
+    margin-right: 0;
+    margin-top: 1em;
+    text-align: disc
+    }
+.calibre {
+    background-color: #000007;
+    display: block;
+    font-family: Charis, "Times New Roman", Verdana, Arial;
+    font-size: 1.125em;
+    line-height: 1.2;
+    padding-left: 0;
+    padding-right: 0;
+    text-align: center;
+    margin: 0 5pt
+    }
+.calibre1 {
+    display: block
+    }
+.calibre2 {
+    height: auto;
+    width: auto
+    }
+.calibre3:not(strong) {
+    display: block;
+    font-family: Charis, "Times New Roman", Verdana, Arial;
+    font-size: 1.125em;
+    line-height: 1.2;
+    padding-left: 0;
+    padding-right: 0;
+    margin: 0 5pt
+    }
+.calibre4 {
+    font-weight: bold
+    }
+.calibre5 {
+    font-style: italic
+    }
+.calibre6 {
+    background-color: #FFF;
+    display: block;
+    font-family: Charis, "Times New Roman", Verdana, Arial;
+    font-size: 1.125em;
+    line-height: 1.2;
+    padding-left: 0;
+    padding-right: 0;
+    text-align: center;
+    margin: 0 5pt
+    }
+.calibre7 {
+    display: list-item
+    }
+.calibre8 {
+    font-size: 1em;
+    line-height: 1.2;
+    vertical-align: super
+    }
+.calibre9 {
+    border-collapse: separate;
+    border-spacing: 2px;
+    display: table;
+    margin-bottom: 0;
+    margin-top: 0;
+    text-indent: 0
+    }
+.calibre10 {
+    display: table-row;
+    vertical-align: middle
+    }
+.calibre11 {
+    display: table-cell;
+    text-align: right;
+    vertical-align: inherit;
+    padding: 1px
+    }
+.calibre12 {
+    display: table-cell;
+    text-align: left;
+    vertical-align: inherit;
+    padding: 1px
+    }
+.calibre13 {
+    height: 1em;
+    width: auto
+    }
+.calibre14 {
+    font-size: 0.88889em;
+    line-height: 1.2;
+    vertical-align: super
+    }
+.calibre15 {
+    font-size: 1em;
+    line-height: 1.2;
+    vertical-align: sub
+    }
+.calibre16 {
+    display: block;
+    list-style-type: decimal;
+    margin-bottom: 1em;
+    margin-right: 0;
+    margin-top: 1em
+    }
+.calibre17 {
+    display: block;
+    font-size: 1.125em;
+    font-weight: bold;
+    line-height: 1.2;
+    margin: 0.83em 0
+    }
+.center {
+    display: block;
+    text-align: center;
+    margin: 1em 0
+    }
+.center1 {
+    display: block;
+    font-size: 1em;
+    font-weight: bold;
+    line-height: 1.2;
+    text-align: center;
+    margin: -2em 0 3em
+    }
+.center2 {
+    display: block;
+    font-size: 1em;
+    font-weight: bold;
+    line-height: 1.2;
+    text-align: center;
+    margin: 2em 0 1em
+    }
+.center3 {
+    display: block;
+    text-align: center;
+    margin: -1em 0 1em
+    }
+.center4 {
+    display: block;
+    text-align: center;
+    text-indent: 3%;
+    margin: 1em 0
+    }
+.chapter {
+    display: block;
+    font-size: 1.125em;
+    font-weight: bold;
+    line-height: 2em;
+    text-align: center;
+    margin: 2em 0 1em
+    }
+.chapter1 {
+    display: block;
+    font-size: 0.88889em;
+    line-height: 1.2;
+    margin-left: 0.5em;
+    margin-right: 0.5em;
+    margin-top: 2em
+    }
+.chapter2 {
+    display: block;
+    font-size: 1.125em;
+    font-weight: bold;
+    line-height: 2em;
+    text-align: center;
+    margin: 2em 0 3em
+    }
+.copyright {
+    display: block;
+    font-size: 0.88889em;
+    line-height: 1.2;
+    margin-top: 4em;
+    text-align: center
+    }
+.dedication {
+    display: block;
+    font-size: 0.88889em;
+    line-height: 1.2;
+    margin-top: 4em
+    }
+.dropcaps {
+    float: left;
+    font-size: 3.4375rem;
+    line-height: 50px;
+    margin-right: 0.09em;
+    margin-top: -0.05em;
+    padding-top: 1px
+    }
+.dropcaps1 {
+    float: left;
+    font-size: 3.4375rem;
+    line-height: 50px;
+    margin-right: 0.09em;
+    margin-top: 0.15em;
+    padding-top: 1px
+    }
+.extract {
+    display: block;
+    text-align: justify;
+    margin: 2em 0 0.3em
+    }
+.extract1 {
+    display: block;
+    text-align: justify;
+    text-indent: 3%;
+    margin: 2em 0 0.3em
+    }
+.extract2 {
+    display: block;
+    text-align: justify;
+    margin: 1em 0 0.3em
+    }
+.footnote {
+    border-bottom-style: solid;
+    border-bottom-width: 0;
+    border-left-style: solid;
+    border-left-width: 0;
+    border-right-style: solid;
+    border-right-width: 0;
+    border-top-style: solid;
+    border-top-width: 1px;
+    display: block;
+    font-size: 1em;
+    line-height: 1.2;
+    margin-top: 2 em
+    }
+.footnote1 {
+    display: block;
+    text-align: justify;
+    margin: 0.3em 0 0.3em 2
+    }
+.footnote2 {
+    border-bottom-style: solid;
+    border-bottom-width: 0;
+    border-left-style: solid;
+    border-left-width: 0;
+    border-right-style: solid;
+    border-right-width: 0;
+    border-top-style: solid;
+    border-top-width: 1px;
+    display: block;
+    font-size: 0.88889em;
+    line-height: 1.2;
+    margin-top: 2 em
+    }
+.hanging {
+    display: block;
+    font-size: 0.88889em;
+    line-height: 1.2;
+    text-align: left;
+    text-indent: -1em;
+    margin: 0.5em 0 0.3em 1em
+    }
+.hanging1 {
+    display: block;
+    font-size: 0.88889em;
+    line-height: 1.2;
+    text-align: left;
+    text-indent: -1em;
+    margin: 0.5em 0 0.3em 1.5em
+    }
+.hanging2 {
+    display: block;
+    font-size: 1em;
+    line-height: 1.2;
+    text-indent: -1em;
+    margin: 0.5em 0 0.3em 1em
+    }
+.hanging3 {
+    display: block;
+    font-size: 1em;
+    line-height: 1.2;
+    text-align: left;
+    text-indent: 1em;
+    margin: 0.1em 0 0.3em 1em
+    }
+.hanging4 {
+    display: block;
+    font-size: 1em;
+    line-height: 1.2;
+    text-align: left;
+    text-indent: 0.1em;
+    margin: 0.1em 0 0.3em 1em
+    }
+a.hlink {
+    text-decoration: none
+    }
+.indent {
+    display: block;
+    text-align: justify;
+    text-indent: 1em;
+    margin: 0.3em 0
+    }
+.line {
+    border-top: currentColor solid 1px;
+    border-bottom: currentColor solid 1px
+    }
+.loweralpha {
+    display: block;
+    list-style-type: lower-alpha;
+    margin-bottom: 1em;
+    margin-right: 0;
+    margin-top: 1em;
+    text-align: justify
+    }
+.none {
+    display: block;
+    list-style-type: none;
+    margin-bottom: 1em;
+    margin-right: 0;
+    margin-top: 1em;
+    text-align: justify
+    }
+.none1 {
+    display: block;
+    list-style-type: none;
+    margin-bottom: 0;
+    margin-right: 0;
+    margin-top: 0;
+    text-align: justify
+    }
+.nonindent {
+    display: block;
+    text-align: justify;
+    margin: 0.3em 0
+    }
+.nonindent1 {
+    display: block;
+    font-size: 1.125em;
+    line-height: 1.2;
+    text-indent: -1em;
+    margin: 0.5em 0 0.3em 0.1em
+    }
+.nonindent2 {
+    display: block;
+    font-size: 1.125em;
+    line-height: 1.2;
+    text-indent: -1em;
+    margin: 0.5em 0 0.3em -0.5em
+    }
+.nonindent3 {
+    display: block;
+    text-align: justify;
+    text-indent: 3%;
+    margin: 0.3em 0
+    }
+.part {
+    display: block;
+    font-size: 1em;
+    font-weight: bold;
+    line-height: 2em;
+    text-align: center;
+    margin: 4em 0 1em
+    }
+.preface {
+    display: block;
+    font-size: 0.88889em;
+    line-height: 1.2;
+    margin-left: 2em;
+    margin-right: 2em;
+    text-align: justify
+    }
+.pubhlink {
+    color: green;
+    text-decoration: none
+    }
+.right {
+    display: block;
+    text-align: right;
+    margin: 0.3em 0
+    }
+.section {
+    display: block;
+    font-size: 1.125em;
+    font-weight: bold;
+    line-height: 1.2;
+    text-align: center;
+    margin: 2em 0 0.5em
+    }
+.section1 {
+    display: block;
+    font-size: 1.125em;
+    font-weight: bold;
+    line-height: 1.2;
+    text-align: left;
+    margin: 2em 0 0.3em
+    }
+.section2 {
+    display: block;
+    font-size: 1em;
+    font-weight: bold;
+    line-height: 1.2;
+    text-align: left;
+    margin: 2em 0 0.3em 1em
+    }
+.small {
+    font-size: 0.66667em
+    }
+.small1 {
+    font-size: 0.75em
+    }
+.subchapter {
+    display: block;
+    font-size: 1.125em;
+    font-weight: bold;
+    line-height: 1.2;
+    margin: 1em 0
+    }
+.textbox {
+    background-color: #E4E4E4;
+    display: block;
+    line-height: 1.5em;
+    margin-bottom: 2em;
+    margin-top: 2em;
+    text-align: justify;
+    border-top: currentColor double 2px;
+    border-bottom: currentColor double 2px
+    }
+.textbox1 {
+    display: block;
+    text-align: justify;
+    margin: 0.3em 0.5em 0.3em 0.8em
+    }
+.textbox2 {
+    display: block;
+    text-align: justify;
+    text-indent: 1em;
+    margin: 0.3em 0.5em
+    }
+.textbox3 {
+    display: block;
+    text-align: justify;
+    text-indent: 3%;
+    margin: 0.3em 0.5em 0.3em 0.8em
+    }
+.titlepage {
+    display: block;
+    margin-left: -0.4em;
+    margin-top: 1.2em
+    }
+.toc {
+    display: block;
+    font-size: 1em;
+    line-height: 1.2;
+    text-align: center
+    }
+.toc1 {
+    display: block;
+    font-size: 1em;
+    font-weight: bold;
+    line-height: 1.2;
+    text-align: center;
+    margin: 0.67em 0 3em
+    }
+.underline {
+    text-decoration: underline
+    }
+`

client/assets/ebooks/htmlParser.js

@@ -0,0 +1,248 @@
+/*
+This is borrowed from koodo-reader https://github.com/troyeguo/koodo-reader/tree/master/src
+*/
+
+export const isTitle = (
+  line,
+  isContainDI = false,
+  isContainChapter = false,
+  isContainCHAPTER = false
+) => {
+  return (
+    line.length < 30 &&
+    line.indexOf("[") === -1 &&
+    line.indexOf("(") === -1 &&
+    (line.startsWith("CHAPTER") ||
+      line.startsWith("Chapter") ||
+      line.startsWith("序章") ||
+      line.startsWith("前言") ||
+      line.startsWith("声明") ||
+      line.startsWith("聲明") ||
+      line.startsWith("写在前面的话") ||
+      line.startsWith("后记") ||
+      line.startsWith("楔子") ||
+      line.startsWith("后序") ||
+      line.startsWith("寫在前面的話") ||
+      line.startsWith("後記") ||
+      line.startsWith("後序") ||
+      /(?=[MDCLXVI])M*(C[MD]|D?C{0,3})(X[CL]|L?X{0,3})(I[XV]|V?I{0,3})$/.test(
+        line
+      ) ||
+      (line.startsWith("第") && startWithDI(line)) ||
+      (line.startsWith("卷") && startWithJUAN(line)) ||
+      startWithRomanNum(line) ||
+      (!isContainDI &&
+        !isContainChapter &&
+        !isContainCHAPTER &&
+        line.indexOf("第") > -1 &&
+        (line[line.indexOf("第") - 1] === " " ||
+          line[line.indexOf("第") - 1] === "　" ||
+          line[line.indexOf("第") - 1] === "、" ||
+          line[line.indexOf("第") - 1] === "：" ||
+          line[line.indexOf("第") - 1] === ":") &&
+        startWithDI(line.substr(line.indexOf("第")))) ||
+      (!isContainDI &&
+        !isContainChapter &&
+        !isContainCHAPTER &&
+        line.indexOf(" ") &&
+        startWithNumAndSpace(line)) ||
+      (!isContainDI &&
+        !isContainChapter &&
+        !isContainCHAPTER &&
+        line.indexOf("　") &&
+        startWithNumAndSpace(line)) ||
+      (!isContainDI &&
+        !isContainChapter &&
+        !isContainCHAPTER &&
+        line.indexOf("、") &&
+        startWithNumAndPause(line)) ||
+      (!isContainDI &&
+        !isContainChapter &&
+        !isContainCHAPTER &&
+        line.indexOf("：") &&
+        startWithNumAndColon(line)) ||
+      (!isContainDI &&
+        !isContainChapter &&
+        !isContainCHAPTER &&
+        line.indexOf(":") &&
+        startWithNumAndColon(line)))
+  );
+};
+const startWithDI = (line) => {
+  let keywords = [
+    "章",
+    "节",
+    "回",
+    "節",
+    "卷",
+    "部",
+    "輯",
+    "辑",
+    "話",
+    "集",
+    "话",
+    "篇",
+  ];
+  let flag = false;
+  for (let i = 0; i < keywords.length; i++) {
+    if (
+      (line.indexOf(keywords[i]) > -1 &&
+        (line[line.indexOf(keywords[i]) + 1] === " " ||
+          line[line.indexOf(keywords[i]) + 1] === "　" ||
+          line[line.indexOf(keywords[i]) + 1] === "、" ||
+          line[line.indexOf(keywords[i]) + 1] === "：" ||
+          line[line.indexOf(keywords[i]) + 1] === ":")) ||
+      !line[line.indexOf(keywords[i]) + 1]
+    ) {
+      if (
+        /^[\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\u5341\u767e\u5343\u4e07\u842c]+$/.test(
+          line.substring(1, line.indexOf(keywords[i])).trim()
+        ) ||
+        /^\d+$/.test(line.substring(1, line.indexOf(keywords[i])).trim())
+      ) {
+        flag = true;
+      }
+      if (flag) break;
+    }
+  }
+  return flag;
+};
+const startWithJUAN = (line) => {
+  if (
+    /^[\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\u5341\u767e\u5343\u4e07\u842c]+$/.test(
+      line.substring(1, line.indexOf(" "))
+    ) ||
+    /^\d+$/.test(line.substring(1, line.indexOf(" ")))
+  )
+    return true;
+  if (
+    /^[\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\u5341\u767e\u5343\u4e07\u842c]+$/.test(
+      line.substring(1, line.indexOf("　"))
+    ) ||
+    /^\d+$/.test(line.substring(1, line.indexOf("　")))
+  )
+    return true;
+  if (
+    /^[\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\u5341\u767e\u5343\u4e07\u842c]+$/.test(
+      line.substring(1)
+    ) ||
+    /^\d+$/.test(line.substring(1))
+  )
+    return true;
+  return false;
+};
+const startWithRomanNum = (line) => {
+  if (
+    /(?=[MDCLXVI])M*(C[MD]|D?C{0,3})(X[CL]|L?X{0,3})(I[XV]|V?I{0,3})$/.test(
+      line.substring(0, line.indexOf(" "))
+    )
+  )
+    return true;
+  if (
+    /(?=[MDCLXVI])M*(C[MD]|D?C{0,3})(X[CL]|L?X{0,3})(I[XV]|V?I{0,3})$/.test(
+      line.substring(0, line.indexOf("."))
+    )
+  )
+    return true;
+  if (
+    /(?=[MDCLXVI])M*(C[MD]|D?C{0,3})(X[CL]|L?X{0,3})(I[XV]|V?I{0,3})$/.test(
+      line.trim()
+    )
+  )
+    return true;
+  return false;
+};
+const startWithNumAndSpace = (line) => {
+  if (
+    /^[\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\u5341\u767e\u5343\u4e07\u842c]+$/.test(
+      line.substring(0, line.indexOf(" "))
+    )
+  )
+    return true;
+  if (
+    /^[\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\u5341\u767e\u5343\u4e07\u842c]+$/.test(
+      line.substring(0, line.indexOf("　"))
+    )
+  )
+    return true;
+
+  if (/^\d+$/.test(line.substring(0, line.indexOf(" ")))) return true;
+  if (/^\d+$/.test(line.substring(0, line.indexOf("　")))) return true;
+  return false;
+};
+const startWithNumAndColon = (line) => {
+  if (
+    /^[\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\u5341\u767e\u5343\u4e07\u842c]+$/.test(
+      line.substring(0, line.indexOf(":"))
+    )
+  )
+    return true;
+  if (
+    /^[\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\u5341\u767e\u5343\u4e07\u842c]+$/.test(
+      line.substring(0, line.indexOf("："))
+    )
+  )
+    return true;
+
+  if (/^\d+$/.test(line.substring(0, line.indexOf(":")))) return true;
+  if (/^\d+$/.test(line.substring(0, line.indexOf("：")))) return true;
+  return false;
+};
+const startWithNumAndPause = (line) => {
+  if (
+    /^[\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d\u5341\u767e\u5343\u4e07\u842c]+$/.test(
+      line.substring(0, line.indexOf("、"))
+    )
+  )
+    return true;
+
+  if (/^\d+$/.test(line.substring(0, line.indexOf("、")))) return true;
+  return false;
+};
+
+
+class HtmlParser {
+  bookDoc;
+  contentList;
+  contentTitleList;
+  constructor(bookDoc) {
+    this.bookDoc = bookDoc;
+    this.contentList = [];
+    this.contentTitleList = [];
+    this.getContent(bookDoc);
+  }
+  getContent(bookDoc) {
+    this.contentList = Array.from(
+      bookDoc.querySelectorAll("h1,h2,h3,h4,h5,b,font")
+    ).filter((item, index) => {
+      return isTitle(item.innerText.trim());
+    });
+
+    for (let i = 0; i < this.contentList.length; i++) {
+      let random = Math.floor(Math.random() * 900000) + 100000;
+      this.contentTitleList.push({
+        label: this.contentList[i].innerText,
+        id: "title" + random,
+        href: "#title" + random,
+        subitems: [],
+      });
+    }
+    for (let i = 0; i < this.contentList.length; i++) {
+      this.contentList[i].id = this.contentTitleList[i].id;
+    }
+  }
+  getAnchoredDoc() {
+    return this.bookDoc;
+  }
+  getContentList() {
+    return this.contentTitleList.filter((item, index) => {
+      if (index > 0) {
+        return item.label !== this.contentTitleList[index - 1].label;
+      } else {
+        return true;
+      }
+    });
+  }
+}
+
+export default HtmlParser;

client/assets/ebooks/mobi.js

@@ -0,0 +1,450 @@
+/*
+This is borrowed from koodo-reader https://github.com/troyeguo/koodo-reader/tree/master/src
+*/
+
+function ab2str(buf) {
+  if (buf instanceof ArrayBuffer) {
+    buf = new Uint8Array(buf);
+  }
+  return new TextDecoder("utf-8").decode(buf);
+}
+
+var domParser = new DOMParser();
+
+class Buffer {
+  capacity;
+  fragment_list;
+  imageArray;
+  cur_fragment;
+  constructor(capacity) {
+    this.capacity = capacity;
+    this.fragment_list = [];
+    this.imageArray = [];
+    this.cur_fragment = new Fragment(capacity);
+    this.fragment_list.push(this.cur_fragment);
+  }
+  write(byte) {
+    var result = this.cur_fragment.write(byte);
+    if (!result) {
+      this.cur_fragment = new Fragment(this.capacity);
+      this.fragment_list.push(this.cur_fragment);
+      this.cur_fragment.write(byte);
+    }
+  }
+  get(idx) {
+    var fi = 0;
+    while (fi < this.fragment_list.length) {
+      var frag = this.fragment_list[fi];
+      if (idx < frag.size) {
+        return frag.get(idx);
+      }
+      idx -= frag.size;
+      fi += 1;
+    }
+    return null;
+  }
+  size() {
+    var s = 0;
+    for (var i = 0; i < this.fragment_list.length; i++) {
+      s += this.fragment_list[i].size;
+    }
+    return s;
+  }
+  shrink() {
+    var total_buffer = new Uint8Array(this.size());
+    var offset = 0;
+    for (var i = 0; i < this.fragment_list.length; i++) {
+      var frag = this.fragment_list[i];
+      if (frag.full()) {
+        total_buffer.set(frag.buffer, offset);
+      } else {
+        total_buffer.set(frag.buffer.slice(0, frag.size), offset);
+      }
+      offset += frag.size;
+    }
+    return total_buffer;
+  }
+}
+
+var copagesne_uint8array = function (buffers) {
+  var total_size = 0;
+  for (let i = 0; i < buffers.length; i++) {
+    var buffer = buffers[i];
+    total_size += buffer.length;
+  }
+  var total_buffer = new Uint8Array(total_size);
+  var offset = 0;
+  for (let i = 0; i < buffers.length; i++) {
+    buffer = buffers[i];
+    total_buffer.set(buffer, offset);
+    offset += buffer.length;
+  }
+  return total_buffer;
+};
+
+class Fragment {
+  buffer;
+  capacity;
+  size;
+  constructor(capacity) {
+    this.buffer = new Uint8Array(capacity);
+    this.capacity = capacity;
+    this.size = 0;
+  }
+
+  write(byte) {
+    if (this.size >= this.capacity) {
+      return false;
+    }
+    this.buffer[this.size] = byte;
+    this.size += 1;
+    return true;
+  }
+  full() {
+    return this.size === this.capacity;
+  }
+  get(idx) {
+    return this.buffer[idx];
+  }
+}
+
+var uncompression_lz77 = function (data) {
+  var length = data.length;
+  var offset = 0; // Current offset into data
+  var buffer = new Buffer(data.length);
+
+  while (offset < length) {
+    var char = data[offset];
+    offset += 1;
+
+    if (char === 0) {
+      buffer.write(char);
+    } else if (char <= 8) {
+      for (var i = offset; i < offset + char; i++) {
+        buffer.write(data[i]);
+      }
+      offset += char;
+    } else if (char <= 0x7f) {
+      buffer.write(char);
+    } else if (char <= 0xbf) {
+      var next = data[offset];
+      offset += 1;
+      var distance = (((char << 8) | next) >> 3) & 0x7ff;
+      var lz_length = (next & 0x7) + 3;
+
+      var buffer_size = buffer.size();
+      for (let i = 0; i < lz_length; i++) {
+        buffer.write(buffer.get(buffer_size - distance));
+        buffer_size += 1;
+      }
+    } else {
+      buffer.write(32);
+      buffer.write(char ^ 0x80);
+    }
+  }
+  return buffer;
+};
+
+class MobiFile {
+  view;
+  buffer;
+  offset;
+  header;
+  palm_header;
+  mobi_header;
+  reclist;
+  constructor(data) {
+    this.view = new DataView(data);
+    this.buffer = this.view.buffer;
+    this.offset = 0;
+    this.header = null;
+  }
+
+  parse() { }
+
+  getUint8() {
+    var v = this.view.getUint8(this.offset);
+    this.offset += 1;
+    return v;
+  }
+
+  getUint16() {
+    var v = this.view.getUint16(this.offset);
+    this.offset += 2;
+    return v;
+  }
+
+  getUint32() {
+    var v = this.view.getUint32(this.offset);
+    this.offset += 4;
+    return v;
+  }
+
+  getStr(size) {
+    var v = ab2str(this.buffer.slice(this.offset, this.offset + size));
+    this.offset += size;
+    return v;
+  }
+
+  skip(size) {
+    this.offset += size;
+  }
+
+  setoffset(_of) {
+    this.offset = _of;
+  }
+
+  get_record_extrasize(data, flags) {
+    var pos = data.length - 1;
+    var extra = 0;
+    for (var i = 15; i > 0; i--) {
+      if (flags & (1 << i)) {
+        var res = this.buffer_get_varlen(data, pos);
+        var size = res[0];
+        var l = res[1];
+        pos = res[2];
+        pos -= size - l;
+        extra += size;
+      }
+    }
+    if (flags & 1) {
+      var a = data[pos];
+      extra += (a & 0x3) + 1;
+    }
+    return extra;
+  }
+
+  // data should be uint8array
+  buffer_get_varlen(data, pos) {
+    var l = 0;
+    var size = 0;
+    var byte_count = 0;
+    var mask = 0x7f;
+    var stop_flag = 0x80;
+    var shift = 0;
+    for (var i = 0; ; i++) {
+      var byte = data[pos];
+      size |= (byte & mask) << shift;
+      shift += 7;
+      l += 1;
+      byte_count += 1;
+      pos -= 1;
+
+      var to_stop = byte & stop_flag;
+      if (byte_count >= 4 || to_stop > 0) {
+        break;
+      }
+    }
+    return [size, l, pos];
+  }
+  // 读出文本内容
+  read_text() {
+    var text_end = this.palm_header.record_count;
+    var buffers = [];
+    for (var i = 1; i <= text_end; i++) {
+      buffers.push(this.read_text_record(i));
+    }
+    var all = copagesne_uint8array(buffers);
+    return ab2str(all);
+  }
+
+  read_text_record(i) {
+    var flags = this.mobi_header.extra_flags;
+    var begin = this.reclist[i].offset;
+    var end = this.reclist[i + 1].offset;
+
+    var data = new Uint8Array(this.buffer.slice(begin, end));
+    var ex = this.get_record_extrasize(data, flags);
+
+    data = new Uint8Array(this.buffer.slice(begin, end - ex));
+    if (this.palm_header.compression === 2) {
+      var buffer = uncompression_lz77(data);
+      return buffer.shrink();
+    } else {
+      return data;
+    }
+  }
+  // 从buffer中读出image
+  read_image(idx) {
+    var first_image_idx = this.mobi_header.first_image_idx;
+    var begin = this.reclist[first_image_idx + idx].offset;
+    var end = this.reclist[first_image_idx + idx + 1].offset;
+    var data = new Uint8Array(this.buffer.slice(begin, end));
+    return new Blob([data.buffer]);
+  }
+
+  load() {
+    this.header = this.load_pdbheader();
+    this.reclist = this.load_reclist();
+    this.load_record0();
+  }
+
+  load_pdbheader() {
+    var header = {};
+    header.name = this.getStr(32);
+    header.attr = this.getUint16();
+    header.version = this.getUint16();
+    header.ctime = this.getUint32();
+    header.mtime = this.getUint32();
+    header.btime = this.getUint32();
+    header.mod_num = this.getUint32();
+    header.appinfo_offset = this.getUint32();
+    header.sortinfo_offset = this.getUint32();
+    header.type = this.getStr(4);
+    header.creator = this.getStr(4);
+    header.uid = this.getUint32();
+    header.next_rec = this.getUint32();
+    header.record_num = this.getUint16();
+    return header;
+  }
+
+  load_reclist() {
+    var reclist = [];
+    for (var i = 0; i < this.header.record_num; i++) {
+      var record = {};
+      record.offset = this.getUint32();
+      // TODO(zz) change
+      record.attr = this.getUint32();
+      reclist.push(record);
+    }
+    return reclist;
+  }
+  load_record0() {
+    this.palm_header = this.load_record0_header();
+    this.mobi_header = this.load_mobi_header();
+  }
+
+  load_record0_header() {
+    var p_header = {};
+    var first_record = this.reclist[0];
+    this.setoffset(first_record.offset);
+
+    p_header.compression = this.getUint16();
+    this.skip(2);
+    p_header.text_length = this.getUint32();
+    p_header.record_count = this.getUint16();
+    p_header.record_size = this.getUint16();
+    p_header.encryption_type = this.getUint16();
+    this.skip(2);
+
+    return p_header;
+  }
+
+  load_mobi_header() {
+    var mobi_header = {};
+
+    var start_offset = this.offset;
+
+    mobi_header.identifier = this.getUint32();
+    mobi_header.header_length = this.getUint32();
+    mobi_header.mobi_type = this.getUint32();
+    mobi_header.text_encoding = this.getUint32();
+    mobi_header.uid = this.getUint32();
+    mobi_header.generator_version = this.getUint32();
+
+    this.skip(40);
+
+    mobi_header.first_nonbook_index = this.getUint32();
+    mobi_header.full_name_offset = this.getUint32();
+    mobi_header.full_name_length = this.getUint32();
+
+    mobi_header.language = this.getUint32();
+    mobi_header.input_language = this.getUint32();
+    mobi_header.output_language = this.getUint32();
+    mobi_header.min_version = this.getUint32();
+    mobi_header.first_image_idx = this.getUint32();
+
+    mobi_header.huff_rec_index = this.getUint32();
+    mobi_header.huff_rec_count = this.getUint32();
+    mobi_header.datp_rec_index = this.getUint32();
+    mobi_header.datp_rec_count = this.getUint32();
+
+    mobi_header.exth_flags = this.getUint32();
+
+    this.skip(36);
+
+    mobi_header.drm_offset = this.getUint32();
+    mobi_header.drm_count = this.getUint32();
+    mobi_header.drm_size = this.getUint32();
+    mobi_header.drm_flags = this.getUint32();
+
+    this.skip(8);
+
+    // TODO (zz) fdst_index
+    this.skip(4);
+
+    this.skip(46);
+
+    mobi_header.extra_flags = this.getUint16();
+
+    this.setoffset(start_offset + mobi_header.header_length);
+
+    return mobi_header;
+  }
+  load_exth_header() {
+    // TODO
+    return {};
+  }
+  extractContent(s) {
+    var span = document.createElement("span");
+    span.innerHTML = s;
+    return span.textContent || span.innerText;
+  }
+  render(isElectron = false) {
+    return new Promise((resolve, reject) => {
+      this.load();
+      var content = this.read_text();
+      var bookDoc = domParser.parseFromString(content, "text/html")
+        .documentElement;
+      let lines = Array.from(
+        bookDoc.querySelectorAll("p,b,font,h3,h2,h1")
+      );
+      let parseContent = [];
+      for (let i = 0, len = lines.length; i < len - 1; i++) {
+        lines[i].innerText &&
+          lines[i].innerText !== parseContent[parseContent.length - 1] &&
+          parseContent.push(lines[i].innerText);
+        let imgDoms = lines[i].getElementsByTagName("img");
+        if (imgDoms.length > 0) {
+          for (let i = 0; i < imgDoms.length; i++) {
+            parseContent.push("#image");
+          }
+        }
+      }
+      const handleImage = async () => {
+        var imgDoms = bookDoc.getElementsByTagName("img");
+        parseContent.push("~image");
+        for (let i = 0; i < imgDoms.length; i++) {
+          const src = await this.render_image(imgDoms, i);
+          parseContent.push(
+            src + " " + imgDoms[i].width + " " + imgDoms[i].height
+          );
+        }
+        if (imgDoms.length > 200 || !isElectron) {
+          resolve(bookDoc);
+        } else {
+          resolve(parseContent.join("\n    \n"));
+        }
+      };
+      handleImage();
+    });
+  }
+  render_image = (imgDoms, i) => {
+    return new Promise((resolve, reject) => {
+      var imgDom = imgDoms[i];
+      var idx = +imgDom.getAttribute("recindex");
+      var blob = this.read_image(idx - 1);
+      var imgReader = new FileReader();
+      imgReader.onload = (e) => {
+        imgDom.src = e.target?.result;
+        resolve(e.target?.result);
+      };
+      imgReader.onerror = function (err) {
+        reject(err);
+      };
+      imgReader.readAsDataURL(blob);
+    });
+  };
+}
+
+export default MobiFile;

client/components/app/Appbar.vue

@@ -7,16 +7,21 @@
           <span class="material-icons text-4xl text-white">arrow_back</span>
         </a>
         <h1 class="text-2xl font-book mr-6">AudioBookshelf</h1>
-        <!-- <div class="-mb-2">
-          <h1 class="text-lg font-book leading-3 mr-6 px-1">AudioBookshelf</h1>
-          <div class="bg-black bg-opacity-20 rounded-sm py-1.5 px-2 mt-1.5 flex items-center justify-between border border-bg">
-            <p class="text-sm text-gray-400 leading-3">My Library</p>
-            <span class="material-icons text-sm leading-3 text-gray-400">expand_more</span>
-          </div>
+
+        <!-- <div class="bg-black bg-opacity-20 rounded-md py-1.5 px-3 flex items-center text-white text-opacity-70 cursor-pointer hover:bg-opacity-10 hover:text-opacity-90" @click="clickLibrary">
+          <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4" />
+          </svg>
+
+          <p class="text-sm leading-3 font-sans pl-2">{{ libraryName }}</p>
         </div> -->
+        <ui-libraries-dropdown />
+
         <controls-global-search />
         <div class="flex-grow" />
 
+        <span v-if="showExperimentalFeatures" class="material-icons text-4xl text-warning pr-4">logo_dev</span>
+
         <nuxt-link v-if="userCanUpload" to="/upload" class="outline-none hover:text-gray-200 cursor-pointer w-8 h-8 flex items-center justify-center">
           <span class="material-icons">upload</span>
         </nuxt-link>
@@ -64,11 +69,17 @@ export default {
     }
   },
   computed: {
+    currentLibrary() {
+      return this.$store.getters['libraries/getCurrentLibrary']
+    },
+    libraryName() {
+      return this.currentLibrary ? this.currentLibrary.name : 'unknown'
+    },
     isHome() {
-      return this.$route.name === 'index'
+      return this.$route.name === 'library-library'
     },
     showBack() {
-      return this.$route.name !== 'library-id' && !this.isHome
+      return this.$route.name !== 'library-library-bookshelf-id' && !this.isHome
     },
     user() {
       return this.$store.state.user.user
@@ -76,7 +87,6 @@ export default {
     isRootUser() {
       return this.$store.getters['user/getIsRoot']
     },
-
     username() {
       return this.user ? this.user.username : 'err'
     },
@@ -117,9 +127,15 @@ export default {
     },
     processingBatch() {
       return this.$store.state.processingBatch
+    },
+    showExperimentalFeatures() {
+      return this.$store.state.showExperimentalFeatures
     }
   },
   methods: {
+    clickLibrary() {
+      this.$store.commit('libraries/setShowModal', true)
+    },
     async back() {
       var popped = await this.$store.dispatch('popRoute')
       var backTo = popped || '/'

client/components/app/BookShelf.vue

@@ -53,7 +53,7 @@ export default {
   data() {
     return {
       shelves: [],
-      currFilterOrderKey: null,
+      currSearchParams: null,
       availableSizes: [60, 80, 100, 120, 140, 160, 180, 200, 220],
       selectedSizeIndex: 3,
       rowPaddingX: 40,
@@ -77,6 +77,11 @@ export default {
         this.$store.commit('audiobooks/setSearchResults', this.searchResults)
         this.setBookshelfEntities()
       })
+    },
+    '$route.query.filter'() {
+      if (this.$route.query.filter && this.$route.query.filter !== this.filterBy) {
+        this.$store.dispatch('user/updateUserSettings', { filterBy: this.$route.query.filter })
+      }
     }
   },
   computed: {
@@ -89,9 +94,6 @@ export default {
     audiobooks() {
       return this.$store.state.audiobooks.audiobooks
     },
-    filterOrderKey() {
-      return this.$store.getters['user/getFilterOrderKey']
-    },
     bookCoverWidth() {
       return this.availableSizes[this.selectedSizeIndex]
     },
@@ -111,6 +113,12 @@ export default {
     filterBy() {
       return this.$store.getters['user/getUserSetting']('filterBy')
     },
+    orderBy() {
+      return this.$store.getters['user/getUserSetting']('orderBy')
+    },
+    orderDesc() {
+      return this.$store.getters['user/getUserSetting']('orderDesc')
+    },
     showGroups() {
       return this.page !== '' && this.page !== 'search' && !this.selectedSeries
     },
@@ -165,7 +173,10 @@ export default {
 
       var booksPerRow = Math.floor(width / this.bookWidth)
 
+      this.currSearchParams = this.buildSearchParams()
+
       var entities = this.entities
+
       var groups = []
       var currentRow = 0
       var currentGroup = []
@@ -185,6 +196,8 @@ export default {
       this.shelves = groups
     },
     async init() {
+      this.checkUpdateSearchParams()
+
       this.wrapperClientWidth = this.$refs.wrapper ? this.$refs.wrapper.clientWidth : 0
 
       var bookshelfCoverSize = this.$store.getters['user/getUserSetting']('bookshelfCoverSize')
@@ -203,10 +216,41 @@ export default {
       console.log('[AudioBookshelf] Audiobooks Updated')
       this.setBookshelfEntities()
     },
-    settingsUpdated(settings) {
-      if (this.currFilterOrderKey !== this.filterOrderKey) {
-        this.setBookshelfEntities()
+    buildSearchParams() {
+      if (this.page === 'search' || this.page === 'series') {
+        return ''
       }
+
+      let searchParams = new URLSearchParams()
+      if (this.filterBy && this.filterBy !== 'all') {
+        searchParams.set('filter', this.filterBy)
+      }
+      if (this.orderBy) {
+        searchParams.set('order', this.orderBy)
+        searchParams.set('orderdesc', this.orderDesc ? 1 : 0)
+      }
+      return searchParams.toString()
+    },
+    checkUpdateSearchParams() {
+      var newSearchParams = this.buildSearchParams()
+      var currentQueryString = window.location.search
+
+      if (newSearchParams === '') {
+        return false
+      }
+
+      if (newSearchParams !== this.currSearchParams || newSearchParams !== currentQueryString) {
+        let newurl = window.location.protocol + '//' + window.location.host + window.location.pathname + '?' + newSearchParams
+        window.history.replaceState({ path: newurl }, '', newurl)
+        return true
+      }
+
+      return false
+    },
+    settingsUpdated(settings) {
+      var wasUpdated = this.checkUpdateSearchParams()
+      if (wasUpdated) this.setBookshelfEntities()
+
       if (settings.bookshelfCoverSize !== this.bookCoverWidth && settings.bookshelfCoverSize !== undefined) {
         var index = this.availableSizes.indexOf(settings.bookshelfCoverSize)
         if (index >= 0) {
@@ -216,7 +260,7 @@ export default {
       }
     },
     scan() {
-      this.$root.socket.emit('scan')
+      this.$root.socket.emit('scan', this.$store.state.libraries.currentLibraryId)
     }
   },
   updated() {

client/components/app/BookShelfCategorized.vue

@@ -143,7 +143,7 @@ export default {
       }
     },
     scan() {
-      this.$root.socket.emit('scan')
+      this.$root.socket.emit('scan', this.$store.state.libraries.currentLibraryId)
     }
   },
   mounted() {

client/components/app/BookShelfToolbar.vue

@@ -1,20 +1,23 @@
 <template>
   <div class="w-full h-10 relative">
-    <div id="toolbar" class="absolute top-0 left-0 w-full h-full z-40 flex items-center px-8">
+    <div id="toolbar" class="absolute top-0 left-0 w-full h-full z-20 flex items-center px-8">
       <template v-if="page !== 'search' && !isHome">
         <p v-if="!selectedSeries" class="font-book">{{ numShowing }} {{ entityName }}</p>
         <div v-else class="flex items-center">
-          <div @click="seriesBackArrow" class="rounded-full h-10 w-10 flex items-center justify-center hover:bg-white hover:bg-opacity-10 cursor-pointer">
-            <span class="material-icons text-3xl text-white">west</span>
+          <div @click="seriesBackArrow" class="rounded-full h-9 w-9 flex items-center justify-center hover:bg-white hover:bg-opacity-10 cursor-pointer">
+            <span class="material-icons text-2xl text-white">west</span>
           </div>
           <!-- <span class="material-icons text-2xl cursor-pointer" @click="seriesBackArrow">west</span> -->
           <p class="pl-4 font-book text-lg">
-            {{ selectedSeries }} <span class="ml-3 font-mono text-lg bg-black bg-opacity-30 rounded-lg px-1 py-0.5">{{ numShowing }}</span>
+            {{ selectedSeries }}
           </p>
+          <div class="w-6 h-6 rounded-full bg-black bg-opacity-30 flex items-center justify-center ml-3">
+            <span class="font-mono">{{ numShowing }}</span>
+          </div>
         </div>
         <div class="flex-grow" />
 
-        <ui-text-input v-show="!selectedSeries" v-model="_keywordFilter" placeholder="Keyword Filter" :padding-y="1.5" class="text-xs w-40" />
+        <ui-text-input v-show="!selectedSeries" v-model="_keywordFilter" placeholder="Keyword Filter" :padding-y="1.5" clearable class="text-xs w-40" />
         <controls-filter-select v-show="showSortFilters" v-model="settings.filterBy" class="w-48 h-7.5 ml-4" @change="updateFilter" />
         <controls-order-select v-show="showSortFilters" v-model="settings.orderBy" :descending.sync="settings.orderDesc" class="w-48 h-7.5 ml-4" @change="updateOrder" />
       </template>
@@ -81,14 +84,17 @@ export default {
       set(val) {
         this.$store.commit('audiobooks/setKeywordFilter', val)
       }
+    },
+    currentLibraryId() {
+      return this.$store.state.libraries.currentLibraryId
     }
   },
   methods: {
     searchBackArrow() {
-      this.$router.replace('/library')
+      this.$router.replace(`/library/${this.currentLibraryId}/bookshelf`)
     },
     seriesBackArrow() {
-      this.$router.replace('/library/series')
+      this.$router.replace(`/library/${this.currentLibraryId}/bookshelf/series`)
       this.$emit('update:selectedSeries', null)
     },
     updateOrder() {

client/components/app/Reader.vue

@@ -0,0 +1,327 @@
+<template>
+  <div v-if="show" class="w-screen h-screen fixed top-0 left-0 z-50 bg-white text-black">
+    <div class="absolute top-4 right-4 z-10">
+      <span class="material-icons cursor-pointer text-4xl" @click="show = false">close</span>
+    </div>
+    <!-- <div v-if="chapters.length" class="absolute top-0 left-0 w-52">
+      <select v-model="selectedChapter" class="w-52" @change="changedChapter">
+        <option v-for="chapter in chapters" :key="chapter.href" :value="chapter.href">{{ chapter.label }}</option>
+      </select>
+    </div> -->
+    <div class="absolute top-4 left-4 font-book">
+      <h1 class="text-2xl mb-1">{{ title || abTitle }}</h1>
+      <p v-if="author || abAuthor">by {{ author || abAuthor }}</p>
+    </div>
+
+    <!-- EPUB -->
+    <div v-if="epubEbook" class="h-full flex items-center">
+      <div style="width: 100px; max-width: 100px" class="h-full flex items-center overflow-x-hidden">
+        <span v-show="hasPrev" class="material-icons text-black text-opacity-30 hover:text-opacity-80 cursor-pointer text-8xl" @mousedown.prevent @click="pageLeft">chevron_left</span>
+      </div>
+      <div id="frame" class="w-full" style="height: 650px">
+        <div id="viewer" class="spreads"></div>
+
+        <div class="px-16 flex justify-center" style="height: 50px">
+          <p class="px-4">{{ progress }}%</p>
+        </div>
+      </div>
+      <div style="width: 100px; max-width: 100px" class="h-full flex items-center overflow-x-hidden">
+        <span v-show="hasNext" class="material-icons text-black text-opacity-30 hover:text-opacity-80 cursor-pointer text-8xl" @mousedown.prevent @click="pageRight">chevron_right</span>
+      </div>
+    </div>
+    <!-- MOBI/AZW3 -->
+    <div v-else class="h-full max-h-full w-full">
+      <div class="ebook-viewer absolute overflow-y-scroll left-0 right-0 top-12 w-full max-w-4xl m-auto z-10 border border-black border-opacity-20">
+        <iframe title="html-viewer" width="100%"> Loading </iframe>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ePub from 'epubjs'
+import MobiParser from '@/assets/ebooks/mobi.js'
+import HtmlParser from '@/assets/ebooks/htmlParser.js'
+import defaultCss from '@/assets/ebooks/basic.js'
+
+export default {
+  data() {
+    return {
+      scale: 1,
+      book: null,
+      rendition: null,
+      chapters: [],
+      title: '',
+      author: '',
+      progress: 0,
+      hasNext: true,
+      hasPrev: false
+    }
+  },
+  watch: {
+    show(newVal) {
+      if (newVal) {
+        this.init()
+      } else {
+        this.close()
+      }
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.$store.state.showEReader
+      },
+      set(val) {
+        this.$store.commit('setShowEReader', val)
+      }
+    },
+    abTitle() {
+      return this.selectedAudiobook.book.title
+    },
+    abAuthor() {
+      return this.selectedAudiobook.book.author
+    },
+    selectedAudiobook() {
+      return this.$store.state.selectedAudiobook
+    },
+    libraryId() {
+      return this.selectedAudiobook.libraryId
+    },
+    folderId() {
+      return this.selectedAudiobook.folderId
+    },
+    ebooks() {
+      return this.selectedAudiobook.ebooks || []
+    },
+    epubEbook() {
+      return this.ebooks.find((eb) => eb.ext === '.epub')
+    },
+    epubPath() {
+      return this.epubEbook ? this.epubEbook.path : null
+    },
+    mobiEbook() {
+      return this.ebooks.find((eb) => eb.ext === '.mobi' || eb.ext === '.azw3')
+    },
+    mobiPath() {
+      return this.mobiEbook ? this.mobiEbook.path : null
+    },
+    mobiUrl() {
+      if (!this.mobiPath) return null
+      return `/ebook/${this.libraryId}/${this.folderId}/${this.mobiPath}`
+    },
+    url() {
+      if (!this.epubPath) return null
+      return `/ebook/${this.libraryId}/${this.folderId}/${this.epubPath}`
+    },
+    userToken() {
+      return this.$store.getters['user/getToken']
+    }
+  },
+  methods: {
+    changedChapter() {
+      if (this.rendition) {
+        this.rendition.display(this.selectedChapter)
+      }
+    },
+    pageLeft() {
+      if (this.rendition) {
+        this.rendition.prev()
+      }
+    },
+    pageRight() {
+      if (this.rendition) {
+        this.rendition.next()
+      }
+    },
+    keyUp(e) {
+      if (!this.rendition) {
+        console.error('No rendition')
+        return
+      }
+
+      if ((e.keyCode || e.which) == 37) {
+        this.rendition.prev()
+      } else if ((e.keyCode || e.which) == 39) {
+        this.rendition.next()
+      } else if ((e.keyCode || e.which) == 27) {
+        this.show = false
+      }
+    },
+    registerListeners() {
+      document.addEventListener('keyup', this.keyUp)
+    },
+    unregisterListeners() {
+      document.removeEventListener('keyup', this.keyUp)
+    },
+    init() {
+      this.registerListeners()
+
+      if (this.epubEbook) {
+        this.initEpub()
+      } else if (this.mobiEbook) {
+        this.initMobi()
+      }
+    },
+    addHtmlCss() {
+      let iframe = document.getElementsByTagName('iframe')[0]
+      if (!iframe) return
+      let doc = iframe.contentDocument
+      if (!doc) return
+      let style = doc.createElement('style')
+      style.id = 'default-style'
+      style.textContent = defaultCss
+      doc.head.appendChild(style)
+    },
+    handleIFrameHeight(iFrame) {
+      const isElement = (obj) => !!(obj && obj.nodeType === 1)
+
+      var body = iFrame.contentWindow.document.body,
+        html = iFrame.contentWindow.document.documentElement
+      iFrame.height = Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight) * 2
+
+      setTimeout(() => {
+        let lastchild = body.lastElementChild
+        let lastEle = body.lastChild
+
+        let itemAs = body.querySelectorAll('a')
+        let itemPs = body.querySelectorAll('p')
+        let lastItemA = itemAs[itemAs.length - 1]
+        let lastItemP = itemPs[itemPs.length - 1]
+        let lastItem
+        if (isElement(lastItemA) && isElement(lastItemP)) {
+          if (lastItemA.clientHeight + lastItemA.offsetTop > lastItemP.clientHeight + lastItemP.offsetTop) {
+            lastItem = lastItemA
+          } else {
+            lastItem = lastItemP
+          }
+        }
+
+        if (!lastchild && !lastItem && !lastEle) return
+        if (lastEle.nodeType === 3 && !lastchild && !lastItem) return
+
+        let nodeHeight = 0
+        if (lastEle.nodeType === 3 && document.createRange) {
+          let range = document.createRange()
+          range.selectNodeContents(lastEle)
+          if (range.getBoundingClientRect) {
+            let rect = range.getBoundingClientRect()
+            if (rect) {
+              nodeHeight = rect.bottom - rect.top
+            }
+          }
+        }
+        var lastChildHeight = isElement(lastchild) ? lastchild.clientHeight + lastchild.offsetTop : 0
+        var lastEleHeight = isElement(lastEle) ? lastEle.clientHeight + lastEle.offsetTop : 0
+        var lastItemHeight = isElement(lastItem) ? lastItem.clientHeight + lastItem.offsetTop : 0
+        iFrame.height = Math.max(lastChildHeight, lastEleHeight, lastItemHeight) + 100 + nodeHeight
+      }, 500)
+    },
+    async initMobi() {
+      // Fetch mobi file as blob
+      var buff = await this.$axios.$get(this.mobiUrl, {
+        responseType: 'blob'
+      })
+      var reader = new FileReader()
+      reader.onload = async (event) => {
+        var file_content = event.target.result
+
+        let mobiFile = new MobiParser(file_content)
+
+        let content = await mobiFile.render()
+        let htmlParser = new HtmlParser(new DOMParser().parseFromString(content.outerHTML, 'text/html'))
+        var anchoredDoc = htmlParser.getAnchoredDoc()
+
+        let iFrame = document.getElementsByTagName('iframe')[0]
+        iFrame.contentDocument.body.innerHTML = anchoredDoc.documentElement.outerHTML
+
+        // Add css
+        let style = iFrame.contentDocument.createElement('style')
+        style.id = 'default-style'
+        style.textContent = defaultCss
+        iFrame.contentDocument.head.appendChild(style)
+
+        this.handleIFrameHeight(iFrame)
+      }
+      reader.readAsArrayBuffer(buff)
+    },
+    initEpub() {
+      // var book = ePub(this.url, {
+      //   requestHeaders: {
+      //     Authorization: `Bearer ${this.userToken}`
+      //   }
+      // })
+      var book = ePub(this.url)
+      this.book = book
+
+      this.rendition = book.renderTo('viewer', {
+        width: window.innerWidth - 200,
+        height: 600,
+        ignoreClass: 'annotator-hl',
+        manager: 'continuous',
+        spread: 'always'
+      })
+      var displayed = this.rendition.display()
+
+      book.ready
+        .then(() => {
+          console.log('Book ready')
+          return book.locations.generate(1600)
+        })
+        .then((locations) => {
+          // console.log('Loaded locations', locations)
+          // Wait for book to be rendered to get current page
+          displayed.then(() => {
+            // Get the current CFI
+            var currentLocation = this.rendition.currentLocation()
+            if (!currentLocation.start) {
+              console.error('No Start', currentLocation)
+            } else {
+              var currentPage = book.locations.percentageFromCfi(currentLocation.start.cfi)
+              // console.log('current page', currentPage)
+            }
+          })
+        })
+
+      book.loaded.navigation.then((toc) => {
+        var _chapters = []
+        toc.forEach((chapter) => {
+          _chapters.push(chapter)
+        })
+        this.chapters = _chapters
+      })
+      book.loaded.metadata.then((metadata) => {
+        this.author = metadata.creator
+        this.title = metadata.title
+      })
+
+      this.rendition.on('keyup', this.keyUp)
+
+      this.rendition.on('relocated', (location) => {
+        var percent = book.locations.percentageFromCfi(location.start.cfi)
+        var percentage = Math.floor(percent * 100)
+        this.progress = percentage
+
+        this.hasNext = !location.atEnd
+        this.hasPrev = !location.atStart
+      })
+    },
+    close() {
+      this.unregisterListeners()
+    }
+  },
+  mounted() {
+    if (this.show) this.init()
+  },
+  beforeDestroy() {
+    this.unregisterListeners()
+  }
+}
+</script>
+
+<style>
+/* @import url(@/assets/calibre/basic.css); */
+.ebook-viewer {
+  height: calc(100% - 96px);
+}
+</style>

client/components/app/SideRail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="w-20 bg-bg h-full relative box-shadow-side z-30" style="min-width: 80px">
     <div class="absolute top-0 -right-4 w-4 bg-bg h-10 pointer-events-none" />
-    <nuxt-link to="/" class="w-full h-20 flex flex-col items-center justify-center text-white border-b border-primary border-opacity-70 hover:bg-primary cursor-pointer relative" :class="homePage ? 'bg-primary bg-opacity-80' : 'bg-bg bg-opacity-60'">
+    <nuxt-link :to="`/library/${currentLibraryId}`" class="w-full h-20 flex flex-col items-center justify-center text-white border-b border-primary border-opacity-70 hover:bg-primary cursor-pointer relative" :class="homePage ? 'bg-primary bg-opacity-80' : 'bg-bg bg-opacity-60'">
       <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" />
       </svg>
@@ -11,7 +11,7 @@
       <div v-show="homePage" class="h-full w-0.5 bg-yellow-400 absolute top-0 left-0" />
     </nuxt-link>
 
-    <nuxt-link to="/library" class="w-full h-20 flex flex-col items-center justify-center text-white border-b border-primary border-opacity-70 hover:bg-primary cursor-pointer relative" :class="paramId === '' && !homePage ? 'bg-primary bg-opacity-80' : 'bg-bg bg-opacity-60'">
+    <nuxt-link :to="`/library/${currentLibraryId}/bookshelf`" class="w-full h-20 flex flex-col items-center justify-center text-white border-b border-primary border-opacity-70 hover:bg-primary cursor-pointer relative" :class="paramId === '' && !homePage ? 'bg-primary bg-opacity-80' : 'bg-bg bg-opacity-60'">
       <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253" />
       </svg>
@@ -21,7 +21,7 @@
       <div v-show="paramId === '' && !homePage" class="h-full w-0.5 bg-yellow-400 absolute top-0 left-0" />
     </nuxt-link>
 
-    <nuxt-link to="/library/series" class="w-full h-20 flex flex-col items-center justify-center text-white text-opacity-80 border-b border-primary border-opacity-70 hover:bg-primary cursor-pointer relative" :class="paramId === 'series' ? 'bg-primary bg-opacity-80' : 'bg-bg bg-opacity-60'">
+    <nuxt-link :to="`/library/${currentLibraryId}/bookshelf/series`" class="w-full h-20 flex flex-col items-center justify-center text-white text-opacity-80 border-b border-primary border-opacity-70 hover:bg-primary cursor-pointer relative" :class="paramId === 'series' ? 'bg-primary bg-opacity-80' : 'bg-bg bg-opacity-60'">
       <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 17V7m0 10a2 2 0 01-2 2H5a2 2 0 01-2-2V7a2 2 0 012-2h2a2 2 0 012 2m0 10a2 2 0 002 2h2a2 2 0 002-2M9 7a2 2 0 012-2h2a2 2 0 012 2m0 10V7m0 10a2 2 0 002 2h2a2 2 0 002-2V7a2 2 0 00-2-2h-2a2 2 0 00-2 2" />
       </svg>
@@ -72,11 +72,14 @@ export default {
     paramId() {
       return this.$route.params ? this.$route.params.id || '' : ''
     },
+    currentLibraryId() {
+      return this.$store.state.libraries.currentLibraryId
+    },
     selectedClassName() {
       return ''
     },
     homePage() {
-      return this.$route.name === 'index'
+      return this.$route.name === 'library-library'
     }
   },
   methods: {},

client/components/app/StreamContainer.vue

@@ -63,12 +63,15 @@ export default {
     },
     playlistUrl() {
       return this.stream ? this.stream.clientPlaylistUri : null
+    },
+    libraryId() {
+      return this.streamAudiobook ? this.streamAudiobook.libraryId : null
     }
   },
   methods: {
     filterByAuthor() {
       if (this.$route.name !== 'index') {
-        this.$router.push('/library')
+        this.$router.push(`/library/${this.libraryId || this.$store.state.libraries.currentLibraryId}/bookshelf`)
       }
       var settingsUpdate = {
         filterBy: `authors.${this.$encode(this.author)}`

client/components/cards/AudiobookSearchCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex h-full px-1 overflow-hidden">
-    <cards-book-cover :audiobook="audiobook" :width="40" />
+    <cards-book-cover :audiobook="audiobook" :width="50" />
     <div class="flex-grow px-2 searchCardContent h-full">
       <p class="truncate text-sm">{{ title }}</p>
       <p class="text-xs text-gray-200 truncate">by {{ author }}</p>
@@ -38,7 +38,7 @@ export default {
 <style>
 .searchCardContent {
   width: calc(100% - 80px);
-  height: calc(40px * 1.5);
+  height: calc(50px * 1.5);
   display: flex;
   flex-direction: column;
   justify-content: center;

client/components/cards/AuthorSearchCard.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="flex h-full px-1 overflow-hidden">
+    <img src="https://rpgplanner.com/wp-content/uploads/2020/06/no-photo-available.png" class="w-40 h-40 max-h-40 object-contain" style="max-height: 40px; max-width: 40px" />
+    <div class="flex-grow px-2 authorSearchCardContent h-full">
+      <p class="truncate text-sm">{{ author }}</p>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    author: String
+  },
+  data() {
+    return {}
+  },
+  computed: {},
+  methods: {},
+  mounted() {}
+}
+</script>
+
+<style>
+.searchCardContent {
+  width: calc(100% - 80px);
+  height: 40px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+</style>

client/components/cards/BookCard.vue

@@ -14,11 +14,16 @@
           <cards-book-cover :audiobook="audiobook" :author-override="authorFormat" :width="width" />
 
           <div v-show="isHovering || isSelectionMode" class="absolute top-0 left-0 w-full h-full bg-black rounded" :class="overlayWrapperClasslist">
-            <div v-show="!isSelectionMode && !isMissing" class="h-full flex items-center justify-center">
+            <div v-show="showPlayButton" class="h-full flex items-center justify-center">
               <div class="hover:text-gray-200 hover:scale-110 transform duration-200" @click.stop.prevent="play">
                 <span class="material-icons" :style="{ fontSize: playIconFontSize + 'rem' }">play_circle_filled</span>
               </div>
             </div>
+            <div v-show="showReadButton" class="h-full flex items-center justify-center">
+              <div class="hover:text-gray-200 hover:scale-110 transform duration-200" @click.stop.prevent="clickReadEBook">
+                <span class="material-icons" :style="{ fontSize: playIconFontSize + 'rem' }">auto_stories</span>
+              </div>
+            </div>
 
             <div v-if="userCanUpdate" v-show="!isSelectionMode" class="absolute cursor-pointer hover:text-yellow-300 hover:scale-125 transform duration-50" :style="{ top: 0.375 * sizeMultiplier + 'rem', right: 0.375 * sizeMultiplier + 'rem' }" @click.stop.prevent="editClick">
               <span class="material-icons" :style="{ fontSize: sizeMultiplier + 'rem' }">edit</span>
@@ -33,9 +38,16 @@
             <p :style="{ fontSize: sizeMultiplier * 0.8 + 'rem' }">#{{ volumeNumber }}</p>
           </div>
 
-          <!-- <div v-if="true && hasEbook" class="absolute rounded-lg bg-black bg-opacity-90 box-shadow-md" :style="{ bottom: 0.375 * sizeMultiplier + 'rem', right: 0.375 * sizeMultiplier + 'rem', padding: `${0.1 * sizeMultiplier}rem ${0.25 * sizeMultiplier}rem` }">
-            <p :style="{ fontSize: sizeMultiplier * 0.8 + 'rem' }">EBook</p>
-          </div> -->
+          <!-- EBook Icon -->
+          <div
+            v-if="showSmallEBookIcon"
+            class="absolute rounded-full bg-blue-500 flex items-center justify-center bg-opacity-90 hover:scale-125 transform duration-200"
+            :style="{ bottom: 0.375 * sizeMultiplier + 'rem', right: 0.375 * sizeMultiplier + 'rem', padding: `${0.1 * sizeMultiplier}rem ${0.25 * sizeMultiplier}rem`, width: 1.5 * sizeMultiplier + 'rem', height: 1.5 * sizeMultiplier + 'rem' }"
+            @click.stop.prevent="clickReadEBook"
+          >
+            <!-- <p :style="{ fontSize: sizeMultiplier * 0.8 + 'rem' }">EBook</p> -->
+            <span class="material-icons text-white" :style="{ fontSize: sizeMultiplier * 1 + 'rem' }">auto_stories</span>
+          </div>
 
           <div v-show="!isSelectionMode" class="absolute bottom-0 left-0 h-1 shadow-sm max-w-full" :class="userIsRead ? 'bg-success' : 'bg-yellow-400'" :style="{ width: width * userProgressPercent + 'px' }"></div>
 
@@ -73,6 +85,9 @@ export default {
     }
   },
   computed: {
+    showExperimentalFeatures() {
+      return this.$store.state.showExperimentalFeatures
+    },
     isNew() {
       return this.tags.includes('New')
     },
@@ -85,8 +100,10 @@ export default {
     hasEbook() {
       return this.audiobook.numEbooks
     },
+    hasTracks() {
+      return this.audiobook.numTracks
+    },
     isSelectionMode() {
-      // return this.$store.getters['getNumAudiobooksSelected']
       return !!this.selectedAudiobooks.length
     },
     selectedAudiobooks() {
@@ -145,11 +162,23 @@ export default {
       return this.userProgress ? !!this.userProgress.isRead : false
     },
     showError() {
-      return this.hasMissingParts || this.hasInvalidParts || this.isMissing
+      return this.hasMissingParts || this.hasInvalidParts || this.isMissing || this.isIncomplete
+    },
+    showReadButton() {
+      return !this.isSelectionMode && this.showExperimentalFeatures && !this.showPlayButton && this.hasEbook
+    },
+    showPlayButton() {
+      return !this.isSelectionMode && !this.isMissing && !this.isIncomplete && this.hasTracks
+    },
+    showSmallEBookIcon() {
+      return !this.isSelectionMode && this.showExperimentalFeatures && this.hasEbook
     },
     isMissing() {
       return this.audiobook.isMissing
     },
+    isIncomplete() {
+      return this.audiobook.isIncomplete
+    },
     hasMissingParts() {
       return this.audiobook.hasMissingParts
     },
@@ -158,6 +187,7 @@ export default {
     },
     errorText() {
       if (this.isMissing) return 'Audiobook directory is missing!'
+      else if (this.isIncomplete) return 'Audiobook has no audio tracks & ebook'
       var txt = ''
       if (this.hasMissingParts) {
         txt = `${this.hasMissingParts} missing parts.`
@@ -206,6 +236,9 @@ export default {
         e.preventDefault()
         this.selectBtnClick()
       }
+    },
+    clickReadEBook() {
+      this.$store.commit('showEReader', this.audiobook)
     }
   }
 }

client/components/cards/BookCover.vue

@@ -53,9 +53,6 @@ export default {
     book() {
       return this.audiobook.book || {}
     },
-    bookLastUpdate() {
-      return this.book.lastUpdate || Date.now()
-    },
     title() {
       return this.book.title || 'No Title'
     },
@@ -79,7 +76,7 @@ export default {
       return '/book_placeholder.jpg'
     },
     fullCoverUrl() {
-      return this.$store.getters['audiobooks/getBookCoverSrc'](this.book, this.placeholderUrl)
+      return this.$store.getters['audiobooks/getBookCoverSrc'](this.audiobook, this.placeholderUrl)
     },
     cover() {
       return this.book.cover || this.placeholderUrl

client/components/cards/GroupCard.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="relative">
     <div class="rounded-sm h-full overflow-hidden relative" :style="{ padding: `16px ${paddingX}px` }" @mouseover="isHovering = true" @mouseleave="isHovering = false" @click="clickCard">
-      <nuxt-link :to="`/library/series?${groupType}=${groupEncode}`" class="cursor-pointer">
+      <nuxt-link :to="`/library/${currentLibraryId}/bookshelf/series?${groupType}=${groupEncode}`" class="cursor-pointer">
         <div class="w-full relative" :class="isHovering ? 'bg-black-400' : 'bg-primary'" :style="{ height: height + 'px', width: height + 'px' }">
           <cards-group-cover ref="groupcover" :name="groupName" :book-items="bookItems" :width="height" :height="height" />
 
@@ -48,6 +48,9 @@ export default {
     }
   },
   computed: {
+    currentLibraryId() {
+      return this.$store.state.libraries.currentLibraryId
+    },
     _group() {
       return this.group || {}
     },

client/components/cards/GroupCover.vue

@@ -105,7 +105,7 @@ export default {
         this.coverDiv.remove()
         this.coverDiv = null
       }
-      var validCovers = this.bookItems.map((bookItem) => this.getCoverUrl(bookItem.book)).filter((b) => b !== '')
+      var validCovers = this.bookItems.map((bookItem) => this.getCoverUrl(bookItem)).filter((b) => b !== '')
       if (!validCovers.length) {
         this.noValidCovers = true
         return

client/components/cards/PreviewCover.vue

@@ -1,10 +1,14 @@
 <template>
-  <div class="relative rounded-sm overflow-hidden" :style="{ height: width * 1.6 + 'px', width: width + 'px', maxWidth: width + 'px', minWidth: width + 'px' }">
+  <div class="relative rounded-sm overflow-hidden" :style="{ height: width * 1.6 + 'px', width: width + 'px', maxWidth: width + 'px', minWidth: width + 'px' }" @mouseover="isHovering = true" @mouseleave="isHovering = false">
     <div class="w-full h-full relative">
       <div v-if="showCoverBg" class="bg-primary absolute top-0 left-0 w-full h-full">
         <div class="w-full h-full z-0" ref="coverBg" />
       </div>
       <img ref="cover" :src="cover" @error="imageError" @load="imageLoaded" class="w-full h-full absolute top-0 left-0" :class="showCoverBg ? 'object-contain' : 'object-cover'" />
+
+      <a v-if="!imageFailed && showOpenNewTab && isHovering" :href="cover" @click.stop target="_blank" class="absolute bg-primary flex items-center justify-center shadow-sm rounded-full hover:scale-110 transform duration-100" :style="{ top: sizeMultiplier * 0.5 + 'rem', right: sizeMultiplier * 0.5 + 'rem', width: 2.5 * sizeMultiplier + 'rem', height: 2.5 * sizeMultiplier + 'rem' }">
+        <span class="material-icons" :style="{ fontSize: sizeMultiplier * 1.75 + 'rem' }">open_in_new</span>
+      </a>
     </div>
 
     <div v-if="imageFailed" class="absolute top-0 left-0 right-0 bottom-0 w-full h-full bg-red-100" :style="{ padding: placeholderCoverPadding + 'rem' }">
@@ -23,12 +27,16 @@ export default {
     width: {
       type: Number,
       default: 120
-    }
+    },
+    showOpenNewTab: Boolean
   },
   data() {
     return {
       imageFailed: false,
-      showCoverBg: false
+      showCoverBg: false,
+      isHovering: false,
+      naturalHeight: 0,
+      naturalWidth: 0
     }
   },
   watch: {
@@ -60,6 +68,9 @@ export default {
     imageLoaded() {
       if (this.$refs.cover) {
         var { naturalWidth, naturalHeight } = this.$refs.cover
+        this.naturalHeight = naturalHeight
+        this.naturalWidth = naturalWidth
+
         var aspectRatio = naturalHeight / naturalWidth
         var arDiff = Math.abs(aspectRatio - 1.6)
 

client/components/cards/SeriesSearchCard.vue

@@ -0,0 +1,36 @@
+<template>
+  <div class="flex h-full px-1 overflow-hidden">
+    <cards-group-cover :name="series" :book-items="bookItems" :width="60" :height="60" />
+    <div class="flex-grow px-2 seriesSearchCardContent h-full">
+      <p class="truncate text-sm">{{ series }}</p>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    series: String,
+    bookItems: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {},
+  methods: {},
+  mounted() {}
+}
+</script>
+
+<style>
+.seriesSearchCardContent {
+  width: calc(100% - 80px);
+  height: 60px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+</style>

client/components/controls/FilterSelect.vue

@@ -41,6 +41,11 @@
             <span class="font-normal block truncate py-2">No {{ sublist }}</span>
           </div>
         </li>
+        <li v-else-if="sublist === 'series'" class="text-gray-50 select-none relative px-2 cursor-pointer hover:bg-black-400" role="option" @click="clickedSublistOption($encode('No Series'))">
+          <div class="flex items-center">
+            <span class="font-normal block truncate py-2 text-xs text-white text-opacity-80">No Series</span>
+          </div>
+        </li>
         <template v-for="item in sublistItems">
           <li :key="item.value" class="text-gray-50 select-none relative px-2 cursor-pointer hover:bg-black-400" :class="`${sublist}.${item.value}` === selected ? 'bg-primary bg-opacity-50' : ''" role="option" @click="clickedSublistOption(item.value)">
             <div class="flex items-center">
@@ -87,6 +92,11 @@ export default {
           value: 'authors',
           sublist: true
         },
+        {
+          text: 'Narrator',
+          value: 'narrators',
+          sublist: true
+        },
         {
           text: 'Progress',
           value: 'progress',
@@ -137,6 +147,9 @@ export default {
     authors() {
       return this.$store.getters['audiobooks/getUniqueAuthors']
     },
+    narrators() {
+      return this.$store.getters['audiobooks/getUniqueNarrators']
+    },
     progress() {
       return ['Read', 'Unread', 'In Progress']
     },

client/components/controls/GlobalSearch.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="w-64 ml-8 relative">
+  <div class="w-80 ml-6 relative">
     <form @submit.prevent="submitSearch">
       <ui-text-input ref="input" v-model="search" placeholder="Search.." @input="inputUpdate" @focus="focussed" @blur="blurred" class="w-full h-8 text-sm" />
     </form>
@@ -7,23 +7,42 @@
       <span v-if="!search" class="material-icons" style="font-size: 1.2rem">search</span>
       <span v-else class="material-icons" style="font-size: 1.2rem">close</span>
     </div>
-    <div v-show="showMenu && (lastSearch || isTyping)" class="absolute z-10 -mt-px w-full bg-bg border border-black-200 shadow-lg max-h-80 rounded-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm">
+    <div v-show="showMenu && (lastSearch || isTyping)" class="absolute z-40 -mt-px w-full bg-bg border border-black-200 shadow-lg rounded-md py-1 px-2 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm globalSearchMenu">
       <ul class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
         <li v-if="isTyping" class="py-2 px-2">
-          <p>Typing...</p>
+          <p>Thinking...</p>
         </li>
         <li v-else-if="isFetching" class="py-2 px-2">
           <p>Fetching...</p>
         </li>
-        <li v-else-if="!items.length" class="py-2 px-2">
+        <li v-else-if="!totalResults" class="py-2 px-2">
           <p>No Results</p>
         </li>
         <template v-else>
-          <template v-for="item in items">
-            <li :key="item.id" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option" @click="clickedOption(item)">
-              <template v-if="item.type === 'audiobook'">
-                <cards-audiobook-search-card :audiobook="item.data" />
-              </template>
+          <p class="uppercase text-xs text-gray-400 my-1 px-1 font-semibold">Books</p>
+          <template v-for="item in audiobookResults">
+            <li :key="item.audiobook.id" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option">
+              <nuxt-link :to="`/audiobook/${item.audiobook.id}`">
+                <cards-audiobook-search-card :audiobook="item.audiobook" />
+              </nuxt-link>
+            </li>
+          </template>
+
+          <p v-if="authorResults.length" class="uppercase text-xs text-gray-400 mb-1 mt-3 px-1 font-semibold">Authors</p>
+          <template v-for="item in authorResults">
+            <li :key="item.author" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option">
+              <nuxt-link :to="`/library/${currentLibraryId}/bookshelf?filter=authors.${$encode(item.author)}`">
+                <cards-author-search-card :author="item.author" />
+              </nuxt-link>
+            </li>
+          </template>
+
+          <p v-if="seriesResults.length" class="uppercase text-xs text-gray-400 mb-1 mt-3 px-1 font-semibold">Series</p>
+          <template v-for="item in seriesResults">
+            <li :key="item.series" class="text-gray-50 select-none relative cursor-pointer hover:bg-black-400 py-1" role="option" @click="clickedOption(item.series)">
+              <nuxt-link :to="`/library/${currentLibraryId}/bookshelf/series?series=${$encode(item.series)}`">
+                <cards-series-search-card :series="item.series" :book-items="item.audiobooks" />
+              </nuxt-link>
             </li>
           </template>
         </template>
@@ -42,7 +61,9 @@ export default {
       isTyping: false,
       isFetching: false,
       search: null,
-      items: [],
+      audiobookResults: [],
+      authorResults: [],
+      seriesResults: [],
       searchTimeout: null,
       lastSearch: null
     }
@@ -50,15 +71,23 @@ export default {
   computed: {
     audiobooks() {
       return this.$store.state.audiobooks.audiobooks
+    },
+    currentLibraryId() {
+      return this.$store.state.libraries.currentLibraryId
+    },
+    totalResults() {
+      return this.audiobookResults.length + this.seriesResults.length + this.authorResults.length
     }
   },
   methods: {
     submitSearch() {
       if (!this.search) return
-      this.$router.push(`/library/search?query=${this.search}`)
+      this.$router.push(`/library/${this.currentLibraryId}/bookshelf/search?query=${this.search}`)
 
       this.search = null
-      this.items = []
+      this.audiobookResults = []
+      this.authorResults = []
+      this.seriesResults = []
       this.showMenu = false
       this.$nextTick(() => {
         if (this.$refs.input) {
@@ -83,22 +112,19 @@ export default {
         return
       }
       this.isFetching = true
-      var results = await this.$axios.$get(`/api/audiobooks?q=${value}`).catch((error) => {
+
+      var searchResults = await this.$axios.$get(`/api/library/${this.currentLibraryId}/search?q=${value}`).catch((error) => {
         console.error('Search error', error)
         return []
       })
+      this.audiobookResults = searchResults.audiobooks || []
+      this.authorResults = searchResults.authors || []
+      this.seriesResults = searchResults.series || []
+
       this.isFetching = false
       if (!this.showMenu) {
         return
       }
-
-      this.items = results.map((res) => {
-        return {
-          id: res.id,
-          data: res,
-          type: 'audiobook'
-        }
-      })
     },
     inputUpdate(val) {
       clearTimeout(this.searchTimeout)
@@ -111,21 +137,25 @@ export default {
       this.searchTimeout = setTimeout(() => {
         this.isTyping = false
         this.runSearch(val)
-      }, 1000)
-    },
-    clickedOption(option) {
-      if (option.type === 'audiobook') {
-        this.$router.push(`/audiobook/${option.data.id}`)
-      }
+      }, 750)
     },
     clickClear() {
       if (this.search) {
         this.search = null
-        this.items = []
+        this.lastSearch = null
+        this.audiobookResults = []
+        this.authorResults = []
+        this.seriesResults = []
         this.showMenu = false
       }
     }
   },
   mounted() {}
 }
-</script>
+</script>
+
+<style>
+.globalSearchMenu {
+  max-height: 80vh;
+}
+</style>

client/components/modals/EditLibraryModal.vue

@@ -0,0 +1,45 @@
+<template>
+  <modals-modal v-model="show" :width="700" :height="'unset'" :processing="processing">
+    <template #outer>
+      <div class="absolute top-0 left-0 p-5 w-2/3 overflow-hidden">
+        <p class="font-book text-3xl text-white truncate">{{ title }}</p>
+      </div>
+    </template>
+    <div class="p-4 w-full text-sm py-6 rounded-lg bg-bg shadow-lg border border-black-300 relative overflow-hidden" style="min-height: 400px; max-height: 80vh">
+      <modals-libraries-edit-library v-if="show" :library="library" :processing.sync="processing" @close="show = false" />
+    </div>
+  </modals-modal>
+</template>
+
+<script>
+export default {
+  props: {
+    value: Boolean,
+    library: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      processing: false
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('input', val)
+      }
+    },
+    title() {
+      return this.library ? 'Update Library' : 'New Library'
+    }
+  },
+  methods: {},
+  mounted() {},
+  beforeDestroy() {}
+}
+</script>

client/components/modals/EditModal.vue

@@ -36,11 +36,11 @@ export default {
           title: 'Cover',
           component: 'modals-edit-tabs-cover'
         },
-        {
-          id: 'match',
-          title: 'Match',
-          component: 'modals-edit-tabs-match'
-        },
+        // {
+        //   id: 'match',
+        //   title: 'Match',
+        //   component: 'modals-edit-tabs-match'
+        // },
         {
           id: 'tracks',
           title: 'Tracks',

client/components/modals/LibrariesModal.vue

@@ -0,0 +1,99 @@
+<template>
+  <modals-modal v-model="show" :width="700" :height="'unset'" :processing="processing">
+    <template #outer>
+      <div class="absolute top-0 left-0 p-5 w-2/3 overflow-hidden">
+        <p class="font-book text-3xl text-white truncate">{{ title }}</p>
+      </div>
+    </template>
+    <div v-if="show" class="p-4 w-full text-sm py-6 rounded-lg bg-bg shadow-lg border border-black-300 relative overflow-hidden" style="min-height: 200px; max-height: 80vh">
+      <div v-if="!showAddLibrary" class="w-full h-full flex flex-col justify-center px-4">
+        <div class="flex items-center mb-4">
+          <p>{{ libraries.length }} Libraries</p>
+          <!-- <div class="flex-grow" />
+          <ui-btn @click="addLibraryClick">Add Library</ui-btn> -->
+        </div>
+
+        <template v-for="library in libraries">
+          <modals-libraries-library-item :key="library.id" :library="library" :selected="currentLibraryId === library.id" :show-edit="false" @edit="editLibrary" @delete="deleteLibrary" @click="clickLibrary" />
+        </template>
+      </div>
+      <modals-libraries-edit-library v-else :library="selectedLibrary" :show="showAddLibrary" :processing.sync="processing" @back="showAddLibrary = false" @close="showAddLibrary = false" />
+    </div>
+  </modals-modal>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      selectedLibrary: null,
+      processing: false,
+      showAddLibrary: false
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.$store.state.libraries.showModal
+      },
+      set(val) {
+        this.$store.commit('libraries/setShowModal', val)
+      }
+    },
+    title() {
+      return 'Libraries'
+    },
+    currentLibrary() {
+      return this.$store.getters['libraries/getCurrentLibrary']
+    },
+    currentLibraryId() {
+      return this.currentLibrary ? this.currentLibrary.id : null
+    },
+    libraries() {
+      return this.$store.state.libraries.libraries
+    }
+  },
+  watch: {
+    show(newVal) {
+      if (newVal) this.showAddLibrary = false
+    }
+  },
+  methods: {
+    async clickLibrary(library) {
+      await this.$store.dispatch('libraries/fetch', library.id)
+      this.$router.push(`/library/${library.id}`)
+      this.show = false
+    },
+    editLibrary(library) {
+      this.selectedLibrary = library
+      this.showAddLibrary = true
+    },
+    addLibraryClick() {
+      this.selectedLibrary = null
+      this.showAddLibrary = true
+    },
+    deleteLibrary(library) {
+      if (confirm(`Are you sure you want to delete library "${library.name}"?\n(no files will be deleted but book data will be lost)`)) {
+        console.log('Delete library', library)
+        this.processing = true
+        this.$axios
+          .$delete(`/api/library/${library.id}`)
+          .then(() => {
+            console.log('Library delete success')
+            this.$toast.success(`Library "${library.name}" deleted`)
+
+            this.processing = false
+          })
+          .catch((error) => {
+            console.error('Failed to delete library', error)
+            var errMsg = error.response ? error.response.data || 'Unknown Error' : 'Unknown Error'
+            this.$toast.error(errMsg)
+            this.processing = false
+          })
+      }
+    }
+  },
+  mounted() {},
+  beforeDestroy() {}
+}
+</script>

client/components/modals/edit-tabs/Cover.vue

@@ -13,8 +13,8 @@
       </div>
       <div class="flex-grow pl-6 pr-2">
         <div class="flex items-center">
-          <div v-if="userCanUpload" class="w-40 pr-2" style="min-width: 160px">
-            <ui-file-input ref="fileInput" @change="fileUploadSelected" />
+          <div v-if="userCanUpload" class="w-40 pr-2 pt-4" style="min-width: 160px">
+            <ui-file-input ref="fileInput" @change="fileUploadSelected">Upload Cover</ui-file-input>
           </div>
           <form @submit.prevent="submitForm" class="flex flex-grow">
             <ui-text-input-with-label v-model="imageUrl" label="Cover Image URL" />
@@ -24,7 +24,7 @@
 
         <div v-if="localCovers.length" class="mb-4 mt-6 border-t border-b border-primary">
           <div class="flex items-center justify-center py-2">
-            <p>{{ localCovers.length }} local image(s)</p>
+            <p>{{ localCovers.length }} local image{{ localCovers.length !== 1 ? 's' : '' }}</p>
             <div class="flex-grow" />
             <ui-btn small @click="showLocalCovers = !showLocalCovers">{{ showLocalCovers ? 'Hide' : 'Show' }}</ui-btn>
           </div>
@@ -33,7 +33,7 @@
             <template v-for="cover in localCovers">
               <div :key="cover.path" class="m-0.5 border-2 border-transparent hover:border-yellow-300 cursor-pointer" :class="cover.localPath === imageUrl ? 'border-yellow-300' : ''" @click="setCover(cover.localPath)">
                 <div class="h-24 bg-primary" style="width: 60px">
-                  <img :src="cover.localPath" class="h-full w-full object-contain" />
+                  <img :src="`${cover.localPath}?token=${userToken}`" class="h-full w-full object-contain" />
                 </div>
               </div>
             </template>
@@ -53,14 +53,11 @@
             </div>
           </div>
         </form>
-        <div v-if="hasSearched" class="flex items-center flex-wrap justify-center max-h-60 overflow-y-scroll mt-2 max-w-full">
+        <div v-if="hasSearched" class="flex items-center flex-wrap justify-center max-h-80 overflow-y-scroll mt-2 max-w-full">
           <p v-if="!coversFound.length">No Covers Found</p>
           <template v-for="cover in coversFound">
             <div :key="cover" class="m-0.5 border-2 border-transparent hover:border-yellow-300 cursor-pointer" :class="cover === imageUrl ? 'border-yellow-300' : ''" @click="setCover(cover)">
-              <div class="h-24 bg-primary" style="width: 60px">
-                <img :src="cover" class="h-full w-full object-contain" />
-              </div>
-              <!-- <img :src="cover" class="h-24 object-cover" style="width: 60px" /> -->
+              <cards-preview-cover :src="cover" :width="80" show-open-new-tab />
             </div>
           </template>
         </div>
@@ -124,21 +121,31 @@ export default {
         this.$emit('update:processing', val)
       }
     },
+    audiobookId() {
+      return this.audiobook ? this.audiobook.id : null
+    },
     book() {
       return this.audiobook ? this.audiobook.book || {} : {}
     },
+    audiobookPath() {
+      return this.audiobook ? this.audiobook.path : null
+    },
     otherFiles() {
       return this.audiobook ? this.audiobook.otherFiles || [] : []
     },
     userCanUpload() {
       return this.$store.getters['user/getUserCanUpload']
     },
+    userToken() {
+      return this.$store.getters['user/getToken']
+    },
     localCovers() {
       return this.otherFiles
         .filter((f) => f.filetype === 'image')
         .map((file) => {
           var _file = { ...file }
-          _file.localPath = Path.join('local', _file.path)
+          var imgRelPath = _file.path.replace(this.audiobookPath, '')
+          _file.localPath = `/s/book/${this.audiobookId}${imgRelPath}`
           return _file
         })
     }
@@ -162,7 +169,11 @@ export default {
         })
         .catch((error) => {
           console.error('Failed', error)
-          this.$toast.error('Oops, something went wrong...')
+          if (error.response && error.response.data) {
+            this.$toast.error(error.response.data)
+          } else {
+            this.$toast.error('Oops, something went wrong...')
+          }
           this.processingUpload = false
         })
     },
@@ -204,20 +215,39 @@ export default {
       }
 
       this.isProcessing = true
-      const updatePayload = {
-        book: {
-          cover: cover
+      var success = false
+
+      // Download cover from url and use
+      if (cover.startsWith('http:') || cover.startsWith('https:')) {
+        success = await this.$axios.$post(`/api/audiobook/${this.audiobook.id}/cover`, { url: cover }).catch((error) => {
+          console.error('Failed to download cover from url', error)
+          if (error.response && error.response.data) {
+            this.$toast.error(error.response.data)
+          }
+          return false
+        })
+      } else {
+        // Update local cover url
+        const updatePayload = {
+          book: {
+            cover: cover
+          }
         }
+        success = await this.$axios.$patch(`/api/audiobook/${this.audiobook.id}`, updatePayload).catch((error) => {
+          console.error('Failed to update', error)
+          if (error.response && error.response.data) {
+            this.$toast.error(error.response.data)
+          }
+          return false
+        })
       }
-      var updatedAudiobook = await this.$axios.$patch(`/api/audiobook/${this.audiobook.id}`, updatePayload).catch((error) => {
-        console.error('Failed to update', error)
-        return false
-      })
-      this.isProcessing = false
-      if (updatedAudiobook) {
+      if (success) {
         this.$toast.success('Update Successful')
         this.$emit('close')
+      } else {
+        this.imageUrl = this.book.cover || ''
       }
+      this.isProcessing = false
     },
     getSearchQuery() {
       var searchQuery = `provider=openlibrary&title=${this.searchTitle}`

client/components/modals/edit-tabs/Details.vue

@@ -47,7 +47,7 @@
 
         <div class="flex mt-2 -mx-1">
           <div class="w-1/2 px-1">
-            <ui-text-input-with-label v-model="details.narrarator" label="Narrarator" />
+            <ui-text-input-with-label v-model="details.narrator" label="Narrator" />
           </div>
         </div>
       </div>
@@ -60,8 +60,8 @@
             <ui-btn v-if="isRootUser" :loading="savingMetadata" color="bg" type="button" class="h-full" small @click.stop.prevent="saveMetadata">Save Metadata</ui-btn>
           </ui-tooltip>
 
-          <ui-tooltip text="(Root User Only) Rescan audiobook including metadata" direction="bottom" class="ml-4">
-            <ui-btn v-if="isRootUser" :loading="rescanning" color="bg" type="button" class="h-full" small @click.stop.prevent="rescan">Re-Scan</ui-btn>
+          <ui-tooltip :disabled="libraryScan" text="(Root User Only) Rescan audiobook including metadata" direction="bottom" class="ml-4">
+            <ui-btn v-if="isRootUser" :loading="rescanning" :disabled="libraryScan" color="bg" type="button" class="h-full" small @click.stop.prevent="rescan">Re-Scan</ui-btn>
           </ui-tooltip>
 
           <div class="flex-grow" />
@@ -88,7 +88,7 @@ export default {
         subtitle: null,
         description: null,
         author: null,
-        narrarator: null,
+        narrator: null,
         series: null,
         volumeNumber: null,
         publishYear: null,
@@ -138,6 +138,13 @@ export default {
     },
     series() {
       return this.$store.state.audiobooks.series
+    },
+    libraryId() {
+      return this.audiobook ? this.audiobook.libraryId : null
+    },
+    libraryScan() {
+      if (!this.libraryId) return null
+      return this.$store.getters['scanners/getLibraryScan'](this.libraryId)
     }
   },
   methods: {
@@ -201,12 +208,14 @@ export default {
       this.details.subtitle = this.book.subtitle
       this.details.description = this.book.description
       this.details.author = this.book.author
-      this.details.narrarator = this.book.narrarator
+      this.details.narrator = this.book.narrator
       this.details.genres = this.book.genres || []
       this.details.series = this.book.series
       this.details.volumeNumber = this.book.volumeNumber
       this.details.publishYear = this.book.publishYear
 
+      console.log('INIT', this.details)
+
       this.newTags = this.audiobook.tags || []
     },
     resetProgress() {

client/components/modals/edit-tabs/Download.vue

@@ -1,10 +1,9 @@
 <template>
   <div class="w-full h-full overflow-hidden overflow-y-auto px-4 py-6">
     <p class="text-center text-lg mb-4 py-8">Preparing downloads can take several minutes and will be stored in <span class="bg-primary bg-opacity-75 font-mono p-1 text-base">/metadata/downloads</span>. After the download is ready, it will remain available for 60 minutes, then be deleted.<br />Download will timeout after 15 minutes.</p>
-    <div class="w-full border border-black-200 p-4 my-4">
+    <div v-if="showM4bDownload" class="w-full border border-black-200 p-4 my-4">
       <div class="flex items-center">
         <div>
-          <!-- <p class="text-lg">{{ isSingleTrack ? 'Single Track' : 'M4B Audiobook File' }}</p> -->
           <p class="text-lg">M4B Audiobook File <span class="text-error">*</span></p>
           <p class="max-w-xs text-sm pt-2 text-gray-300">Generate a .M4B audiobook file with embedded cover image and chapters.</p>
         </div>
@@ -14,7 +13,6 @@
           <p v-if="singleDownloadStatus === $constants.DownloadStatus.READY" class="text-success mb-2">Download Ready!</p>
           <p v-if="singleDownloadStatus === $constants.DownloadStatus.EXPIRED" class="text-error mb-2">Download Expired</p>
 
-          <!-- <a v-if="isSingleTrack" :href="`/local/${singleTrackPath}`" class="btn outline-none rounded-md shadow-md relative border border-gray-600 px-4 py-2 bg-primary">Download Track</a> -->
           <ui-btn v-if="singleDownloadStatus !== $constants.DownloadStatus.READY" :loading="singleDownloadStatus === $constants.DownloadStatus.PENDING" :disabled="tempDisable" @click="startSingleAudioDownload">Start Download</ui-btn>
           <div v-else>
             <ui-btn @click="downloadWithProgress(singleAudioDownload)">Download</ui-btn>
@@ -46,7 +44,7 @@
       </div>
     </div>
 
-    <div class="w-full flex items-center justify-center absolute bottom-4 left-0 right-0 text-center">
+    <div v-if="showM4bDownload" class="w-full flex items-center justify-center absolute bottom-4 left-0 right-0 text-center">
       <p class="text-error text-lg">* <strong>Experimental:</strong> Merging multiple .m4b files may have issues. <a href="https://github.com/advplyr/audiobookshelf/issues" class="underline text-blue-600" target="_blank">Report issues here.</a></p>
     </div>
 
@@ -91,6 +89,9 @@ export default {
     audiobookId() {
       return this.audiobook ? this.audiobook.id : null
     },
+    _audiobook() {
+      return this.audiobook || {}
+    },
     downloads() {
       return this.$store.getters['downloads/getDownloads'](this.audiobookId)
     },
@@ -122,6 +123,9 @@ export default {
     },
     totalFiles() {
       return this.audioFiles.length + this.otherFiles.length
+    },
+    showM4bDownload() {
+      return !this._audiobook.isMissing && !this._audiobook.isIncomplete && this._audiobook.tracks.length
     }
   },
   methods: {

client/components/modals/edit-tabs/Tracks.vue

@@ -1,38 +1,44 @@
 <template>
   <div class="w-full h-full overflow-y-auto overflow-x-hidden px-4 py-6">
-    <div class="flex mb-4">
-      <nuxt-link v-if="userCanUpdate" :to="`/audiobook/${audiobook.id}/edit`">
-        <ui-btn color="primary">Edit Track Order</ui-btn>
-      </nuxt-link>
-    </div>
-    <table class="text-sm tracksTable">
-      <tr class="font-book">
-        <th>#</th>
-        <th class="text-left">Filename</th>
-        <th class="text-left">Size</th>
-        <th class="text-left">Duration</th>
-        <th v-if="showDownload" class="text-center">Download</th>
-      </tr>
-      <template v-for="track in tracks">
-        <tr :key="track.index">
-          <td class="text-center">
-            <p>{{ track.index }}</p>
-          </td>
-          <td class="font-book">
-            {{ track.filename }}
-          </td>
-          <td class="font-mono">
-            {{ $bytesPretty(track.size) }}
-          </td>
-          <td class="font-mono">
-            {{ $secondsToTimestamp(track.duration) }}
-          </td>
-          <td v-if="showDownload" class="font-mono text-center">
-            <a :href="`/local/${track.path}`" download><span class="material-icons icon-text">download</span></a>
-          </td>
+    <template v-if="hasTracks">
+      <div class="w-full bg-primary px-4 py-2 flex items-center">
+        <div class="h-7 w-7 rounded-full bg-white bg-opacity-10 flex items-center justify-center">
+          <span class="text-sm font-mono">{{ tracks.length }}</span>
+        </div>
+        <div class="flex-grow" />
+        <ui-btn small :color="showFullPath ? 'gray-600' : 'primary'" class="mr-2" @click.stop="showFullPath = !showFullPath">Full Path</ui-btn>
+        <nuxt-link v-if="userCanUpdate" :to="`/audiobook/${audiobook.id}/edit`" class="mr-4">
+          <ui-btn small color="primary">Manage Tracks</ui-btn>
+        </nuxt-link>
+      </div>
+      <table class="text-sm tracksTable">
+        <tr class="font-book">
+          <th>#</th>
+          <th class="text-left">Filename</th>
+          <th class="text-left">Size</th>
+          <th class="text-left">Duration</th>
+          <th v-if="showDownload" class="text-center">Download</th>
         </tr>
-      </template>
-    </table>
+        <template v-for="track in tracksCleaned">
+          <tr :key="track.index">
+            <td class="text-center">
+              <p>{{ track.index }}</p>
+            </td>
+            <td class="font-sans">{{ showFullPath ? track.fullPath : track.filename }}</td>
+            <td class="font-mono">
+              {{ $bytesPretty(track.size) }}
+            </td>
+            <td class="font-mono">
+              {{ $secondsToTimestamp(track.duration) }}
+            </td>
+            <td v-if="showDownload" class="font-mono text-center">
+              <a :href="`/s/book/${audiobook.id}/${track.relativePath}?token=${userToken}`" download><span class="material-icons icon-text">download</span></a>
+            </td>
+          </tr>
+        </template>
+      </table>
+    </template>
+    <div v-else class="flex my-4 text-center justify-center text-xl">No Audio Tracks</div>
   </div>
 </template>
 
@@ -47,7 +53,8 @@ export default {
   data() {
     return {
       tracks: null,
-      audioFiles: null
+      audioFiles: null,
+      showFullPath: false
     }
   },
   watch: {
@@ -59,6 +66,26 @@ export default {
     }
   },
   computed: {
+    audiobookPath() {
+      return this.audiobook.path
+    },
+    tracksCleaned() {
+      return this.tracks.map((track) => {
+        var trackPath = track.path.replace(/\\/g, '/')
+        var audiobookPath = this.audiobookPath.replace(/\\/g, '/')
+
+        return {
+          ...track,
+          relativePath: trackPath
+            .replace(audiobookPath + '/', '')
+            .replace(/%/g, '%25')
+            .replace(/#/g, '%23')
+        }
+      })
+    },
+    userToken() {
+      return this.$store.getters['user/getToken']
+    },
     userCanUpdate() {
       return this.$store.getters['user/getUserCanUpdate']
     },
@@ -70,6 +97,9 @@ export default {
     },
     showDownload() {
       return this.userCanDownload && !this.isMissing
+    },
+    hasTracks() {
+      return this.audiobook.tracks.length
     }
   },
   methods: {

client/components/modals/libraries/EditLibrary.vue

@@ -0,0 +1,165 @@
+<template>
+  <div class="w-full h-full px-4 py-2 mb-12">
+    <div class="flex items-center py-1 mb-2">
+      <span v-show="showDirectoryPicker" class="material-icons text-3xl cursor-pointer hover:text-gray-300" @click="backArrowPress">arrow_back</span>
+      <p class="px-4 text-xl">{{ title }}</p>
+    </div>
+
+    <div v-if="!showDirectoryPicker" class="w-full h-full py-4">
+      <ui-text-input-with-label v-model="name" label="Library Name" />
+
+      <div class="w-full py-4">
+        <p class="px-1 text-sm font-semibold">Folders</p>
+        <div v-for="(folder, index) in folders" :key="index" class="w-full flex items-center py-1 px-2">
+          <!-- <ui-text-input :value="folder.fullPath" type="text" class="w-full" /> -->
+          <span class="material-icons bg-opacity-50 mr-2 text-yellow-200" style="font-size: 1.2rem">folder</span>
+          <ui-editable-text v-model="folder.fullPath" type="text" class="w-full" />
+          <span v-show="folders.length > 1" class="material-icons ml-2 cursor-pointer hover:text-error" @click="removeFolder(folder)">close</span>
+        </div>
+        <p v-if="!folders.length" class="text-sm text-gray-300 px-1 py-2">No folders</p>
+        <ui-btn class="w-full mt-2" color="primary" @click="showDirectoryPicker = true">Browse for Folder</ui-btn>
+      </div>
+      <div class="absolute bottom-0 left-0 w-full py-4 px-4">
+        <div class="flex items-center">
+          <div class="flex-grow" />
+          <ui-btn v-show="!disableSubmit" color="success" :disabled="disableSubmit" @click="submit">{{ library ? 'Update Library' : 'Create Library' }}</ui-btn>
+        </div>
+      </div>
+    </div>
+    <modals-libraries-folder-chooser v-else :paths="folderPaths" @select="selectFolder" />
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    library: {
+      type: Object,
+      default: () => null
+    },
+    processing: Boolean
+  },
+  data() {
+    return {
+      name: '',
+      folders: [],
+      showDirectoryPicker: false
+    }
+  },
+  computed: {
+    title() {
+      if (this.showDirectoryPicker) return 'Choose a Folder'
+      return ''
+    },
+    folderPaths() {
+      return this.folders.map((f) => f.fullPath)
+    },
+    disableSubmit() {
+      if (!this.library) {
+        return false
+      }
+      var newfolderpaths = this.folderPaths.join(',')
+      var origfolderpaths = this.library.folders.map((f) => f.fullPath).join(',')
+      console.log(newfolderpaths)
+      console.log(origfolderpaths)
+      console.log(newfolderpaths === origfolderpaths)
+
+      return newfolderpaths === origfolderpaths && this.name === this.library.name
+    }
+  },
+  methods: {
+    removeFolder(folder) {
+      this.folders = this.folders.filter((f) => f.fullPath !== folder.fullPath)
+    },
+    backArrowPress() {
+      if (this.showDirectoryPicker) {
+        this.showDirectoryPicker = false
+      }
+    },
+    init() {
+      this.name = this.library ? this.library.name : ''
+      this.folders = this.library ? this.library.folders.map((p) => ({ ...p })) : []
+      this.showDirectoryPicker = false
+    },
+    selectFolder(fullPath) {
+      this.folders.push({ fullPath })
+      this.showDirectoryPicker = false
+    },
+    submit() {
+      if (this.library) {
+        this.updateLibrary()
+      } else {
+        this.createLibrary()
+      }
+    },
+    updateLibrary() {
+      if (!this.name) {
+        this.$toast.error('Library must have a name')
+        return
+      }
+      if (!this.folders.length) {
+        this.$toast.error('Library must have at least 1 path')
+        return
+      }
+      var newLibraryPayload = {
+        name: this.name,
+        folders: this.folders
+      }
+
+      this.$emit('update:processing', true)
+      this.$axios
+        .$patch(`/api/library/${this.library.id}`, newLibraryPayload)
+        .then((res) => {
+          this.$emit('update:processing', false)
+          this.$emit('close')
+          this.$toast.success(`Library "${res.name}" updated successfully`)
+        })
+        .catch((error) => {
+          console.error(error)
+          if (error.response && error.response.data) {
+            this.$toast.error(error.response.data)
+          } else {
+            this.$toast.error('Failed to update library')
+          }
+          this.$emit('update:processing', false)
+        })
+    },
+    createLibrary() {
+      if (!this.name) {
+        this.$toast.error('Library must have a name')
+        return
+      }
+      if (!this.folders.length) {
+        this.$toast.error('Library must have at least 1 path')
+        return
+      }
+      var newLibraryPayload = {
+        name: this.name,
+        folders: this.folders
+      }
+
+      this.$emit('update:processing', true)
+      this.$axios
+        .$post('/api/library', newLibraryPayload)
+        .then((res) => {
+          this.$emit('update:processing', false)
+          this.$emit('close')
+          this.$toast.success(`Library "${res.name}" created successfully`)
+        })
+        .catch((error) => {
+          console.error(error)
+          if (error.response && error.response.data) {
+            this.$toast.error(error.response.data)
+          } else {
+            this.$toast.error('Failed to create library')
+          }
+          this.$emit('update:processing', false)
+        })
+    }
+  },
+  mounted() {
+    console.log('Mounted edit library')
+    this.init()
+  }
+}
+</script>

client/components/modals/libraries/FolderChooser.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="w-full h-full">
+    <div v-if="allFolders.length" class="w-full bg-primary bg-opacity-70 py-1 px-4 mb-2">
+      <p class="font-mono truncate">{{ selectedPath || '\\' }}</p>
+    </div>
+    <div v-if="allFolders.length" class="flex bg-primary bg-opacity-50 p-4">
+      <div class="w-1/2 border-r border-bg">
+        <div v-if="level > 0" class="w-full p-1 cursor-pointer flex items-center" @click="goBack">
+          <span class="material-icons bg-opacity-50 text-yellow-200" style="font-size: 1.2rem">folder</span>
+          <p class="text-base font-mono px-2">..</p>
+        </div>
+        <div v-for="dir in _directories" :key="dir.path" class="dir-item w-full p-1 cursor-pointer flex items-center hover:text-white text-gray-200" :class="dir.className" @click="selectDir(dir)">
+          <span class="material-icons bg-opacity-50 text-yellow-200" style="font-size: 1.2rem">folder</span>
+          <p class="text-base font-mono px-2 truncate">{{ dir.dirname }}</p>
+          <span v-if="dir.dirs && dir.dirs.length && dir.path === selectedPath" class="material-icons" style="font-size: 1.1rem">arrow_right</span>
+        </div>
+      </div>
+      <div class="w-1/2">
+        <div v-for="dir in _subdirs" :key="dir.path" :class="dir.className" class="dir-item w-full p-1 cursor-pointer flex items-center hover:text-white text-gray-200" @click="selectSubDir(dir)">
+          <span class="material-icons bg-opacity-50 text-yellow-200" style="font-size: 1.2rem">folder</span>
+          <p class="text-base font-mono px-2 truncate">{{ dir.dirname }}</p>
+        </div>
+      </div>
+    </div>
+    <div v-else-if="loadingFolders" class="py-12 text-center">
+      <p>Loading folders...</p>
+    </div>
+    <div v-else class="py-12 text-center">
+      <p class="text-lg mb-2">No Folders Available</p>
+      <p class="text-gray-300">Note: folders already mapped will not be shown</p>
+    </div>
+
+    <div class="absolute bottom-0 left-0 w-full py-4 px-8">
+      <ui-btn :disabled="!selectedPath" color="primary" class="w-full mt-2" @click="selectFolder">Select Folder Path</ui-btn>
+      <!-- <div class="flex items-center">
+        <div class="flex-grow" />
+        <ui-btn color="success" @click="selectFolder">Select</ui-btn>
+      </div> -->
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    paths: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      loadingFolders: false,
+      allFolders: [],
+      directories: [],
+      selectedPath: '',
+      selectedFullPath: '',
+      subdirs: [],
+      level: 0,
+      currentDir: null,
+      previousDir: null
+    }
+  },
+  computed: {
+    _directories() {
+      return this.directories.map((d) => {
+        console.log('Directories', d)
+        var isUsed = !!this.paths.find((path) => path.endsWith(d.path))
+        var isSelected = d.path === this.selectedPath
+        var classes = []
+        if (isSelected) classes.push('dir-selected')
+        if (isUsed) classes.push('dir-used')
+        return {
+          isUsed,
+          isSelected,
+          className: classes.join(' '),
+          ...d
+        }
+      })
+    },
+    _subdirs() {
+      return this.subdirs.map((d) => {
+        var isUsed = !!this.paths.find((path) => path.endsWith(d.path))
+        var classes = []
+        if (isUsed) classes.push('dir-used')
+        return {
+          isUsed,
+          className: classes.join(' '),
+          ...d
+        }
+      })
+    }
+  },
+  methods: {
+    goBack() {
+      var splitPaths = this.selectedPath.split('\\').slice(1)
+      var prev = splitPaths.slice(0, -1).join('\\')
+
+      var currDirs = this.allFolders
+      for (let i = 0; i < splitPaths.length; i++) {
+        var _dir = currDirs.find((dir) => dir.dirname === splitPaths[i])
+        if (_dir && _dir.path.slice(1) === prev) {
+          this.directories = currDirs
+          this.selectDir(_dir)
+          return
+        } else if (_dir) {
+          currDirs = _dir.dirs
+        }
+      }
+    },
+    selectDir(dir) {
+      if (dir.isUsed) return
+      this.selectedPath = dir.path
+      this.selectedFullPath = dir.fullPath
+      this.level = dir.level
+      this.subdirs = dir.dirs
+    },
+    selectSubDir(dir) {
+      if (dir.isUsed) return
+      this.selectedPath = dir.path
+      this.selectedFullPath = dir.fullPath
+      this.level = dir.level
+      this.directories = this.subdirs
+      this.subdirs = dir.dirs
+    },
+    selectFolder() {
+      if (!this.selectedPath) {
+        console.error('No Selected path')
+        return
+      }
+      if (this.paths.find((p) => p.startsWith(this.selectedFullPath))) {
+        this.$toast.error(`Oops, you cannot add a parent directory of a folder already added`)
+        return
+      }
+      this.$emit('select', this.selectedFullPath)
+      this.selectedPath = ''
+      this.selectedFullPath = ''
+    },
+    async init() {
+      this.loadingFolders = true
+      this.allFolders = await this.$store.dispatch('libraries/loadFolders')
+      this.loadingFolders = false
+
+      this.directories = this.allFolders
+      this.subdirs = []
+      this.selectedPath = ''
+      this.selectedFullPath = ''
+    }
+  },
+  mounted() {
+    console.log('folder chooser mounted')
+    this.init()
+  }
+}
+</script>
+
+
+
+<style>
+.dir-item.dir-selected {
+  background-color: rgba(255, 255, 255, 0.1);
+}
+.dir-item.dir-used {
+  background-color: rgba(255, 25, 0, 0.1);
+}
+</style>

client/components/modals/libraries/LibraryItem.vue

@@ -0,0 +1,94 @@
+<template>
+  <div class="w-full px-4 h-12 border border-white border-opacity-10 flex items-center relative -mt-px" :class="selected ? 'bg-primary bg-opacity-50' : 'hover:bg-primary hover:bg-opacity-25'" @mouseover="mouseover = true" @mouseleave="mouseover = false">
+    <div v-show="selected" class="absolute top-0 left-0 h-full w-0.5 bg-warning z-10" />
+    <svg v-if="!libraryScan" xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-white" :class="isHovering ? 'text-opacity-90' : 'text-opacity-50'" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4" />
+    </svg>
+    <svg v-else viewBox="0 0 24 24" class="h-6 w-6 text-white text-opacity-50 animate-spin">
+      <path fill="currentColor" d="M12,4V2A10,10 0 0,0 2,12H4A8,8 0 0,1 12,4Z" />
+    </svg>
+    <p class="text-xl font-book pl-4 hover:underline cursor-pointer" @click.stop="$emit('click', library)">{{ library.name }}</p>
+    <div class="flex-grow" />
+    <ui-btn v-show="isHovering && !libraryScan && canScan" small color="bg" @click.stop="scan">Scan</ui-btn>
+    <span v-show="isHovering && !libraryScan && showEdit && canEdit" class="material-icons text-xl text-gray-300 hover:text-gray-50 ml-4 cursor-pointer" @click.stop="editClick">edit</span>
+    <span v-show="!libraryScan && isHovering && showEdit && canDelete && !isDeleting" class="material-icons text-xl text-gray-300 ml-3" :class="isMain ? 'text-opacity-5 cursor-not-allowed' : 'hover:text-gray-50 cursor-pointer'" @click.stop="deleteClick">delete</span>
+    <div v-show="isDeleting" class="text-xl text-gray-300 ml-3 animate-spin">
+      <svg viewBox="0 0 24 24" class="w-6 h-6">
+        <path fill="currentColor" d="M12,4V2A10,10 0 0,0 2,12H4A8,8 0 0,1 12,4Z" />
+      </svg>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    library: {
+      type: Object,
+      default: () => {}
+    },
+    selected: Boolean,
+    showEdit: Boolean,
+    dragging: Boolean
+  },
+  data() {
+    return {
+      mouseover: false,
+      isDeleting: false
+    }
+  },
+  computed: {
+    isHovering() {
+      return this.mouseover && !this.dragging
+    },
+    isMain() {
+      return this.library.id === 'main'
+    },
+    libraryScan() {
+      return this.$store.getters['scanners/getLibraryScan'](this.library.id)
+    },
+    canEdit() {
+      return this.$store.getters['user/getIsRoot']
+    },
+    canDelete() {
+      return this.$store.getters['user/getIsRoot']
+    },
+    canScan() {
+      return this.$store.getters['user/getIsRoot']
+    }
+  },
+  methods: {
+    itemClicked() {
+      // this.$emit('click', this.library)
+    },
+    editClick() {
+      this.$emit('edit', this.library)
+    },
+    scan() {
+      this.$root.socket.emit('scan', this.library.id)
+    },
+    deleteClick() {
+      if (this.isMain) return
+      if (confirm(`Are you sure you want to permanently delete library "${this.library.name}"?`)) {
+        this.isDeleting = true
+        this.$axios
+          .$delete(`/api/library/${this.library.id}`)
+          .then((data) => {
+            this.isDeleting = false
+            if (data.error) {
+              this.$toast.error(data.error)
+            } else {
+              this.$toast.success('Library deleted')
+            }
+          })
+          .catch((error) => {
+            console.error('Failed to delete library', error)
+            this.$toast.error('Failed to delete library')
+            this.isDeleting = false
+          })
+      }
+    }
+  },
+  mounted() {}
+}
+</script>

client/components/prompt/Dialog.vue

@@ -0,0 +1,85 @@
+<template>
+  <div ref="wrapper" class="modal modal-bg w-full h-full fixed top-0 left-0 bg-primary bg-opacity-75 flex items-center justify-center z-40 opacity-0">
+    <div class="absolute top-0 left-0 right-0 w-full h-36 bg-gradient-to-t from-transparent via-black-500 to-black-700 opacity-90 pointer-events-none" />
+    <div ref="content" style="min-width: 400px; min-height: 200px" class="relative text-white" :style="{ height: modalHeight, width: modalWidth }">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    value: Boolean,
+    persistent: {
+      type: Boolean,
+      default: true
+    },
+    width: {
+      type: [String, Number],
+      default: 500
+    },
+    height: {
+      type: [String, Number],
+      default: 'unset'
+    }
+  },
+  data() {
+    return {
+      el: null,
+      content: null
+    }
+  },
+  watch: {
+    show(newVal) {
+      if (newVal) {
+        this.setShow()
+      } else {
+        this.setHide()
+      }
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('input', val)
+      }
+    },
+    modalHeight() {
+      if (typeof this.height === 'string') {
+        return this.height
+      } else {
+        return this.height + 'px'
+      }
+    },
+    modalWidth() {
+      return typeof this.width === 'string' ? this.width : this.width + 'px'
+    }
+  },
+  methods: {
+    setShow() {
+      document.body.appendChild(this.el)
+      setTimeout(() => {
+        this.content.style.transform = 'scale(1)'
+      }, 10)
+      document.documentElement.classList.add('modal-open')
+    },
+    setHide() {
+      this.content.style.transform = 'scale(0)'
+      this.el.remove()
+      document.documentElement.classList.remove('modal-open')
+    }
+  },
+  mounted() {
+    this.el = this.$refs.wrapper
+    this.content = this.$refs.content
+    this.content.style.transform = 'scale(0)'
+    this.content.style.transition = 'transform 0.25s cubic-bezier(0.16, 1, 0.3, 1)'
+    this.el.style.opacity = 1
+    this.el.remove()
+  }
+}
+</script>

client/components/tables/BackupsTable.vue

@@ -0,0 +1,190 @@
+<template>
+  <div class="text-center mt-4">
+    <div class="flex py-4">
+      <ui-file-input ref="fileInput" class="mr-2" accept=".audiobookshelf" @change="backupUploaded">Upload Backup</ui-file-input>
+      <div class="flex-grow" />
+      <ui-btn :loading="isBackingUp" @click="clickCreateBackup">Create Backup</ui-btn>
+    </div>
+    <div class="relative">
+      <table id="backups">
+        <tr>
+          <th>File</th>
+          <th class="w-56">Datetime</th>
+          <th class="w-28">Size</th>
+          <th class="w-36"></th>
+        </tr>
+        <tr v-for="backup in backups" :key="backup.id">
+          <td>
+            <p class="truncate">/{{ backup.path.replace(/\\/g, '/') }}</p>
+          </td>
+          <td class="font-sans">{{ backup.datePretty }}</td>
+          <td class="font-mono">{{ $bytesPretty(backup.fileSize) }}</td>
+          <td>
+            <div class="w-full flex items-center justify-center">
+              <ui-btn small color="primary" @click="applyBackup(backup)">Apply</ui-btn>
+
+              <a :href="`/metadata/${backup.path.replace(/%/g, '%25').replace(/#/g, '%23')}?token=${userToken}`" class="mx-1 pt-0.5 hover:text-opacity-100 text-opacity-70 text-white" download><span class="material-icons text-xl">download</span></a>
+              <!-- <span class="material-icons text-xl hover:text-opacity-100 text-opacity-70 text-white cursor-pointer mx-1" @click="downloadBackup">download</span> -->
+
+              <span class="material-icons text-xl hover:text-error hover:text-opacity-100 text-opacity-70 text-white cursor-pointer mx-1" @click="deleteBackupClick(backup)">delete</span>
+            </div>
+          </td>
+        </tr>
+        <tr v-if="!backups.length" class="staticrow">
+          <td colspan="4" class="text-lg">No Backups</td>
+        </tr>
+      </table>
+      <div v-show="processing" class="absolute top-0 left-0 w-full h-full bg-black bg-opacity-25 flex items-center justify-center">
+        <ui-loading-indicator />
+      </div>
+    </div>
+
+    <prompt-dialog v-model="showConfirmApply" :width="675">
+      <div v-if="selectedBackup" class="px-4 w-full text-sm py-6 rounded-lg bg-bg shadow-lg border border-black-300">
+        <p class="text-error text-lg font-semibold">Important Notice!</p>
+        <p class="text-base py-1">Applying a backup will overwrite users, user progress, book details, settings, and covers stored in metadata with the backed up data.</p>
+        <p class="text-base py-1">Backups <strong>do not</strong> modify any files in your library folders, only data in the audiobookshelf created <span class="font-mono">/config</span> and <span class="font-mono">/metadata</span> directories.</p>
+        <p class="text-base py-1">All clients using your server will be automatically refreshed.</p>
+
+        <p class="text-lg text-center my-8">Are you sure you want to apply the backup created on {{ selectedBackup.datePretty }}?</p>
+        <div class="flex px-1 items-center">
+          <ui-btn color="primary" @click="showConfirmApply = false">Nevermind</ui-btn>
+          <div class="flex-grow" />
+          <ui-btn color="success" @click="confirm">Apply Backup</ui-btn>
+        </div>
+      </div>
+    </prompt-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      showConfirmApply: false,
+      selectedBackup: null,
+      isBackingUp: false,
+      processing: false
+    }
+  },
+  computed: {
+    backups() {
+      return this.$store.state.backups || []
+    },
+    userToken() {
+      return this.$store.getters['user/getToken']
+    }
+  },
+  methods: {
+    confirm() {
+      this.showConfirmApply = false
+      this.$root.socket.once('apply_backup_complete', this.applyBackupComplete)
+      this.$root.socket.emit('apply_backup', this.selectedBackup.id)
+    },
+    deleteBackupClick(backup) {
+      if (confirm(`Are you sure you want to delete backup for ${backup.datePretty}?`)) {
+        this.processing = true
+        this.$axios
+          .$delete(`/api/backup/${backup.id}`)
+          .then((backups) => {
+            console.log('Backup deleted', backups)
+            this.$store.commit('setBackups', backups)
+            this.$toast.success(`Backup deleted`)
+            this.processing = false
+          })
+          .catch((error) => {
+            console.error(error)
+            this.$toast.error('Failed to delete backup')
+            this.processing = false
+          })
+      }
+    },
+    applyBackupComplete(success) {
+      if (success) {
+        // this.$toast.success('Backup Applied, refresh the page')
+        location.replace('/config?backup=1')
+      } else {
+        this.$toast.error('Failed to apply backup')
+      }
+    },
+    applyBackup(backup) {
+      this.selectedBackup = backup
+      this.showConfirmApply = true
+    },
+    backupComplete(backups) {
+      this.isBackingUp = false
+      if (backups) {
+        this.$toast.success('Backup Successful')
+        this.$store.commit('setBackups', backups)
+      } else this.$toast.error('Backup Failed')
+    },
+    clickCreateBackup() {
+      this.isBackingUp = true
+      this.$root.socket.once('backup_complete', this.backupComplete)
+      this.$root.socket.emit('create_backup')
+    },
+    backupUploaded(file) {
+      var form = new FormData()
+      form.set('file', file)
+
+      this.processing = true
+
+      this.$axios
+        .$post('/api/backup/upload', form)
+        .then((result) => {
+          console.log('Upload backup result', result)
+          this.$store.commit('setBackups', result)
+          this.$toast.success('Backup upload success')
+          this.processing = false
+        })
+        .catch((error) => {
+          console.error(error)
+          var errorMessage = error.response && error.response.data ? error.response.data : 'Failed to upload backup'
+          this.$toast.error(errorMessage)
+          this.processing = false
+        })
+    }
+  },
+  mounted() {
+    if (this.$route.query.backup) {
+      this.$toast.success('Backup applied successfully')
+      this.$router.replace('/config')
+    }
+  }
+}
+</script>
+
+<style>
+#backups {
+  table-layout: fixed;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#backups td,
+#backups th {
+  border: 1px solid #2e2e2e;
+  padding: 8px 8px;
+  text-align: left;
+}
+
+#backups tr.staticrow td {
+  text-align: center;
+}
+
+#backups tr:nth-child(even) {
+  background-color: #3a3a3a;
+}
+
+#backups tr:not(.staticrow):hover {
+  background-color: #444;
+}
+
+#backups th {
+  font-size: 0.8rem;
+  font-weight: 600;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  background-color: #333;
+}
+</style>

client/components/tables/LibrariesTable.vue

@@ -0,0 +1,112 @@
+<template>
+  <div id="librariesTable" class="bg-bg rounded-md shadow-lg border border-white border-opacity-5 p-4 mb-8">
+    <div class="flex items-center mb-2">
+      <h1 class="text-xl">Libraries</h1>
+      <div class="mx-2 w-7 h-7 flex items-center justify-center rounded-full cursor-pointer hover:bg-white hover:bg-opacity-10 text-center" @click="clickAddLibrary">
+        <span class="material-icons" style="font-size: 1.4rem">add</span>
+      </div>
+    </div>
+    <draggable v-model="libraryCopies" v-bind="dragOptions" class="list-group" draggable=".item" tag="div" @start="startDrag" @end="endDrag">
+      <!-- <transition-group type="transition" :name="!drag ? 'flip-list' : null"> -->
+      <template v-for="library in libraryCopies">
+        <modals-libraries-library-item :key="library.id" :library="library" :selected="currentLibraryId === library.id" :show-edit="true" :dragging="drag" @edit="editLibrary" @click="setLibrary" class="item" />
+      </template>
+      <!-- </transition-group> -->
+    </draggable>
+    <modals-edit-library-modal v-model="showLibraryModal" :library="selectedLibrary" />
+  </div>
+</template>
+
+<script>
+import draggable from 'vuedraggable'
+
+export default {
+  components: {
+    draggable
+  },
+  data() {
+    return {
+      libraryCopies: [],
+      currentOrder: [],
+      showLibraryModal: false,
+      selectedLibrary: null,
+      drag: false,
+      dragOptions: {
+        animation: 200,
+        group: 'description',
+        ghostClass: 'ghost'
+      },
+      orderTimeout: null
+    }
+  },
+  computed: {
+    currentLibrary() {
+      return this.$store.getters['libraries/getCurrentLibrary']
+    },
+    currentLibraryId() {
+      return this.currentLibrary ? this.currentLibrary.id : null
+    },
+    libraries() {
+      return this.$store.getters['libraries/getSortedLibraries']()
+    }
+  },
+  methods: {
+    startDrag() {
+      this.drag = true
+      clearTimeout(this.orderTimeout)
+    },
+    endDrag() {
+      this.drag = false
+      this.checkOrder()
+      console.log('DRAG END')
+    },
+    checkOrder() {
+      clearTimeout(this.orderTimeout)
+      this.orderTimeout = setTimeout(() => {
+        this.saveOrder()
+      }, 500)
+    },
+    saveOrder() {
+      var _newOrder = 1
+      var currOrder = this.libraries.map((lib) => lib.id).join(',')
+      var libraryOrderData = this.libraryCopies.map((library) => {
+        return {
+          newOrder: _newOrder++,
+          oldOrder: library.displayOrder,
+          id: library.id
+        }
+      })
+      var newOrder = libraryOrderData.map((lib) => lib.id).join(',')
+      if (currOrder !== newOrder) {
+        this.$axios.$patch('/api/libraries/order', libraryOrderData).then((libraries) => {
+          if (libraries && libraries.length) {
+            this.$toast.success('Library order saved', { timeout: 1500 })
+            this.$store.commit('libraries/set', libraries)
+          }
+        })
+      }
+    },
+    async setLibrary(library) {
+      await this.$store.dispatch('libraries/fetch', library.id)
+      this.$router.push(`/library/${library.id}`)
+    },
+    clickAddLibrary() {
+      this.selectedLibrary = null
+      this.showLibraryModal = true
+    },
+    editLibrary(library) {
+      this.selectedLibrary = library
+      this.showLibraryModal = true
+    },
+    init() {
+      this.libraryCopies = this.libraries.map((lib) => {
+        return { ...lib }
+      })
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  beforeDestroy() {}
+}
+</script>

client/components/tables/OtherFilesTable.vue

@@ -2,11 +2,14 @@
   <div class="w-full my-2">
     <div class="w-full bg-primary px-6 py-2 flex items-center cursor-pointer" @click.stop="clickBar">
       <p class="pr-4">Other Files</p>
-      <span class="bg-black-400 rounded-xl py-1 px-2 text-sm font-mono">{{ files.length }}</span>
+      <div class="h-7 w-7 rounded-full bg-white bg-opacity-10 flex items-center justify-center">
+        <span class="text-sm font-mono">{{ files.length }}</span>
+      </div>
       <div class="flex-grow" />
       <!-- <nuxt-link :to="`/audiobook/${audiobookId}/edit`" class="mr-4">
         <ui-btn small color="primary">Manage Tracks</ui-btn>
       </nuxt-link> -->
+      <ui-btn small :color="showFullPath ? 'gray-600' : 'primary'" class="mr-2" @click.stop="showFullPath = !showFullPath">Full Path</ui-btn>
       <div class="cursor-pointer h-10 w-10 rounded-full hover:bg-black-400 flex justify-center items-center duration-500" :class="showFiles ? 'transform rotate-180' : ''">
         <span class="material-icons text-4xl">expand_more</span>
       </div>
@@ -15,17 +18,21 @@
       <div class="w-full" v-show="showFiles">
         <table class="text-sm tracksTable">
           <tr class="font-book">
-            <th class="text-left">Path</th>
-            <th class="text-left">Filetype</th>
+            <th class="text-left px-4">Path</th>
+            <th class="text-left px-4 w-24">Filetype</th>
+            <th v-if="userCanDownload" class="text-center w-20">Download</th>
           </tr>
-          <template v-for="file in files">
+          <template v-for="file in otherFilesCleaned">
             <tr :key="file.path">
               <td class="font-book pl-2">
-                {{ file.path }}
+                {{ showFullPath ? file.fullPath : file.path }}
               </td>
               <td class="text-xs">
                 <p>{{ file.filetype }}</p>
               </td>
+              <td v-if="userCanDownload" class="text-center">
+                <a :href="`/s/book/${audiobookId}/${file.relativePath}?token=${userToken}`" download><span class="material-icons icon-text">download</span></a>
+              </td>
             </tr>
           </template>
         </table>
@@ -41,14 +48,45 @@ export default {
       type: Array,
       default: () => []
     },
-    audiobookId: String
+    audiobook: {
+      type: Object,
+      default: () => null
+    }
   },
   data() {
     return {
-      showFiles: false
+      showFiles: false,
+      showFullPath: false
+    }
+  },
+  computed: {
+    audiobookId() {
+      return this.audiobook.id
+    },
+    audiobookPath() {
+      return this.audiobook.path
+    },
+    otherFilesCleaned() {
+      return this.files.map((file) => {
+        var filePath = file.path.replace(/\\/g, '/')
+        var audiobookPath = this.audiobookPath.replace(/\\/g, '/')
+
+        return {
+          ...file,
+          relativePath: filePath
+            .replace(audiobookPath + '/', '')
+            .replace(/%/g, '%25')
+            .replace(/#/g, '%23')
+        }
+      })
+    },
+    userToken() {
+      return this.$store.getters['user/getToken']
+    },
+    userCanDownload() {
+      return this.$store.getters['user/getUserCanDownload']
     }
   },
-  computed: {},
   methods: {
     clickBar() {
       this.showFiles = !this.showFiles

client/components/tables/TracksTable.vue

@@ -2,8 +2,12 @@
   <div class="w-full my-2">
     <div class="w-full bg-primary px-6 py-2 flex items-center cursor-pointer" @click.stop="clickBar">
       <p class="pr-4">Audio Tracks</p>
-      <span class="bg-black-400 rounded-xl py-1 px-2 text-sm font-mono">{{ tracks.length }}</span>
+      <div class="h-7 w-7 rounded-full bg-white bg-opacity-10 flex items-center justify-center">
+        <span class="text-sm font-mono">{{ tracks.length }}</span>
+      </div>
+      <!-- <span class="bg-black-400 rounded-xl py-1 px-2 text-sm font-mono">{{ tracks.length }}</span> -->
       <div class="flex-grow" />
+      <ui-btn small :color="showFullPath ? 'gray-600' : 'primary'" class="mr-2" @click.stop="showFullPath = !showFullPath">Full Path</ui-btn>
       <nuxt-link v-if="userCanUpdate" :to="`/audiobook/${audiobookId}/edit`" class="mr-4">
         <ui-btn small color="primary">Manage Tracks</ui-btn>
       </nuxt-link>
@@ -15,20 +19,18 @@
       <div class="w-full" v-show="showTracks">
         <table class="text-sm tracksTable">
           <tr class="font-book">
-            <th>#</th>
+            <th class="w-10">#</th>
             <th class="text-left">Filename</th>
-            <th class="text-left">Size</th>
-            <th class="text-left">Duration</th>
-            <th v-if="userCanDownload" class="text-center">Download</th>
+            <th class="text-left w-20">Size</th>
+            <th class="text-left w-20">Duration</th>
+            <th v-if="userCanDownload" class="text-center w-20">Download</th>
           </tr>
-          <template v-for="track in tracks">
+          <template v-for="track in tracksCleaned">
             <tr :key="track.index">
               <td class="text-center">
                 <p>{{ track.index }}</p>
               </td>
-              <td class="font-book">
-                {{ track.filename }}
-              </td>
+              <td class="font-sans">{{ showFullPath ? track.fullPath : track.filename }}</td>
               <td class="font-mono">
                 {{ $bytesPretty(track.size) }}
               </td>
@@ -36,7 +38,7 @@
                 {{ $secondsToTimestamp(track.duration) }}
               </td>
               <td v-if="userCanDownload" class="text-center">
-                <a :href="`/local/${track.path}`" download><span class="material-icons icon-text">download</span></a>
+                <a :href="`/s/book/${audiobook.id}/${track.relativePath}?token=${userToken}`" download><span class="material-icons icon-text">download</span></a>
               </td>
             </tr>
           </template>
@@ -53,14 +55,41 @@ export default {
       type: Array,
       default: () => []
     },
-    audiobookId: String
+    audiobook: {
+      type: Object,
+      default: () => null
+    }
   },
   data() {
     return {
-      showTracks: false
+      showTracks: false,
+      showFullPath: false
     }
   },
   computed: {
+    audiobookId() {
+      return this.audiobook.id
+    },
+    audiobookPath() {
+      return this.audiobook.path
+    },
+    tracksCleaned() {
+      return this.tracks.map((track) => {
+        var trackPath = track.path.replace(/\\/g, '/')
+        var audiobookPath = this.audiobookPath.replace(/\\/g, '/')
+
+        return {
+          ...track,
+          relativePath: trackPath
+            .replace(audiobookPath + '/', '')
+            .replace(/%/g, '%25')
+            .replace(/#/g, '%23')
+        }
+      })
+    },
+    userToken() {
+      return this.$store.getters['user/getToken']
+    },
     userCanDownload() {
       return this.$store.getters['user/getUserCanDownload']
     },

client/components/tables/UsersTable.vue

@@ -0,0 +1,220 @@
+<template>
+  <div class="bg-bg rounded-md shadow-lg border border-white border-opacity-5 p-4 mb-8">
+    <div class="flex items-center mb-2">
+      <h1 class="text-xl">Users</h1>
+      <div class="mx-2 w-7 h-7 flex items-center justify-center rounded-full cursor-pointer hover:bg-white hover:bg-opacity-10 text-center" @click="clickAddUser">
+        <span class="material-icons" style="font-size: 1.4rem">add</span>
+      </div>
+    </div>
+    <!-- <div class="h-0.5 bg-primary bg-opacity-50 w-full" /> -->
+    <div class="text-center">
+      <table id="accounts">
+        <tr>
+          <th>Username</th>
+          <th class="w-20">Type</th>
+          <th>Activity</th>
+          <th class="w-32">Last Seen</th>
+          <th class="w-32">Created</th>
+          <th class="w-32"></th>
+        </tr>
+        <tr v-for="user in users" :key="user.id" :class="user.isActive ? '' : 'bg-error bg-opacity-20'">
+          <td>
+            <div class="flex items-center">
+              <span v-if="usersOnline[user.id]" class="w-3 h-3 text-sm mr-2 text-success animate-pulse"
+                ><svg viewBox="0 0 24 24">
+                  <path fill="currentColor" d="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" /></svg
+              ></span>
+              <svg v-else class="w-3 h-3 mr-2 text-white text-opacity-20" viewBox="0 0 24 24">
+                <path fill="currentColor" d="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
+              </svg>
+              {{ user.username }} <span v-show="$isDev" class="text-xs text-gray-400 italic pl-4">({{ user.id }})</span>
+            </div>
+          </td>
+          <td class="text-sm">{{ user.type }}</td>
+          <td>
+            <div v-if="usersOnline[user.id] && usersOnline[user.id].stream && usersOnline[user.id].stream.audiobook && usersOnline[user.id].stream.audiobook.book">
+              <p class="truncate text-xs">Reading: {{ usersOnline[user.id].stream.audiobook.book.title || '' }}</p>
+            </div>
+            <div v-else-if="user.audiobooks && getLastRead(user.audiobooks)">
+              <p class="truncate text-xs">Last: {{ getLastRead(user.audiobooks) }}</p>
+            </div>
+          </td>
+          <td class="text-xs font-mono">
+            <ui-tooltip v-if="user.lastSeen" direction="top" :text="$formatDate(user.lastSeen, 'MMMM do, yyyy HH:mm')">
+              {{ $dateDistanceFromNow(user.lastSeen) }}
+            </ui-tooltip>
+          </td>
+          <td class="text-xs font-mono">
+            <ui-tooltip direction="top" :text="$formatDate(user.createdAt, 'MMMM do, yyyy HH:mm')">
+              {{ $formatDate(user.createdAt, 'MMM d, yyyy') }}
+            </ui-tooltip>
+          </td>
+          <td>
+            <div class="w-full flex justify-center">
+              <span class="material-icons hover:text-gray-400 cursor-pointer text-base pr-2" @click="editUser(user)">edit</span>
+              <span v-show="user.type !== 'root'" class="material-icons text-base hover:text-error cursor-pointer" @click="deleteUserClick(user)">delete</span>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </div>
+
+    <modals-account-modal v-model="showAccountModal" :account="selectedAccount" />
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      users: [],
+      selectedAccount: null,
+      showAccountModal: false,
+      isDeletingUser: false
+    }
+  },
+  computed: {
+    currentUserId() {
+      return this.$store.state.user.user.id
+    },
+    userStream() {
+      return this.$store.state.streamAudiobook
+    },
+    usersOnline() {
+      var _users = this.$store.state.users.users
+
+      var currUserStream = null
+      if (this.userStream) {
+        currUserStream = {
+          audiobook: this.userStream
+        }
+      }
+      var usermap = {
+        [this.currentUserId]: {
+          online: true,
+          stream: currUserStream
+        }
+      }
+      _users.forEach((u) => (usermap[u.id] = { online: true, stream: u.stream }))
+      return usermap
+    }
+  },
+  methods: {
+    getLastRead(audiobooks) {
+      var abs = Object.values(audiobooks)
+      if (abs.length) {
+        abs = abs.sort((a, b) => a.lastUpdate - b.lastUpdate)
+        return abs[0] && abs[0].audiobookTitle ? abs[0].audiobookTitle : null
+      }
+      return null
+    },
+    deleteUserClick(user) {
+      if (this.isDeletingUser) return
+      if (confirm(`Are you sure you want to permanently delete user "${user.username}"?`)) {
+        this.isDeletingUser = true
+        this.$axios
+          .$delete(`/api/user/${user.id}`)
+          .then((data) => {
+            this.isDeletingUser = false
+            if (data.error) {
+              this.$toast.error(data.error)
+            } else {
+              this.$toast.success('User deleted')
+            }
+          })
+          .catch((error) => {
+            console.error('Failed to delete user', error)
+            this.$toast.error('Failed to delete user')
+            this.isDeletingUser = false
+          })
+      }
+    },
+    clickAddUser() {
+      this.selectedAccount = null
+      this.showAccountModal = true
+    },
+    editUser(user) {
+      this.selectedAccount = user
+      this.showAccountModal = true
+    },
+    loadUsers() {
+      this.$axios
+        .$get('/api/users')
+        .then((users) => {
+          this.users = users
+        })
+        .catch((error) => {
+          console.error('Failed', error)
+        })
+    },
+    addUpdateUser(user) {
+      if (!this.users) return
+      var index = this.users.findIndex((u) => u.id === user.id)
+      if (index >= 0) {
+        this.users.splice(index, 1, user)
+      } else {
+        this.users.push(user)
+      }
+    },
+    userRemoved(user) {
+      this.users = this.users.filter((u) => u.id !== user.id)
+    },
+    init(attempts = 0) {
+      if (!this.$root.socket) {
+        if (attempts > 10) {
+          return console.error('Failed to setup socket listeners')
+        }
+        setTimeout(() => {
+          this.init(++attempts)
+        }, 250)
+        return
+      }
+      this.$root.socket.on('user_added', this.addUpdateUser)
+      this.$root.socket.on('user_updated', this.addUpdateUser)
+      this.$root.socket.on('user_removed', this.userRemoved)
+    }
+  },
+  mounted() {
+    this.loadUsers()
+    this.init()
+  },
+  beforeDestroy() {
+    if (this.$root.socket) {
+      this.$root.socket.off('user_added', this.newUserAdded)
+      this.$root.socket.off('user_updated', this.userUpdated)
+      this.$root.socket.off('user_removed', this.userRemoved)
+    }
+  }
+}
+</script>
+
+<style>
+#accounts {
+  table-layout: fixed;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#accounts td,
+#accounts th {
+  border: 1px solid #2e2e2e;
+  padding: 8px 8px;
+  text-align: left;
+}
+
+#accounts tr:nth-child(even) {
+  background-color: #3a3a3a;
+}
+
+#accounts tr:hover {
+  background-color: #444;
+}
+
+#accounts th {
+  font-size: 0.8rem;
+  font-weight: 600;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  background-color: #333;
+}
+</style>

client/components/ui/Btn.vue

@@ -56,6 +56,9 @@ export default {
       if (this.paddingX !== undefined) {
         list.push(`px-${this.paddingX}`)
       }
+      if (this.disabled) {
+        list.push('cursor-not-allowed')
+      }
       return list
     }
   },

client/components/ui/Dropdown.vue

@@ -1,21 +1,21 @@
 <template>
-  <div class="relative w-44" v-click-outside="clickOutside">
+  <div class="relative w-full" v-click-outside="clickOutside">
     <p class="text-sm text-opacity-75 mb-1">{{ label }}</p>
-    <button type="button" class="relative w-full bg-fg border border-gray-500 rounded shadow-sm pl-3 pr-10 py-2 text-left focus:outline-none sm:text-sm cursor-pointer" aria-haspopup="listbox" aria-expanded="true" @click.stop.prevent="showMenu = !showMenu">
+    <button type="button" :disabled="disabled" class="relative h-10 w-full border border-gray-500 rounded shadow-sm pl-3 pr-10 py-2 text-left focus:outline-none sm:text-sm cursor-pointer bg-primary" aria-haspopup="listbox" aria-expanded="true" @click.stop.prevent="clickShowMenu">
       <span class="flex items-center">
         <span class="block truncate">{{ selectedText }}</span>
       </span>
       <span class="ml-3 absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
-        <span class="material-icons text-gray-100">chevron_down</span>
+        <span class="material-icons text-gray-100">expand_more</span>
       </span>
     </button>
 
     <transition name="menu">
-      <ul v-show="showMenu" class="absolute z-10 -mt-px w-full bg-primary border border-black-200 shadow-lg max-h-56 rounded-b-md py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox" aria-activedescendant="listbox-option-3">
+      <ul v-show="showMenu" class="absolute z-10 -mt-px w-full bg-primary border border-black-200 shadow-lg max-h-56 rounded-b-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox">
         <template v-for="item in items">
           <li :key="item.value" class="text-gray-100 select-none relative py-2 cursor-pointer hover:bg-black-400" id="listbox-option-0" role="option" @click="clickedOption(item.value)">
             <div class="flex items-center">
-              <span class="font-normal ml-3 block truncate font-sans">{{ item.text }}</span>
+              <span class="font-normal ml-3 block truncate font-sans text-sm">{{ item.text }}</span>
             </div>
           </li>
         </template>
@@ -35,7 +35,8 @@ export default {
     items: {
       type: Array,
       default: () => []
-    }
+    },
+    disabled: Boolean
   },
   data() {
     return {
@@ -59,6 +60,10 @@ export default {
     }
   },
   methods: {
+    clickShowMenu() {
+      if (this.disabled) return
+      this.showMenu = !this.showMenu
+    },
     clickOutside() {
       this.showMenu = false
     },

client/components/ui/EditableText.vue

@@ -0,0 +1,58 @@
+<template>
+  <input ref="input" v-model="inputValue" :type="type" :readonly="readonly" :disabled="disabled" :placeholder="placeholder" class="py-2 px-1 bg-transparent border-b border-opacity-0 border-gray-400 focus:border-opacity-100 focus:outline-none" @keyup="keyup" @change="change" @focus="focused" @blur="blurred" />
+</template>
+
+<script>
+export default {
+  props: {
+    value: [String, Number],
+    placeholder: String,
+    readonly: Boolean,
+    type: {
+      type: String,
+      default: 'text'
+    },
+    disabled: Boolean
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    inputValue: {
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('input', val)
+      }
+    }
+  },
+  methods: {
+    focused() {
+      this.$emit('focus')
+    },
+    blurred() {
+      this.$emit('blur')
+    },
+    change(e) {
+      this.$emit('change', e.target.value)
+    },
+    keyup(e) {
+      this.$emit('keyup', e)
+    },
+    blur() {
+      if (this.$refs.input) this.$refs.input.blur()
+    }
+  },
+  mounted() {}
+}
+</script>
+
+<style scoped>
+input {
+  border-style: inherit !important;
+}
+input:read-only {
+  background-color: #444;
+}
+</style>

client/components/ui/FileInput.vue

@@ -1,17 +1,21 @@
 <template>
   <div>
-    <input ref="fileInput" id="hidden-input" type="file" :accept="inputAccept" class="hidden" @change="inputChanged" />
-    <ui-btn @click="clickUpload" color="primary" type="text">Upload Cover</ui-btn>
+    <input ref="fileInput" id="hidden-input" type="file" :accept="accept" class="hidden" @change="inputChanged" />
+    <ui-btn @click="clickUpload" color="primary" type="text"><slot /></ui-btn>
   </div>
 </template>
 
 <script>
 export default {
-  data() {
-    return {
-      inputAccept: 'image/*'
+  props: {
+    accept: {
+      type: String,
+      default: '.png, .jpg, .jpeg, .webp'
     }
   },
+  data() {
+    return {}
+  },
   computed: {},
   methods: {
     reset() {

client/components/ui/LibrariesDropdown.vue

@@ -0,0 +1,71 @@
+<template>
+  <div v-if="currentLibrary" class="relative w-36 h-8" v-click-outside="clickOutside">
+    <button type="button" :disabled="disabled" class="relative h-full w-full border border-white border-opacity-10 hover:border-opacity-20 rounded shadow-sm pl-3 pr-10 text-left focus:outline-none cursor-pointer bg-black bg-opacity-20 text-gray-400 hover:text-gray-200" aria-haspopup="listbox" aria-expanded="true" @click.stop.prevent="clickShowMenu">
+      <span class="flex items-center">
+        <widgets-library-icon :icon="currentLibraryIcon" class="mr-2" />
+        <span class="block truncate text-sm">{{ currentLibrary.name }}</span>
+      </span>
+    </button>
+
+    <transition name="menu">
+      <ul v-show="showMenu" class="absolute z-10 -mt-px w-full bg-primary border border-black-200 shadow-lg max-h-56 rounded-b-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox">
+        <template v-for="library in libraries">
+          <li :key="library.id" class="text-gray-100 select-none relative py-2 cursor-pointer hover:bg-black-400" id="listbox-option-0" role="option" @click="selectLibrary(library)">
+            <div class="flex items-center px-3">
+              <widgets-library-icon :icon="currentLibraryIcon" class="mr-2" />
+              <span class="font-normal block truncate font-sans text-sm">{{ library.name }}</span>
+            </div>
+          </li>
+        </template>
+      </ul>
+    </transition>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      showMenu: false,
+      disabled: false
+    }
+  },
+  computed: {
+    currentLibraryId() {
+      return this.$store.state.libraries.currentLibraryId
+    },
+    currentLibrary() {
+      return this.libraries.find((lib) => lib.id === this.currentLibraryId)
+    },
+    currentLibraryIcon() {
+      return this.currentLibrary ? this.currentLibrary.icon || 'database' : 'database'
+    },
+    libraries() {
+      return this.$store.getters['libraries/getSortedLibraries']()
+    },
+    libraryItems() {
+      return this.libraries.map((lib) => ({ value: lib.id, text: lib.name }))
+    }
+  },
+  methods: {
+    clickShowMenu() {
+      if (this.disabled) return
+      this.showMenu = !this.showMenu
+    },
+    clickOutside() {
+      this.showMenu = false
+    },
+    selectLibrary(library) {
+      this.updateLibrary(library)
+      this.showMenu = false
+    },
+    async updateLibrary(library) {
+      this.disabled = true
+      await this.$store.dispatch('libraries/fetch', library.id)
+      this.$router.push(`/library/${library.id}`)
+      this.disabled = false
+    }
+  },
+  mounted() {}
+}
+</script>

client/components/ui/TextInput.vue

@@ -1,5 +1,10 @@
 <template>
-  <input ref="input" v-model="inputValue" :type="type" :readonly="readonly" :disabled="disabled" :placeholder="placeholder" class="rounded bg-primary text-gray-200 focus:border-gray-500 focus:outline-none border border-gray-600" :class="classList" @keyup="keyup" @change="change" @focus="focused" @blur="blurred" />
+  <div class="relative">
+    <input ref="input" v-model="inputValue" :type="type" :readonly="readonly" :disabled="disabled" :placeholder="placeholder" class="rounded bg-primary text-gray-200 focus:border-gray-300 focus:bg-bg focus:outline-none border border-gray-600 h-full w-full" :class="classList" @keyup="keyup" @change="change" @focus="focused" @blur="blurred" />
+    <div v-if="clearable && inputValue" class="absolute top-0 right-0 h-full px-2 flex items-center justify-center">
+      <span class="material-icons text-gray-300 cursor-pointer" style="font-size: 1.1rem" @click.stop.prevent="clear">close</span>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -20,7 +25,10 @@ export default {
     paddingX: {
       type: Number,
       default: 3
-    }
+    },
+    noSpinner: Boolean,
+    textCenter: Boolean,
+    clearable: Boolean
   },
   data() {
     return {}
@@ -38,10 +46,15 @@ export default {
       var _list = []
       _list.push(`px-${this.paddingX}`)
       _list.push(`py-${this.paddingY}`)
+      if (this.noSpinner) _list.push('no-spinner')
+      if (this.textCenter) _list.push('text-center')
       return _list.join(' ')
     }
   },
   methods: {
+    clear() {
+      this.inputValue = ''
+    },
     focused() {
       this.$emit('focus')
     },

client/components/ui/ToggleSwitch.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div class="border rounded-full border-black-100 flex items-center cursor-pointer w-12 justify-start" :class="className" @click="clickToggle">
-      <span class="rounded-full border w-6 h-6 border-black-50 shadow transform transition-transform duration-100" :class="switchClassName"></span>
+    <div class="border rounded-full border-black-100 flex items-center cursor-pointer w-10 justify-start" :class="className" @click="clickToggle">
+      <span class="rounded-full border w-5 h-5 border-black-50 shadow transform transition-transform duration-100" :class="switchClassName"></span>
     </div>
   </div>
 </template>
@@ -30,12 +30,12 @@ export default {
       }
     },
     className() {
-      if (this.disabled) return 'bg-bg cursor-not-allowed'
+      if (this.disabled) return this.toggleValue ? `bg-${this.onColor} cursor-not-allowed` : `bg-${this.offColor} cursor-not-allowed`
       return this.toggleValue ? `bg-${this.onColor}` : `bg-${this.offColor}`
     },
     switchClassName() {
       var bgColor = this.disabled ? 'bg-gray-300' : 'bg-white'
-      return this.toggleValue ? 'translate-x-6 ' + bgColor : bgColor
+      return this.toggleValue ? 'translate-x-5 ' + bgColor : bgColor
     }
   },
   methods: {

client/components/ui/Tooltip.vue

@@ -20,6 +20,7 @@ export default {
   data() {
     return {
       tooltip: null,
+      tooltipId: null,
       isShowing: false
     }
   },
@@ -45,13 +46,14 @@ export default {
         'font-size': '0.75rem'
       }
       var size = this.$calculateTextSize(this.text, styles)
-      console.log('Text Size', size.width, size.height)
       return size.width
     },
     createTooltip() {
       if (!this.$refs.box) return
       var tooltip = document.createElement('div')
-      tooltip.className = 'absolute px-2 py-1 text-white pointer-events-none text-xs rounded shadow-lg max-w-xs'
+      this.tooltipId = String(Math.floor(Math.random() * 10000))
+      tooltip.id = this.tooltipId
+      tooltip.className = 'tooltip-wrapper absolute px-2 py-1 text-white pointer-events-none text-xs rounded shadow-lg max-w-xs'
       tooltip.style.zIndex = 100
       tooltip.style.backgroundColor = 'rgba(0,0,0,0.85)'
       tooltip.innerHTML = this.text
@@ -91,8 +93,15 @@ export default {
       if (this.disabled) return
       if (!this.tooltip) {
         this.createTooltip()
+        if (!this.tooltip) return
+      }
+      if (!this.$refs.box) return // Ensure element is not destroyed
+      try {
+        document.body.appendChild(this.tooltip)
+        this.setTooltipPosition(this.tooltip)
+      } catch (error) {
+        console.error(error)
       }
-      document.body.appendChild(this.tooltip)
       this.isShowing = true
     },
     hideTooltip() {

client/components/widgets/CloseButton.vue

@@ -0,0 +1,33 @@
+<template>
+  <button class="bg-error text-white px-2 py-1 shadow-md" @click="$emit('click', $event)">Cancel</button>
+</template>
+
+<script>
+export default {
+  data() {
+    return {}
+  },
+  computed: {},
+  methods: {},
+  mounted() {}
+}
+</script>
+
+<style>
+.Vue-Toastification__close-button.cancel-scan-btn {
+  background-color: rgb(255, 82, 82);
+  color: white;
+  font-size: 0.9rem;
+  opacity: 1;
+  padding: 0px 10px;
+  border-radius: 6px;
+  font-weight: normal;
+  font-family: 'Open Sans';
+  margin-left: 10px;
+  opacity: 0.3;
+}
+.Vue-Toastification__close-button.cancel-scan-btn:hover {
+  background-color: rgb(235, 65, 65);
+  opacity: 1;
+}
+</style>

client/components/widgets/LibraryIcon.vue

@@ -0,0 +1,21 @@
+<template>
+  <div class="h-4 w-4">
+    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4" />
+    </svg>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    icon: String
+  },
+  data() {
+    return {}
+  },
+  computed: {},
+  methods: {},
+  mounted() {}
+}
+</script>

client/layouts/default.vue

@@ -5,12 +5,16 @@
     <Nuxt />
 
     <app-stream-container ref="streamContainer" />
+    <modals-libraries-modal />
     <modals-edit-modal />
-    <widgets-scan-alert />
+    <app-reader />
+    <!-- <widgets-scan-alert /> -->
   </div>
 </template>
 
 <script>
+import CloseButton from '@/components/widgets/CloseButton'
+
 export default {
   middleware: 'authenticated',
   data() {
@@ -64,6 +68,14 @@ export default {
       if (payload.serverSettings) {
         this.$store.commit('setServerSettings', payload.serverSettings)
       }
+      if (payload.librariesScanning) {
+        payload.librariesScanning.forEach((libraryScan) => {
+          this.scanStart(libraryScan)
+        })
+      }
+      if (payload.backups && payload.backups.length) {
+        this.$store.commit('setBackups', payload.backups)
+      }
     },
     streamOpen(stream) {
       if (this.$refs.streamContainer) this.$refs.streamContainer.streamOpen(stream)
@@ -89,43 +101,61 @@ export default {
     audiobookRemoved(audiobook) {
       if (this.$route.name.startsWith('audiobook')) {
         if (this.$route.params.id === audiobook.id) {
-          this.$router.replace('/library')
+          this.$router.replace(`/library/${this.$store.state.libraries.currentLibraryId}`)
         }
       }
       this.$store.commit('audiobooks/remove', audiobook)
     },
-    scanComplete({ scanType, results }) {
-      if (scanType === 'covers') {
-        this.$store.commit('setIsScanningCovers', false)
-        if (results) {
-          this.$toast.success(`Scan Finished\nUpdated ${results.found} covers`)
-        }
-      } else {
-        this.$store.commit('setIsScanning', false)
-        if (results) {
-          var scanResultMsgs = []
-          if (results.added) scanResultMsgs.push(`${results.added} added`)
-          if (results.updated) scanResultMsgs.push(`${results.updated} updated`)
-          if (results.removed) scanResultMsgs.push(`${results.removed} removed`)
-          if (results.missing) scanResultMsgs.push(`${results.missing} missing`)
-          if (!scanResultMsgs.length) this.$toast.success('Scan Finished\nEverything was up to date')
-          else this.$toast.success('Scan Finished\n' + scanResultMsgs.join('\n'))
-        }
-      }
+    libraryAdded(library) {
+      this.$store.commit('libraries/addUpdate', library)
     },
-    scanStart(scanType) {
-      if (scanType === 'covers') {
-        this.$store.commit('setIsScanningCovers', true)
-      } else {
-        this.$store.commit('setIsScanning', true)
-      }
+    libraryUpdated(library) {
+      this.$store.commit('libraries/addUpdate', library)
     },
-    scanProgress({ scanType, progress }) {
-      if (scanType === 'covers') {
-        this.$store.commit('setCoverScanProgress', progress)
+    libraryRemoved(library) {
+      this.$store.commit('libraries/remove', library)
+    },
+    scanComplete(data) {
+      var message = `Scan "${data.name}" complete!`
+      if (data.results) {
+        var scanResultMsgs = []
+        var results = data.results
+        if (results.added) scanResultMsgs.push(`${results.added} added`)
+        if (results.updated) scanResultMsgs.push(`${results.updated} updated`)
+        if (results.removed) scanResultMsgs.push(`${results.removed} removed`)
+        if (results.missing) scanResultMsgs.push(`${results.missing} missing`)
+        if (!scanResultMsgs.length) message += '\nEverything was up to date'
+        else message += '\n' + scanResultMsgs.join('\n')
       } else {
-        this.$store.commit('setScanProgress', progress)
+        message = `Scan "${data.name}" was canceled`
       }
+
+      var existingScan = this.$store.getters['scanners/getLibraryScan'](data.id)
+      if (existingScan && !isNaN(existingScan.toastId)) {
+        this.$toast.update(existingScan.toastId, { content: message, options: { timeout: 5000, type: 'success', closeButton: false, position: 'bottom-center', onClose: () => null } }, true)
+      } else {
+        this.$toast.success(message, { timeout: 5000, position: 'bottom-center' })
+      }
+
+      this.$store.commit('scanners/remove', data)
+    },
+    onScanToastCancel(id) {
+      this.$root.socket.emit('cancel_scan', id)
+    },
+    scanStart(data) {
+      data.toastId = this.$toast(`Scanning "${data.name}"...`, { timeout: false, type: 'info', draggable: false, closeOnClick: false, closeButton: CloseButton, closeButtonClassName: 'cancel-scan-btn', showCloseButtonOnHover: false, position: 'bottom-center', onClose: () => this.onScanToastCancel(data.id) })
+      this.$store.commit('scanners/addUpdate', data)
+    },
+    scanProgress(data) {
+      var existingScan = this.$store.getters['scanners/getLibraryScan'](data.id)
+      if (existingScan && !isNaN(existingScan.toastId)) {
+        data.toastId = existingScan.toastId
+        this.$toast.update(existingScan.toastId, { content: `Scanning "${existingScan.name}"... ${data.progress.progress || 0}%`, options: { timeout: false } }, true)
+      } else {
+        data.toastId = this.$toast(`Scanning "${data.name}"...`, { timeout: false, type: 'info', draggable: false, closeOnClick: false, closeButton: CloseButton, closeButtonClassName: 'cancel-scan-btn', showCloseButtonOnHover: false, position: 'bottom-center', onClose: () => this.onScanToastCancel(data.id) })
+      }
+
+      this.$store.commit('scanners/addUpdate', data)
     },
     userUpdated(user) {
       if (this.$store.state.user.user.id === user.id) {
@@ -133,10 +163,20 @@ export default {
         this.$store.commit('user/setSettings', user.settings)
       }
     },
+    userOnline(user) {
+      this.$store.commit('users/updateUser', user)
+    },
+    userOffline(user) {
+      this.$store.commit('users/removeUser', user)
+    },
+    userStreamUpdate(user) {
+      this.$store.commit('users/updateUser', user)
+    },
     downloadToastClick(download) {
       if (!download || !download.audiobookId) {
         return console.error('Invalid download object', download)
       }
+
       var audiobook = this.$store.getters['audiobooks/getAudiobook'](download.audiobookId)
       if (!audiobook) {
         return console.error('Audiobook not found for download', download)
@@ -193,6 +233,10 @@ export default {
     logEvtReceived(payload) {
       this.$store.commit('logs/logEvt', payload)
     },
+    backupApplied() {
+      // Force refresh
+      location.reload()
+    },
     initializeSocket() {
       this.socket = this.$nuxtSocket({
         name: process.env.NODE_ENV === 'development' ? 'dev' : 'prod',
@@ -226,8 +270,16 @@ export default {
       this.socket.on('audiobook_added', this.audiobookAdded)
       this.socket.on('audiobook_removed', this.audiobookRemoved)
 
+      // Library Listeners
+      this.socket.on('library_updated', this.libraryUpdated)
+      this.socket.on('library_added', this.libraryAdded)
+      this.socket.on('library_removed', this.libraryRemoved)
+
       // User Listeners
       this.socket.on('user_updated', this.userUpdated)
+      this.socket.on('user_online', this.userOnline)
+      this.socket.on('user_offline', this.userOffline)
+      this.socket.on('user_stream_update', this.userStreamUpdate)
 
       // Scan Listeners
       this.socket.on('scan_start', this.scanStart)
@@ -242,6 +294,8 @@ export default {
       this.socket.on('download_expired', this.downloadExpired)
 
       this.socket.on('log', this.logEvtReceived)
+
+      this.socket.on('backup_applied', this.backupApplied)
     },
     showUpdateToast(versionData) {
       var ignoreVersion = localStorage.getItem('ignoreVersion')
@@ -270,6 +324,14 @@ export default {
   },
   mounted() {
     this.initializeSocket()
+    this.$store.dispatch('libraries/load')
+
+    // If experimental features set in local storage
+    var experimentalFeaturesSaved = localStorage.getItem('experimental')
+    if (experimentalFeaturesSaved === '1') {
+      this.$store.commit('setExperimentalFeatures', true)
+    }
+
     this.$store
       .dispatch('checkForUpdate')
       .then((res) => {

client/nuxt.config.js

@@ -35,7 +35,7 @@ module.exports = {
     ],
     link: [
       { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
-      { rel: 'stylesheet', href: 'https://fonts.googleapis.com/css2?family=Fira+Mono&family=Ubuntu+Mono&family=Open+Sans:wght@400;600&family=Gentium+Book+Basic' },
+      { rel: 'stylesheet', href: 'https://fonts.googleapis.com/css2?family=Fira+Mono&family=Ubuntu+Mono&family=Gentium+Book+Basic&&family=Source+Sans+Pro:wght@300;400;600' },
       { rel: 'stylesheet', href: 'https://fonts.googleapis.com/icon?family=Material+Icons' }
     ]
   },
@@ -75,7 +75,10 @@ module.exports = {
 
   proxy: {
     '/dev/': { target: 'http://localhost:3333', pathRewrite: { '^/dev/': '' } },
-    '/local/': { target: process.env.NODE_ENV !== 'production' ? 'http://localhost:3333' : '/', pathRewrite: { '^/local/': '' } },
+    '/local/': { target: process.env.NODE_ENV !== 'production' ? 'http://localhost:3333' : '/' },
+    '/lib/': { target: process.env.NODE_ENV !== 'production' ? 'http://localhost:3333' : '/' },
+    '/ebook/': { target: process.env.NODE_ENV !== 'production' ? 'http://localhost:3333' : '/' },
+    '/s/': { target: process.env.NODE_ENV !== 'production' ? 'http://localhost:3333' : '/' },
     '/metadata/': { target: process.env.NODE_ENV !== 'production' ? 'http://localhost:3333' : '/' }
   },
 

client/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.2.4",
+  "version": "1.4.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2532,6 +2532,14 @@
       "resolved": "https://registry.npmjs.org/@types/less/-/less-3.0.2.tgz",
       "integrity": "sha512-62vfe65cMSzYaWmpmhqCMMNl0khen89w57mByPi1OseGfcV/LV03fO8YVrNj7rFQsRWNJo650WWyh6m7p8vZmA=="
     },
+    "@types/localforage": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/localforage/-/localforage-0.0.34.tgz",
+      "integrity": "sha1-XjHDLdh5HsS5/z70fJy1Wy0NlDg=",
+      "requires": {
+        "localforage": "*"
+      }
+    },
     "@types/mime": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -4978,6 +4986,20 @@
       "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
       "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk="
     },
+    "d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "requires": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "date-fns": {
+      "version": "2.25.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.25.0.tgz",
+      "integrity": "sha512-ovYRFnTrbGPD4nqaEqescPEv1mNwvt+UTqI3Ay9SzNtey9NZnYu6E2qCcBBgJ6/2VF1zGGygpyTDITqpQQ5e+w=="
+    },
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -5373,6 +5395,22 @@
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
     },
+    "epubjs": {
+      "version": "0.3.88",
+      "resolved": "https://registry.npmjs.org/epubjs/-/epubjs-0.3.88.tgz",
+      "integrity": "sha512-VRumULpUELYmYwzypyfbDwoSIqDp2LXOXCtY3o55o3YDW5Zm32UjtZuX/xaWFGqyZORNNMWWQ8VlMaY1djnDYg==",
+      "requires": {
+        "@types/localforage": "0.0.34",
+        "core-js": "^3.6.5",
+        "event-emitter": "^0.3.5",
+        "jszip": "^3.4.0",
+        "localforage": "^1.7.3",
+        "lodash": "^4.17.15",
+        "marks-pane": "^1.0.9",
+        "path-webpack": "0.0.3",
+        "xmldom": "^0.3.0"
+      }
+    },
     "errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -5431,6 +5469,35 @@
         "is-symbol": "^1.0.2"
       }
     },
+    "es5-ext": {
+      "version": "0.10.53",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+      "requires": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.3",
+        "next-tick": "~1.0.0"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "requires": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -5490,6 +5557,15 @@
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
     "eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -5580,6 +5656,21 @@
         }
       }
     },
+    "ext": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
+      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
+      "requires": {
+        "type": "^2.5.0"
+      },
+      "dependencies": {
+        "type": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
+          "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw=="
+        }
+      }
+    },
     "extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
@@ -6583,6 +6674,11 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
       "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
     },
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+    },
     "import-cwd": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -7105,6 +7201,27 @@
         "universalify": "^2.0.0"
       }
     },
+    "jszip": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz",
+      "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
+      "requires": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "set-immediate-shim": "~1.0.1"
+      },
+      "dependencies": {
+        "lie": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+          "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+          "requires": {
+            "immediate": "~3.0.5"
+          }
+        }
+      }
+    },
     "keygrip": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
@@ -7263,6 +7380,14 @@
         "launch-editor": "^2.2.1"
       }
     },
+    "lie": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+      "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+      "requires": {
+        "immediate": "~3.0.5"
+      }
+    },
     "lilconfig": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.3.tgz",
@@ -7300,6 +7425,14 @@
         }
       }
     },
+    "localforage": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
+      "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
+      "requires": {
+        "lie": "3.1.1"
+      }
+    },
     "locate-path": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -7412,6 +7545,11 @@
         "object-visit": "^1.0.0"
       }
     },
+    "marks-pane": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/marks-pane/-/marks-pane-1.0.9.tgz",
+      "integrity": "sha512-Ahs4oeG90tbdPWwAJkAAoHg2lRR8lAs9mZXETNPO9hYg3AkjUJBKi1NQ4aaIQZVGrig7c/3NUV1jANl8rFTeMg=="
+    },
     "md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -7713,6 +7851,11 @@
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
+    },
     "no-case": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
@@ -8334,6 +8477,11 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
     },
+    "path-webpack": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/path-webpack/-/path-webpack-0.0.3.tgz",
+      "integrity": "sha1-/23sdJ7sWpRgXATV9j/FVgegOhY="
+    },
     "pbkdf2": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
@@ -11708,6 +11856,11 @@
       "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz",
       "integrity": "sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0="
     },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
+    },
     "set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
@@ -12814,6 +12967,11 @@
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
     },
+    "type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
+    },
     "type-fest": {
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
@@ -14145,6 +14303,11 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
       "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="
     },
+    "xmldom": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz",
+      "integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",

client/package.json

@@ -1,10 +1,11 @@
 {
   "name": "audiobookshelf-client",
-  "version": "1.3.1",
+  "version": "1.4.7",
   "description": "Audiobook manager and player",
   "main": "index.js",
   "scripts": {
     "dev": "nuxt",
+    "dev2": "nuxt --hostname localhost --port 1337",
     "build": "nuxt build",
     "start": "nuxt start",
     "generate": "nuxt generate"
@@ -15,6 +16,8 @@
     "@nuxtjs/axios": "^5.13.6",
     "@nuxtjs/proxy": "^2.1.0",
     "core-js": "^3.16.0",
+    "date-fns": "^2.25.0",
+    "epubjs": "^0.3.88",
     "hls.js": "^1.0.7",
     "nuxt": "^2.15.7",
     "nuxt-socket-io": "^1.1.18",

client/pages/account.vue

@@ -23,7 +23,7 @@
           <div class="flex items-center py-2">
             <p v-if="isRoot" class="text-error py-2 text-xs">* Root user is the only user that can have an empty password</p>
             <div class="flex-grow" />
-            <ui-btn type="submit" :loading="changingPassword" color="success">Submit</ui-btn>
+            <ui-btn v-show="(password && newPassword && confirmPassword) || isRoot" type="submit" :loading="changingPassword" color="success">Submit</ui-btn>
           </div>
         </form>
       </div>

client/pages/audiobook/_id/edit.vue

@@ -224,41 +224,3 @@ export default {
   mounted() {}
 }
 </script>
-
-<style>
-.flip-list-move {
-  transition: transform 0.5s;
-}
-.no-move {
-  transition: transform 0s;
-}
-.ghost {
-  opacity: 0.5;
-  background-color: rgba(255, 255, 255, 0.25);
-}
-.list-group {
-  min-height: 30px;
-}
-.list-group-item:not(.exclude) {
-  cursor: n-resize;
-}
-.list-group-item.exclude {
-  cursor: not-allowed;
-}
-.list-group-item:not(.ghost):not(.exclude):hover {
-  background-color: rgba(0, 0, 0, 0.1);
-}
-.list-group-item:nth-child(even):not(.ghost):not(.exclude) {
-  background-color: rgba(0, 0, 0, 0.25);
-}
-.list-group-item:nth-child(even):not(.ghost):not(.exclude):hover {
-  background-color: rgba(0, 0, 0, 0.1);
-}
-
-.list-group-item.exclude:not(.ghost) {
-  background-color: rgba(255, 0, 0, 0.25);
-}
-.list-group-item.exclude:not(.ghost):hover {
-  background-color: rgba(223, 0, 0, 0.25);
-}
-</style>

client/pages/audiobook/_id/index.vue

@@ -10,20 +10,82 @@
         </div>
         <div class="flex-grow px-10">
           <div class="flex">
-            <div class="mb-2">
-              <h1 class="text-2xl font-book leading-7">{{ title }}</h1>
-              <h3 v-if="series" class="font-book text-gray-300 text-lg leading-7">{{ seriesText }}</h3>
-              <div class="w-min">
+            <div class="mb-4">
+              <div class="flex items-end">
+                <h1 class="text-3xl font-sans">
+                  {{ title }}<span v-if="isDeveloperMode"> ({{ audiobook.ino }})</span>
+                </h1>
+                <p v-if="subtitle" class="ml-4 text-gray-400 text-2xl">{{ subtitle }}</p>
+              </div>
+
+              <p class="mb-2 mt-0.5 text-gray-100 text-xl">
+                by <nuxt-link v-if="author" :to="`/library/${libraryId}/bookshelf?filter=authors.${$encode(author)}`" class="hover:underline">{{ author }}</nuxt-link
+                ><span v-else>Unknown</span>
+              </p>
+              <nuxt-link v-if="series" :to="`/library/${libraryId}/bookshelf/series?series=${$encode(series)}`" class="hover:underline font-sans text-gray-300 text-lg leading-7 mb-4"> {{ seriesText }}</nuxt-link>
+
+              <!-- <div class="w-min">
                 <ui-tooltip :text="authorTooltipText" direction="bottom">
-                  <span class="text-sm text-gray-100 leading-7 whitespace-nowrap">by {{ author }}</span>
+                  <span class="text-base text-gray-100 leading-8 whitespace-nowrap"><span class="text-white text-opacity-60">By:</span> {{ author }}</span>
                 </ui-tooltip>
+              </div> -->
+              <div v-if="narrator" class="flex py-0.5">
+                <div class="w-32">
+                  <span class="text-white text-opacity-60 uppercase text-sm">Narrated By</span>
+                </div>
+                <div>
+                  <nuxt-link :to="`/library/${libraryId}/bookshelf?filter=narrators.${$encode(narrator)}`" class="hover:underline">{{ narrator }}</nuxt-link>
+                </div>
+              </div>
+              <div v-if="publishYear" class="flex py-0.5">
+                <div class="w-32">
+                  <span class="text-white text-opacity-60 uppercase text-sm">Publish Year</span>
+                </div>
+                <div>
+                  {{ publishYear }}
+                </div>
+              </div>
+              <div class="flex py-0.5" v-if="genres.length">
+                <div class="w-32">
+                  <span class="text-white text-opacity-60 uppercase text-sm">Genres</span>
+                </div>
+                <div>
+                  <template v-for="(genre, index) in genres">
+                    <nuxt-link :key="genre" :to="`/library/${libraryId}/bookshelf?filter=genres.${$encode(genre)}`" class="hover:underline">{{ genre }}</nuxt-link
+                    ><span :key="index" v-if="index < genres.length - 1">,&nbsp;</span>
+                  </template>
+                </div>
+              </div>
+              <div v-if="tracks.length" class="flex py-0.5">
+                <div class="w-32">
+                  <span class="text-white text-opacity-60 uppercase text-sm">Duration</span>
+                </div>
+                <div>
+                  {{ durationPretty }}
+                </div>
+              </div>
+              <div v-if="tracks.length" class="flex py-0.5">
+                <div class="w-32">
+                  <span class="text-white text-opacity-60 uppercase text-sm">Size</span>
+                </div>
+                <div>
+                  {{ sizePretty }}
+                </div>
               </div>
             </div>
             <div class="flex-grow" />
           </div>
-          <p class="text-gray-300 text-sm my-1">
-            {{ durationPretty }}<span class="px-4">{{ sizePretty }}</span>
-          </p>
+
+          <!-- Alerts -->
+          <div v-show="showExperimentalReadAlert" class="bg-error p-4 rounded-xl flex items-center">
+            <span class="material-icons text-2xl">warning_amber</span>
+            <p class="ml-4">Book has no audio tracks but has valid ebook files. The e-reader is experimental and can be turned on in config.</p>
+          </div>
+          <div v-show="showEpubAlert" class="bg-error p-4 rounded-xl flex items-center mt-2">
+            <span class="material-icons text-2xl">warning_amber</span>
+            <p class="ml-4">Book has valid ebook files, but the experimental e-reader currently only supports epub files.</p>
+          </div>
+
           <div v-if="progressPercent > 0 && progressPercent < 1" class="px-4 py-2 mt-4 bg-primary text-sm font-semibold rounded-md text-gray-200 relative max-w-max" :class="resettingProgress ? 'opacity-25' : ''">
             <p class="leading-6">Your Progress: {{ Math.round(progressPercent * 100) }}%</p>
             <p class="text-gray-400 text-xs">{{ $elapsedPretty(userTimeRemaining) }} remaining</p>
@@ -33,19 +95,19 @@
           </div>
 
           <div class="flex items-center pt-4">
-            <ui-btn v-if="!isMissing" :disabled="streaming" color="success" :padding-x="4" small class="flex items-center h-9 mr-2" @click="startStream">
+            <ui-btn v-if="showPlayButton" :disabled="streaming" color="success" :padding-x="4" small class="flex items-center h-9 mr-2" @click="startStream">
               <span v-show="!streaming" class="material-icons -ml-2 pr-1 text-white">play_arrow</span>
               {{ streaming ? 'Streaming' : 'Play' }}
             </ui-btn>
-            <ui-btn v-else color="error" :padding-x="4" small class="flex items-center h-9 mr-2">
+            <ui-btn v-else-if="isMissing || isIncomplete" color="error" :padding-x="4" small class="flex items-center h-9 mr-2">
               <span v-show="!streaming" class="material-icons -ml-2 pr-1 text-white">error</span>
-              Missing
+              {{ isMissing ? 'Missing' : 'Incomplete' }}
             </ui-btn>
 
-            <!-- <ui-btn v-if="ebooks.length" color="info" :padding-x="4" small class="flex items-center h-9 mr-2" @click="openEbook">
+            <ui-btn v-if="showExperimentalFeatures && (epubEbook || mobiEbook)" color="info" :padding-x="4" small class="flex items-center h-9 mr-2" @click="openEbook">
               <span class="material-icons -ml-2 pr-2 text-white">auto_stories</span>
               Read
-            </ui-btn> -->
+            </ui-btn>
 
             <ui-tooltip v-if="userCanUpdate" text="Edit" direction="top">
               <ui-icon-btn icon="edit" class="mx-0.5" @click="editClick" />
@@ -60,12 +122,10 @@
             </ui-tooltip>
 
             <ui-btn v-if="isDeveloperMode" class="mx-2" @click="openRssFeed">Open RSS Feed</ui-btn>
-
-            <div class="flex-grow" />
           </div>
 
-          <div class="my-4">
-            <p class="text-sm text-gray-100">{{ description }}</p>
+          <div class="my-4 max-w-2xl">
+            <p class="text-base text-gray-100">{{ description }}</p>
           </div>
 
           <div v-if="missingParts.length" class="bg-error border-red-800 shadow-md p-4">
@@ -84,16 +144,16 @@
             </div>
           </div>
 
-          <tables-tracks-table :tracks="tracks" :audiobook-id="audiobook.id" class="mt-6" />
+          <tables-tracks-table v-if="tracks.length" :tracks="tracks" :audiobook="audiobook" class="mt-6" />
 
           <tables-audio-files-table v-if="otherAudioFiles.length" :audiobook-id="audiobook.id" :files="otherAudioFiles" class="mt-6" />
 
-          <tables-other-files-table v-if="otherFiles.length" :audiobook-id="audiobook.id" :files="otherFiles" class="mt-6" />
+          <tables-other-files-table v-if="otherFiles.length" :audiobook="audiobook" :files="otherFiles" class="mt-6" />
         </div>
       </div>
-
-      <div id="area"></div>
     </div>
+
+    <!-- <app-reader v-if="showExperimentalFeatures" v-model="showReader" :url="epubUrl" /> -->
   </div>
 </template>
 
@@ -111,6 +171,7 @@ export default {
       console.error('No audiobook...', params.id)
       return redirect('/')
     }
+    store.commit('audiobooks/addUpdate', audiobook)
     return {
       audiobook
     }
@@ -134,6 +195,9 @@ export default {
     isDeveloperMode() {
       return this.$store.state.developerMode
     },
+    showExperimentalFeatures() {
+      return this.$store.state.showExperimentalFeatures
+    },
     missingPartChunks() {
       if (this.missingParts === 1) return this.missingParts[0]
       var chunks = []
@@ -168,18 +232,42 @@ export default {
     isMissing() {
       return this.audiobook.isMissing
     },
+    isIncomplete() {
+      return this.audiobook.isIncomplete
+    },
+    showPlayButton() {
+      return !this.isMissing && !this.isIncomplete && this.tracks.length
+    },
     missingParts() {
       return this.audiobook.missingParts || []
     },
     invalidParts() {
       return this.audiobook.invalidParts || []
     },
+    libraryId() {
+      return this.audiobook.libraryId
+    },
+    folderId() {
+      return this.audiobook.folderId
+    },
     audiobookId() {
       return this.audiobook.id
     },
     title() {
       return this.book.title || 'No Title'
     },
+    publishYear() {
+      return this.book.publishYear
+    },
+    narrator() {
+      return this.book.narrator
+    },
+    subtitle() {
+      return this.book.subtitle
+    },
+    genres() {
+      return this.book.genres || []
+    },
     author() {
       return this.book.author || 'Unknown'
     },
@@ -233,6 +321,21 @@ export default {
     ebooks() {
       return this.audiobook.ebooks
     },
+    showEpubAlert() {
+      return this.ebooks.length && !this.epubEbook && !this.tracks.length
+    },
+    showExperimentalReadAlert() {
+      return !this.tracks.length && this.ebooks.length && !this.showExperimentalFeatures
+    },
+    epubEbook() {
+      return this.ebooks.find((eb) => eb.ext === '.epub')
+    },
+    mobiEbook() {
+      return this.ebooks.find((eb) => eb.ext === '.mobi' || eb.ext === '.azw3')
+    },
+    userToken() {
+      return this.$store.getters['user/getToken']
+    },
     description() {
       return this.book.description || ''
     },
@@ -272,16 +375,7 @@ export default {
   },
   methods: {
     openEbook() {
-      var ebook = this.ebooks[0]
-      console.log('Ebook', ebook)
-      this.$axios
-        .$get(`/ebook/open/${this.audiobookId}/${ebook.ino}`)
-        .then(() => {
-          console.log('opened')
-        })
-        .catch((error) => {
-          console.error('failed', error)
-        })
+      this.$store.commit('showEReader', this.audiobook)
     },
     toggleRead() {
       var updatePayload = {
@@ -334,6 +428,7 @@ export default {
       this.$axios
         .$get(`/api/audiobook/${this.audiobookId}`)
         .then((audiobook) => {
+          console.log('Updated audiobook', audiobook)
           this.audiobook = audiobook
         })
         .catch((error) => {
@@ -362,6 +457,11 @@ export default {
   },
   mounted() {
     this.$store.commit('audiobooks/addListener', { id: 'audiobook', audiobookId: this.audiobookId, meth: this.audiobookUpdated })
+
+    // If a library has not yet been loaded, use this audiobooks library id as the current
+    if (!this.$store.state.audiobooks.loadedLibraryId && this.libraryId) {
+      this.$store.commit('libraries/setCurrentLibrary', this.libraryId)
+    }
   },
   beforeDestroy() {
     this.$store.commit('audiobooks/removeListener', 'audiobook')

client/pages/batch/index.vue

@@ -42,7 +42,7 @@
 
             <div class="flex mt-2 -mx-1">
               <div class="w-1/2 px-1">
-                <ui-text-input-with-label v-model="audiobook.book.narrarator" label="Narrarator" />
+                <ui-text-input-with-label v-model="audiobook.book.narrator" label="Narrator" />
               </div>
             </div>
           </div>
@@ -94,6 +94,9 @@ export default {
     },
     seriesItems() {
       return [...this.series, ...this.newSeriesItems]
+    },
+    currentLibraryId() {
+      return this.$store.state.libraries.currentLibraryId
     }
   },
   methods: {
@@ -130,7 +133,7 @@ export default {
           this.isProcessing = false
           if (data.updates) {
             this.$toast.success(`Successfully updated ${data.updates} audiobooks`)
-            this.$router.replace('/library')
+            this.$router.replace(`/library/${this.currentLibraryId}`)
           } else {
             this.$toast.warning('No updates were necessary')
           }

client/pages/config/index.vue

@@ -1,66 +1,61 @@
 <template>
   <div id="page-wrapper" class="page p-6 overflow-y-auto" :class="streamAudiobook ? 'streaming' : ''">
     <div class="w-full max-w-4xl mx-auto">
-      <div class="flex items-center mb-2">
-        <h1 class="text-2xl">Users</h1>
-        <div class="mx-2 w-7 h-7 flex items-center justify-center rounded-full cursor-pointer hover:bg-white hover:bg-opacity-10 text-center" @click="clickAddUser">
-          <span class="material-icons" style="font-size: 1.4rem">add</span>
+      <tables-users-table />
+      <!-- <div class="h-0.5 bg-primary bg-opacity-50 w-full" /> -->
+
+      <tables-libraries-table />
+      <!-- <div class="h-0.5 bg-primary bg-opacity-50 w-full" /> -->
+      <div class="bg-bg rounded-md shadow-lg border border-white border-opacity-5 p-4 mb-8">
+        <div class="flex items-center mb-2">
+          <h1 class="text-xl">Settings</h1>
+        </div>
+
+        <div class="flex items-center py-2">
+          <ui-toggle-switch v-model="newServerSettings.scannerParseSubtitle" small :disabled="updatingServerSettings" @input="updateScannerParseSubtitle" />
+          <ui-tooltip :text="parseSubtitleTooltip">
+            <p class="pl-4 text-lg">Scanner parse subtitles <span class="material-icons icon-text">info_outlined</span></p>
+          </ui-tooltip>
+        </div>
+
+        <div class="flex items-center py-2">
+          <ui-toggle-switch v-model="newServerSettings.scannerFindCovers" :disabled="updatingServerSettings" @input="updateScannerFindCovers" />
+          <ui-tooltip :text="scannerFindCoversTooltip">
+            <p class="pl-4 text-lg">Scanner find covers <span class="material-icons icon-text">info_outlined</span></p>
+          </ui-tooltip>
+        </div>
+
+        <div class="flex items-center py-2">
+          <ui-toggle-switch v-model="storeCoversInAudiobookDir" :disabled="updatingServerSettings" @input="updateCoverStorageDestination" />
+          <ui-tooltip :text="coverDestinationTooltip">
+            <p class="pl-4 text-lg">Store covers with audiobook <span class="material-icons icon-text">info_outlined</span></p>
+          </ui-tooltip>
         </div>
-        <!-- <ui-btn small :padding-x="4" class="h-8">Create User</ui-btn> -->
-      </div>
-      <div class="h-0.5 bg-primary bg-opacity-50 w-full" />
-      <div class="p-4 text-center">
-        <table id="accounts" class="mb-8">
-          <tr>
-            <th>Username</th>
-            <th>Account Type</th>
-            <th style="width: 200px">Created At</th>
-            <th style="width: 100px"></th>
-          </tr>
-          <tr v-for="user in users" :key="user.id" :class="user.isActive ? '' : 'bg-error bg-opacity-20'">
-            <td>
-              {{ user.username }} <span class="text-xs text-gray-400 italic pl-4">({{ user.id }})</span>
-            </td>
-            <td>{{ user.type }}</td>
-            <td class="text-sm font-mono">
-              {{ new Date(user.createdAt).toISOString() }}
-            </td>
-            <td>
-              <div class="w-full flex justify-center">
-                <span class="material-icons hover:text-gray-400 cursor-pointer text-base pr-2" @click="editUser(user)">edit</span>
-                <span v-show="user.type !== 'root'" class="material-icons text-base hover:text-error cursor-pointer" @click="deleteUserClick(user)">delete</span>
-              </div>
-            </td>
-          </tr>
-        </table>
       </div>
 
       <div class="h-0.5 bg-primary bg-opacity-50 w-full" />
 
-      <div class="py-4 mb-4">
-        <p class="text-2xl">Scanner</p>
-        <div class="flex items-start py-2">
-          <div class="py-2">
-            <div class="flex items-center">
-              <ui-toggle-switch v-model="newServerSettings.scannerParseSubtitle" @input="updateScannerParseSubtitle" />
-              <ui-tooltip :text="parseSubtitleTooltip">
-                <p class="pl-4 text-lg">Parse Subtitles <span class="material-icons icon-text">info_outlined</span></p>
-              </ui-tooltip>
-            </div>
-          </div>
-          <div class="flex-grow" />
-          <div class="w-40 flex flex-col">
-            <ui-btn color="success" class="mb-4" :loading="isScanning" :disabled="isScanningCovers" @click="scan">Scan</ui-btn>
-
-            <div class="w-full mb-4">
-              <ui-tooltip direction="bottom" text="Only scans audiobooks without a cover. Covers will be applied if a close match is found." class="w-full">
-                <ui-btn color="primary" class="w-full" small :padding-x="2" :loading="isScanningCovers" :disabled="isScanning" @click="scanCovers">Scan for Covers</ui-btn>
-              </ui-tooltip>
-            </div>
-
-            <!-- <ui-btn color="primary" small @click="saveMetadataFiles">Save Metadata</ui-btn> -->
-          </div>
+      <div class="bg-bg rounded-md shadow-lg border border-white border-opacity-5 p-4 mb-8">
+        <div class="flex items-center mb-2">
+          <h1 class="text-xl">Backups</h1>
         </div>
+
+        <p class="text-base mb-4 text-gray-300">Backups include users, user progress, book details, server settings and covers stored in <span class="font-mono text-gray-100">/metadata/books</span>. <br />Backups <strong>do not</strong> include any files stored in your library folders.</p>
+
+        <div class="flex items-center py-2">
+          <ui-toggle-switch v-model="dailyBackups" small :disabled="updatingServerSettings" @input="updateBackupsSettings" />
+          <ui-tooltip :text="dailyBackupsTooltip">
+            <p class="pl-4 text-lg">Run daily backups <span class="material-icons icon-text">info_outlined</span></p>
+          </ui-tooltip>
+        </div>
+
+        <div class="flex items-center py-2">
+          <ui-text-input type="number" v-model="backupsToKeep" no-spinner :disabled="updatingServerSettings" :padding-x="1" text-center class="w-10" @change="updateBackupsSettings" />
+
+          <p class="pl-4 text-lg">Number of backups to keep</p>
+        </div>
+
+        <tables-backups-table />
       </div>
 
       <div class="h-0.5 bg-primary bg-opacity-50 w-full" />
@@ -85,10 +80,28 @@
           </svg>
         </a>
       </div>
-    </div>
-    <div class="fixed bottom-0 left-0 w-10 h-10" @dblclick="setDeveloperMode"></div>
 
-    <modals-account-modal v-model="showAccountModal" :account="selectedAccount" />
+      <div class="h-0.5 bg-primary bg-opacity-30 w-full" />
+
+      <div class="py-12 mb-4 opacity-60 hover:opacity-100">
+        <div class="flex items-center">
+          <div>
+            <div class="flex items-center">
+              <ui-toggle-switch v-model="showExperimentalFeatures" />
+              <ui-tooltip :text="experimentalFeaturesTooltip">
+                <p class="pl-4 text-lg">Experimental Features <span class="material-icons icon-text">info_outlined</span></p>
+              </ui-tooltip>
+            </div>
+          </div>
+          <!-- <div class="flex-grow" /> -->
+          <div>
+            <a href="https://github.com/advplyr/audiobookshelf/discussions/75#discussion-3604812" target="_blank" class="text-blue-500 hover:text-blue-300 underline">Join the discussion</a>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="fixed bottom-0 left-0 w-10 h-10" @dblclick="setDeveloperMode"></div>
   </div>
 </template>
 
@@ -101,18 +114,19 @@ export default {
   },
   data() {
     return {
+      storeCoversInAudiobookDir: false,
       isResettingAudiobooks: false,
-      users: [],
-      selectedAccount: null,
-      showAccountModal: false,
-      isDeletingUser: false,
-      newServerSettings: {}
+      newServerSettings: {},
+      updatingServerSettings: false,
+      dailyBackups: true,
+      backupsToKeep: 2
     }
   },
   watch: {
     serverSettings(newVal, oldVal) {
       if (newVal && !oldVal) {
         this.newServerSettings = { ...this.serverSettings }
+        this.initServerSettings()
       }
     }
   },
@@ -120,6 +134,24 @@ export default {
     parseSubtitleTooltip() {
       return 'Extract subtitles from audiobook directory names.<br>Subtitle must be seperated by " - "<br>i.e. "Book Title - A Subtitle Here" has the subtitle "A Subtitle Here"'
     },
+    coverDestinationTooltip() {
+      return 'By default covers are stored in /metadata/books, enabling this setting will store covers inside your audiobooks directory. Only one file named "cover" will be kept.'
+    },
+    scannerFindCoversTooltip() {
+      return 'If your audiobook does not have an embedded cover or a cover image inside the folder, the scanner will attempt to find a cover.<br>Note: This will extend scan time'
+    },
+    saveMetadataTooltip() {
+      return 'This will write a "metadata.nfo" file in all of your audiobook directories.'
+    },
+    experimentalFeaturesTooltip() {
+      return 'Features in development that could use your feedback and help testing.'
+    },
+    dailyBackupsTooltip() {
+      return 'Runs at 1am every day (your server time). Saved in /metadata/backups.'
+    },
+    backupsToKeepTooltip() {
+      return ''
+    },
     serverSettings() {
       return this.$store.state.serverSettings
     },
@@ -131,23 +163,55 @@ export default {
     },
     isScanningCovers() {
       return this.$store.state.isScanningCovers
+    },
+    showExperimentalFeatures: {
+      get() {
+        return this.$store.state.showExperimentalFeatures
+      },
+      set(val) {
+        this.$store.commit('setExperimentalFeatures', val)
+      }
     }
   },
   methods: {
-    updateScannerParseSubtitle(val) {
-      var payload = {
-        scannerParseSubtitle: val
+    updateBackupsSettings() {
+      if (isNaN(this.backupsToKeep) || this.backupsToKeep <= 0 || this.backupsToKeep > 99) {
+        this.$toast.error('Invalid number of backups to keep')
+        return
       }
-      this.updateServerSettings(payload)
+      var updatePayload = {
+        backupSchedule: this.dailyBackups ? '0 1 * * *' : false,
+        backupsToKeep: Number(this.backupsToKeep)
+      }
+      this.updateServerSettings(updatePayload)
+    },
+    updateScannerFindCovers(val) {
+      this.updateServerSettings({
+        scannerFindCovers: !!val
+      })
+    },
+    updateCoverStorageDestination(val) {
+      this.newServerSettings.coverDestination = val ? this.$constants.CoverDestination.AUDIOBOOK : this.$constants.CoverDestination.METADATA
+      this.updateServerSettings({
+        coverDestination: this.newServerSettings.coverDestination
+      })
+    },
+    updateScannerParseSubtitle(val) {
+      this.updateServerSettings({
+        scannerParseSubtitle: !!val
+      })
     },
     updateServerSettings(payload) {
+      this.updatingServerSettings = true
       this.$store
         .dispatch('updateServerSettings', payload)
         .then((success) => {
           console.log('Updated Server Settings', success)
+          this.updatingServerSettings = false
         })
         .catch((error) => {
           console.error('Failed to update server settings', error)
+          this.updatingServerSettings = false
         })
     },
     setDeveloperMode() {
@@ -156,24 +220,18 @@ export default {
       this.$toast.info(`Developer Mode ${value ? 'Enabled' : 'Disabled'}`)
     },
     scan() {
-      this.$root.socket.emit('scan')
+      this.$root.socket.emit('scan', this.$store.state.libraries.currentLibraryId)
     },
-    scanCovers() {
-      this.$root.socket.emit('scan_covers')
+    saveMetadataComplete(result) {
+      this.savingMetadata = false
+      if (!result) return
+      this.$toast.success(`Metadata saved for ${result.success} audiobooks`)
     },
     saveMetadataFiles() {
+      this.savingMetadata = true
+      this.$root.socket.once('save_metadata_complete', this.saveMetadataComplete)
       this.$root.socket.emit('save_metadata')
     },
-    loadUsers() {
-      this.$axios
-        .$get('/api/users')
-        .then((users) => {
-          this.users = users
-        })
-        .catch((error) => {
-          console.error('Failed', error)
-        })
-    },
     resetAudiobooks() {
       if (confirm('WARNING! This action will remove all audiobooks from the database including any updates or matches you have made. This does not do anything to your actual files. Shall we continue?')) {
         this.isResettingAudiobooks = true
@@ -191,104 +249,19 @@ export default {
           })
       }
     },
-    clickAddUser() {
-      this.selectedAccount = null
-      this.showAccountModal = true
-    },
-    editUser(user) {
-      this.selectedAccount = user
-      this.showAccountModal = true
-    },
-    deleteUserClick(user) {
-      if (this.isDeletingUser) return
-      if (confirm(`Are you sure you want to permanently delete user "${user.username}"?`)) {
-        this.isDeletingUser = true
-        this.$axios
-          .$delete(`/api/user/${user.id}`)
-          .then((data) => {
-            this.isDeletingUser = false
-            if (data.error) {
-              this.$toast.error(data.error)
-            } else {
-              this.$toast.success('User deleted')
-            }
-          })
-          .catch((error) => {
-            console.error('Failed to delete user', error)
-            this.$toast.error('Failed to delete user')
-            this.isDeletingUser = false
-          })
-      }
-    },
-    addUpdateUser(user) {
-      if (!this.users) return
-      var index = this.users.findIndex((u) => u.id === user.id)
-      if (index >= 0) {
-        this.users.splice(index, 1, user)
-      } else {
-        this.users.push(user)
-      }
-    },
-    userRemoved(user) {
-      this.users = this.users.filter((u) => u.id !== user.id)
-    },
-    init(attempts = 0) {
-      if (!this.$root.socket) {
-        if (attempts > 10) {
-          return console.error('Failed to setup socket listeners')
-        }
-        setTimeout(() => {
-          this.init(++attempts)
-        }, 250)
-        return
-      }
-      this.$root.socket.on('user_added', this.addUpdateUser)
-      this.$root.socket.on('user_updated', this.addUpdateUser)
-      this.$root.socket.on('user_removed', this.userRemoved)
-
+    init() {
       this.newServerSettings = this.serverSettings ? { ...this.serverSettings } : {}
+      this.initServerSettings()
+    },
+    initServerSettings() {
+      this.storeCoversInAudiobookDir = this.newServerSettings.coverDestination === this.$constants.CoverDestination.AUDIOBOOK
+      this.storeCoversInAudiobookDir = this.newServerSettings.coverDestination === this.$constants.CoverDestination.AUDIOBOOK
+      this.backupsToKeep = this.newServerSettings.backupsToKeep || 2
+      this.dailyBackups = !!this.newServerSettings.backupSchedule
     }
   },
   mounted() {
-    this.loadUsers()
     this.init()
-  },
-  beforeDestroy() {
-    if (this.$root.socket) {
-      this.$root.socket.off('user_added', this.newUserAdded)
-      this.$root.socket.off('user_updated', this.userUpdated)
-    }
   }
 }
 </script>
-
-<style>
-#accounts {
-  table-layout: fixed;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#accounts td,
-#accounts th {
-  border: 1px solid #2e2e2e;
-  padding: 8px 8px;
-  text-align: left;
-}
-
-#accounts tr:nth-child(even) {
-  background-color: #3a3a3a;
-}
-
-#accounts tr:hover {
-  background-color: #444;
-}
-
-#accounts th {
-  font-size: 0.8rem;
-  font-weight: 600;
-  padding-top: 5px;
-  padding-bottom: 5px;
-  background-color: #333;
-}
-</style>

client/pages/config/log.vue

@@ -4,7 +4,9 @@
       <div class="mb-4 flex items-center justify-between">
         <p class="text-2xl">Logger</p>
 
-        <ui-dropdown v-model="newServerSettings.logLevel" label="Server Log Level" :items="logLevelItems" @input="logLevelUpdated" />
+        <div class="w-44">
+          <ui-dropdown v-model="newServerSettings.logLevel" label="Server Log Level" :items="logLevelItems" @input="logLevelUpdated" />
+        </div>
       </div>
 
       <div class="relative">

client/pages/index.vue

@@ -20,9 +20,11 @@
 
 <script>
 export default {
-  // asyncData({ redirect }) {
-  //   redirect('/library')
-  // },
+  asyncData({ redirect, store }) {
+    var currentLibraryId = store.state.libraries.currentLibraryId
+    console.log('Redir', currentLibraryId)
+    redirect(`/library/${currentLibraryId}`)
+  },
   data() {
     return {}
   },

client/pages/library/_library/bookshelf/_id.vue

@@ -12,7 +12,13 @@
 
 <script>
 export default {
-  async asyncData({ params, query, store, app }) {
+  async asyncData({ params, query, store, app, redirect }) {
+    var libraryId = params.library
+    var library = await store.dispatch('libraries/fetch', libraryId)
+    if (!library) {
+      return redirect('/oops?message=Library not found')
+    }
+
     if (query.filter) {
       store.dispatch('user/updateUserSettings', { filterBy: query.filter })
     }
@@ -20,7 +26,7 @@ export default {
     var searchQuery = null
     if (params.id === 'search' && query.query) {
       searchQuery = query.query
-      searchResults = await app.$axios.$get(`/api/audiobooks?q=${query.query}`).catch((error) => {
+      searchResults = await app.$axios.$get(`/api/library/${libraryId}/audiobooks?q=${query.query}`).catch((error) => {
         console.error('Search error', error)
         return []
       })

client/pages/library/_library/index.vue

@@ -0,0 +1,37 @@
+<template>
+  <div class="page" :class="streamAudiobook ? 'streaming' : ''">
+    <div class="flex h-full">
+      <app-side-rail />
+      <div class="flex-grow">
+        <app-book-shelf-toolbar is-home />
+        <app-book-shelf-categorized />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  async asyncData({ store, params, redirect }) {
+    var libraryId = params.library
+    var library = await store.dispatch('libraries/fetch', libraryId)
+    if (!library) {
+      return redirect(`/oops?message=Library "${libraryId}" not found`)
+    }
+    return {
+      library
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    streamAudiobook() {
+      return this.$store.state.streamAudiobook
+    }
+  },
+  methods: {},
+  mounted() {},
+  beforeDestroy() {}
+}
+</script>

client/pages/login.vue

@@ -37,7 +37,7 @@ export default {
         if (this.$route.query.redirect) {
           this.$router.replace(this.$route.query.redirect)
         } else {
-          this.$router.replace('/')
+          this.$router.replace(`/library/${this.$store.state.libraries.currentLibraryId}`)
         }
       }
     }

client/pages/oops.vue

@@ -0,0 +1,23 @@
+<template>
+  <div class="w-screen h-screen overflow-hidden page">
+    <div class="flex h-1/3 items-center justify-center">
+      <h1 class="text-2xl">Oops... {{ message }}</h1>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  asyncData({ query }) {
+    return {
+      message: query.message || ''
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {},
+  methods: {},
+  mounted() {}
+}
+</script>

client/pages/upload/index.vue

@@ -4,6 +4,15 @@
       <article class="max-h-full overflow-y-auto relative flex flex-col rounded-md" @drop="drop" @dragover="dragover" @dragleave="dragleave" @dragenter="dragenter">
         <h1 class="text-xl font-book px-8 pt-4 pb-2">Audiobook Uploader</h1>
 
+        <div class="flex my-2 px-6">
+          <div class="w-1/3 px-2">
+            <!-- <ui-text-input-with-label v-model="title" label="Title" /> -->
+            <ui-dropdown v-model="selectedLibraryId" :items="libraryItems" label="Library" @input="libraryChanged" />
+          </div>
+          <div class="w-2/3 px-2">
+            <ui-dropdown v-model="selectedFolderId" :items="folderItems" :disabled="!selectedLibraryId" label="Folder" />
+          </div>
+        </div>
         <div class="flex my-2 px-6">
           <div class="w-1/2 px-2">
             <ui-text-input-with-label v-model="title" label="Title" />
@@ -31,7 +40,7 @@
 
             <input ref="fileInput" id="hidden-input" type="file" multiple :accept="inputAccept" class="hidden" @change="inputChanged" />
             <ui-btn @click="clickSelectAudioFiles">Select files</ui-btn>
-            <p class="text-xs text-gray-300 absolute bottom-3 right-3">{{ inputAccept.join(', ') }}</p>
+            <p class="text-xs text-gray-300 absolute bottom-3 right-3">{{ inputAccept }}</p>
           </header>
         </section>
         <section v-else class="h-full overflow-auto px-8 pb-8 w-full flex flex-col">
@@ -120,14 +129,16 @@ export default {
       title: null,
       author: null,
       series: null,
-      acceptedAudioFormats: ['.mp3', '.m4b', '.m4a'],
-      acceptedImageFormats: ['image/*'],
-      inputAccept: ['image/*, .mp3, .m4b, .m4a'],
+      acceptedAudioFormats: ['.mp3', '.m4b', '.m4a', '.flac', '.opus', '.mp4'],
+      acceptedImageFormats: ['.png', '.jpg', '.jpeg', '.webp'],
+      inputAccept: '.png, .jpg, .jpeg, .webp, .mp3, .m4b, .m4a, .flac, .opus, .mp4',
       isDragOver: false,
       showUploader: true,
       validAudioFiles: [],
       validImageFiles: [],
-      invalidFiles: []
+      invalidFiles: [],
+      selectedLibraryId: null,
+      selectedFolderId: null
     }
   },
   computed: {
@@ -140,13 +151,55 @@ export default {
     directory() {
       if (!this.author || !this.title) return ''
       if (this.series) {
-        return Path.join('/audiobooks', this.author, this.series, this.title)
+        return Path.join(this.author, this.series, this.title)
       } else {
-        return Path.join('/audiobooks', this.author, this.title)
+        return Path.join(this.author, this.title)
       }
+    },
+    libraries() {
+      return this.$store.state.libraries.libraries
+    },
+    libraryItems() {
+      return this.libraries.map((lib) => {
+        return {
+          value: lib.id,
+          text: lib.name
+        }
+      })
+    },
+    selectedLibrary() {
+      return this.libraries.find((lib) => lib.id === this.selectedLibraryId)
+    },
+    selectedFolder() {
+      if (!this.selectedLibrary) return null
+      return this.selectedLibrary.folders.find((fold) => fold.id === this.selectedFolderId)
+    },
+    folderItems() {
+      if (!this.selectedLibrary) return []
+      return this.selectedLibrary.folders.map((fold) => {
+        return {
+          value: fold.id,
+          text: fold.fullPath
+        }
+      })
     }
   },
   methods: {
+    libraryChanged() {
+      if (!this.selectedLibrary && this.selectedFolderId) {
+        this.selectedFolderId = null
+      } else if (this.selectedFolderId) {
+        if (!this.selectedLibrary.folders.find((fold) => fold.id === this.selectedFolderId)) {
+          this.selectedFolderId = null
+        }
+      }
+      this.setDefaultFolder()
+    },
+    setDefaultFolder() {
+      if (!this.selectedFolderId && this.selectedLibrary && this.selectedLibrary.folders.length) {
+        this.selectedFolderId = this.selectedLibrary.folders[0].id
+      }
+    },
     reset() {
       this.title = ''
       this.author = ''
@@ -218,12 +271,18 @@ export default {
         this.$toast.error('Must enter a title and author')
         return
       }
+      if (!this.selectedLibraryId || !this.selectedFolderId) {
+        this.$toast.error('Must select a library and folder')
+        return
+      }
       this.processing = true
 
       var form = new FormData()
       form.set('title', this.title)
       form.set('author', this.author)
       form.set('series', this.series)
+      form.set('library', this.selectedLibraryId)
+      form.set('folder', this.selectedFolderId)
 
       var index = 0
       var files = this.validAudioFiles.concat(this.validImageFiles)
@@ -234,21 +293,21 @@ export default {
       this.$axios
         .$post('/upload', form)
         .then((data) => {
-          if (data.error) {
-            this.$toast.error(data.error)
-          } else {
-            this.$toast.success('Audiobook Uploaded Successfully')
-            this.reset()
-          }
+          this.$toast.success('Audiobook Uploaded Successfully')
+          this.reset()
           this.processing = false
         })
         .catch((error) => {
           console.error('Failed', error)
-          this.$toast.error('Oops, something went wrong...')
+          var errorMessage = error.response && error.response.data ? error.response.data : 'Oops, something went wrong...'
+          this.$toast.error(errorMessage)
           this.processing = false
         })
     }
   },
-  mounted() {}
+  mounted() {
+    this.selectedLibraryId = this.$store.state.libraries.currentLibraryId
+    this.setDefaultFolder()
+  }
 }
 </script>

client/plugins/constants.js

@@ -5,8 +5,14 @@ const DownloadStatus = {
   FAILED: 3
 }
 
+const CoverDestination = {
+  METADATA: 0,
+  AUDIOBOOK: 1
+}
+
 const Constants = {
-  DownloadStatus
+  DownloadStatus,
+  CoverDestination
 }
 
 export default ({ app }, inject) => {

client/plugins/init.client.js

@@ -1,6 +1,17 @@
 import Vue from 'vue'
+import { formatDistance, format } from 'date-fns'
+
 Vue.prototype.$isDev = process.env.NODE_ENV !== 'production'
 
+Vue.prototype.$dateDistanceFromNow = (unixms) => {
+  if (!unixms) return ''
+  return formatDistance(unixms, Date.now(), { addSuffix: true })
+}
+Vue.prototype.$formatDate = (unixms, fnsFormat = 'MM/dd/yyyy HH:mm') => {
+  if (!unixms) return ''
+  return format(unixms, fnsFormat)
+}
+
 Vue.prototype.$bytesPretty = (bytes, decimals = 2) => {
   if (bytes === 0) {
     return '0 Bytes'

client/store/audiobooks.js

@@ -5,6 +5,7 @@ const STANDARD_GENRES = ['Adventure', 'Autobiography', 'Biography', 'Childrens',
 
 export const state = () => ({
   audiobooks: [],
+  loadedLibraryId: '',
   lastLoad: 0,
   listeners: [],
   genres: [...STANDARD_GENRES],
@@ -41,14 +42,19 @@ export const getters = {
     var settings = rootState.user.settings || {}
     var filterBy = settings.filterBy || ''
 
-    var searchGroups = ['genres', 'tags', 'series', 'authors', 'progress']
+    var searchGroups = ['genres', 'tags', 'series', 'authors', 'progress', 'narrators']
     var group = searchGroups.find(_group => filterBy.startsWith(_group + '.'))
     if (group) {
-      var filter = decode(filterBy.replace(`${group}.`, ''))
+      var filterVal = filterBy.replace(`${group}.`, '')
+      var filter = decode(filterVal)
       if (group === 'genres') filtered = filtered.filter(ab => ab.book && ab.book.genres.includes(filter))
       else if (group === 'tags') filtered = filtered.filter(ab => ab.tags.includes(filter))
-      else if (group === 'series') filtered = filtered.filter(ab => ab.book && ab.book.series === filter)
+      else if (group === 'series') {
+        if (filter === 'No Series') filtered = filtered.filter(ab => ab.book && !ab.book.series)
+        else filtered = filtered.filter(ab => ab.book && ab.book.series === filter)
+      }
       else if (group === 'authors') filtered = filtered.filter(ab => ab.book && ab.book.author === filter)
+      else if (group === 'narrators') filtered = filtered.filter(ab => ab.book && ab.book.narrator === filter)
       else if (group === 'progress') {
         filtered = filtered.filter(ab => {
           var userAudiobook = rootGetters['user/getUserAudiobook'](ab.id)
@@ -61,7 +67,7 @@ export const getters = {
       }
     }
     if (state.keywordFilter) {
-      const keywordFilterKeys = ['title', 'subtitle', 'author', 'series', 'narrarator']
+      const keywordFilterKeys = ['title', 'subtitle', 'author', 'series', 'narrator']
       const keyworkFilter = state.keywordFilter.toLowerCase()
       return filtered.filter(ab => {
         if (!ab.book) return false
@@ -75,6 +81,7 @@ export const getters = {
     var direction = settings.orderDesc ? 'desc' : 'asc'
 
     var filtered = getters.getFiltered()
+
     var orderByNumber = settings.orderBy === 'book.volumeNumber'
     return sort(filtered)[direction]((ab) => {
       // Supports dot notation strings i.e. "book.title"
@@ -117,16 +124,21 @@ export const getters = {
     var _authors = state.audiobooks.filter(ab => !!(ab.book && ab.book.author)).map(ab => ab.book.author)
     return [...new Set(_authors)].sort((a, b) => a.toLowerCase() < b.toLowerCase() ? -1 : 1)
   },
+  getUniqueNarrators: (state) => {
+    var _narrators = state.audiobooks.filter(ab => !!(ab.book && ab.book.narrator)).map(ab => ab.book.narrator)
+    return [...new Set(_narrators)].sort((a, b) => a.toLowerCase() < b.toLowerCase() ? -1 : 1)
+  },
   getGenresUsed: (state) => {
     var _genres = []
     state.audiobooks.filter(ab => !!(ab.book && ab.book.genres)).forEach(ab => _genres = _genres.concat(ab.book.genres))
     return [...new Set(_genres)].sort((a, b) => a.toLowerCase() < b.toLowerCase() ? -1 : 1)
   },
-  getBookCoverSrc: (state, getters, rootState, rootGetters) => (book, placeholder = '/book_placeholder.jpg') => {
+  getBookCoverSrc: (state, getters, rootState, rootGetters) => (bookItem, placeholder = '/book_placeholder.jpg') => {
+    var book = bookItem.book
     if (!book || !book.cover || book.cover === placeholder) return placeholder
     var cover = book.cover
 
-    // Absolute URL covers
+    // Absolute URL covers (should no longer be used)
     if (cover.startsWith('http:') || cover.startsWith('https:')) return cover
 
     // Server hosted covers
@@ -135,7 +147,20 @@ export const getters = {
       var bookLastUpdate = book.lastUpdate || Date.now()
       var userToken = rootGetters['user/getToken']
 
-      var url = new URL(cover, document.baseURI)
+      cover = cover.replace(/\\/g, '/')
+
+      // Map old covers to new format /s/book/{bookid}/*
+      if (cover.startsWith('/local')) {
+        cover = cover.replace('local', `s/book/${bookItem.id}`)
+        if (cover.includes(bookItem.path + '/')) { // Remove book path
+          cover = cover.replace(bookItem.path + '/', '')
+        }
+      }
+
+      // Easier to replace these special characters then to encodeUriComponent of the filename
+      var encodedCover = cover.replace(/%/g, '%25').replace(/#/g, '%23')
+
+      var url = new URL(encodedCover, document.baseURI)
       return url.href + `?token=${userToken}&ts=${bookLastUpdate}`
     } catch (err) {
       console.error(err)
@@ -152,29 +177,37 @@ export const actions = {
       return false
     }
 
-    // Don't load again if already loaded in the last 5 minutes
-    var lastLoadDiff = Date.now() - state.lastLoad
-    if (lastLoadDiff < 5 * 60 * 1000) {
-      // Already up to date
-      return false
+    var currentLibraryId = rootState.libraries.currentLibraryId
+
+    if (currentLibraryId === state.loadedLibraryId) {
+      // Don't load again if already loaded in the last 5 minutes
+      var lastLoadDiff = Date.now() - state.lastLoad
+      if (lastLoadDiff < 5 * 60 * 1000) {
+        // Already up to date
+        return false
+      }
     }
+    commit('setLoadedLibrary', currentLibraryId)
 
     this.$axios
-      .$get(`/api/audiobooks`)
+      .$get(`/api/library/${currentLibraryId}/audiobooks`)
       .then((data) => {
         commit('set', data)
         commit('setLastLoad')
+
       })
       .catch((error) => {
         console.error('Failed', error)
         commit('set', [])
       })
     return true
-  },
-
+  }
 }
 
 export const mutations = {
+  setLoadedLibrary(state, val) {
+    state.loadedLibraryId = val
+  },
   setLastLoad(state) {
     state.lastLoad = Date.now()
   },
@@ -223,6 +256,11 @@ export const mutations = {
     })
   },
   addUpdate(state, audiobook) {
+    if (state.loadedLibraryId && audiobook.libraryId !== state.loadedLibraryId) {
+      console.warn('Invalid library', audiobook, 'loaded library', state.loadedLibraryId, '"')
+      return
+    }
+
     var index = state.audiobooks.findIndex(a => a.id === audiobook.id)
     var origAudiobook = null
     if (index >= 0) {

client/store/index.js

@@ -7,17 +7,16 @@ export const state = () => ({
   streamAudiobook: null,
   editModalTab: 'details',
   showEditModal: false,
+  showEReader: false,
   selectedAudiobook: null,
   playOnLoad: false,
-  isScanning: false,
-  isScanningCovers: false,
-  scanProgress: null,
-  coverScanProgress: null,
   developerMode: false,
   selectedAudiobooks: [],
   processingBatch: false,
   previousPath: '/',
-  routeHistory: []
+  routeHistory: [],
+  showExperimentalFeatures: false,
+  backups: []
 })
 
 export const getters = {
@@ -34,7 +33,7 @@ export const actions = {
     }
     return this.$axios.$patch('/api/serverSettings', updatePayload).then((result) => {
       if (result.success) {
-        commit('setServerSettings', result.settings)
+        commit('setServerSettings', result.serverSettings)
         return true
       } else {
         return false
@@ -77,6 +76,7 @@ export const mutations = {
     state.versionData = versionData
   },
   setServerSettings(state, settings) {
+    if (!settings) return
     state.serverSettings = settings
   },
   setStreamAudiobook(state, audiobook) {
@@ -112,39 +112,35 @@ export const mutations = {
   setShowEditModal(state, val) {
     state.showEditModal = val
   },
-  setIsScanning(state, isScanning) {
-    state.isScanning = isScanning
+  showEReader(state, audiobook) {
+    state.selectedAudiobook = audiobook
+    state.showEReader = true
   },
-  setScanProgress(state, scanProgress) {
-    if (scanProgress && scanProgress.progress > 0) state.isScanning = true
-    state.scanProgress = scanProgress
-  },
-  setIsScanningCovers(state, isScanningCovers) {
-    state.isScanningCovers = isScanningCovers
-  },
-  setCoverScanProgress(state, coverScanProgress) {
-    if (coverScanProgress && coverScanProgress.progress > 0) state.isScanningCovers = true
-    state.coverScanProgress = coverScanProgress
+  setShowEReader(state, val) {
+    state.showEReader = val
   },
   setDeveloperMode(state, val) {
     state.developerMode = val
   },
   setSelectedAudiobooks(state, audiobooks) {
     Vue.set(state, 'selectedAudiobooks', audiobooks)
-    // state.selectedAudiobooks = audiobooks
   },
   toggleAudiobookSelected(state, audiobookId) {
     if (state.selectedAudiobooks.includes(audiobookId)) {
       state.selectedAudiobooks = state.selectedAudiobooks.filter(a => a !== audiobookId)
     } else {
       var newSel = state.selectedAudiobooks.concat([audiobookId])
-      // state.selectedAudiobooks = newSel
-      console.log('Setting toggle on sel', newSel)
       Vue.set(state, 'selectedAudiobooks', newSel)
-      // state.selectedAudiobooks.push(audiobookId)
     }
   },
   setProcessingBatch(state, val) {
     state.processingBatch = val
+  },
+  setExperimentalFeatures(state, val) {
+    state.showExperimentalFeatures = val
+    localStorage.setItem('experimental', val ? 1 : 0)
+  },
+  setBackups(state, val) {
+    state.backups = val.sort((a, b) => b.createdAt - a.createdAt)
   }
 }

client/store/libraries.js

@@ -0,0 +1,147 @@
+export const state = () => ({
+  libraries: [],
+  lastLoad: 0,
+  listeners: [],
+  currentLibraryId: 'main',
+  showModal: false,
+  folders: [],
+  folderLastUpdate: 0
+})
+
+export const getters = {
+  getCurrentLibrary: state => {
+    return state.libraries.find(lib => lib.id === state.currentLibraryId)
+  },
+  getSortedLibraries: state => () => {
+    return state.libraries.map(lib => ({ ...lib })).sort((a, b) => a.displayOrder - b.displayOrder)
+  }
+}
+
+export const actions = {
+  loadFolders({ state, commit }) {
+    if (state.folders.length) {
+      var lastCheck = Date.now() - state.folderLastUpdate
+      if (lastCheck < 1000 * 60 * 10) { // 10 minutes
+        // Folders up to date
+        return state.folders
+      }
+    }
+    console.log('Loading folders')
+    commit('setFoldersLastUpdate')
+
+    return this.$axios
+      .$get('/api/filesystem')
+      .then((res) => {
+        console.log('Settings folders', res)
+        commit('setFolders', res)
+        return res
+      })
+      .catch((error) => {
+        console.error('Failed to load dirs', error)
+        commit('setFolders', [])
+        return []
+      })
+  },
+  fetch({ state, commit, rootState }, libraryId) {
+    if (!rootState.user || !rootState.user.user) {
+      console.error('libraries/fetch - User not set')
+      return false
+    }
+
+    var library = state.libraries.find(lib => lib.id === libraryId)
+    if (library) {
+      commit('setCurrentLibrary', libraryId)
+      return library
+    }
+
+    return this.$axios
+      .$get(`/api/library/${libraryId}`)
+      .then((data) => {
+        commit('addUpdate', data)
+        commit('setCurrentLibrary', libraryId)
+        return data
+      })
+      .catch((error) => {
+        console.error('Failed', error)
+        return false
+      })
+  },
+  // Return true if calling load
+  load({ state, commit, rootState }) {
+    if (!rootState.user || !rootState.user.user) {
+      console.error('libraries/load - User not set')
+      return false
+    }
+
+    // Don't load again if already loaded in the last 5 minutes
+    var lastLoadDiff = Date.now() - state.lastLoad
+    if (lastLoadDiff < 5 * 60 * 1000) {
+      // Already up to date
+      return false
+    }
+
+    this.$axios
+      .$get(`/api/libraries`)
+      .then((data) => {
+        commit('set', data)
+        commit('setLastLoad')
+      })
+      .catch((error) => {
+        console.error('Failed', error)
+        commit('set', [])
+      })
+    return true
+  },
+
+}
+
+export const mutations = {
+  setFolders(state, folders) {
+    state.folders = folders
+  },
+  setFoldersLastUpdate(state) {
+    state.folderLastUpdate = Date.now()
+  },
+  setShowModal(state, val) {
+    state.showModal = val
+  },
+  setLastLoad(state) {
+    state.lastLoad = Date.now()
+  },
+  setCurrentLibrary(state, val) {
+    state.currentLibraryId = val
+  },
+  set(state, libraries) {
+    state.libraries = libraries
+    state.listeners.forEach((listener) => {
+      listener.meth()
+    })
+  },
+  addUpdate(state, library) {
+    var index = state.libraries.findIndex(a => a.id === library.id)
+    if (index >= 0) {
+      state.libraries.splice(index, 1, library)
+    } else {
+      state.libraries.push(library)
+    }
+
+    state.listeners.forEach((listener) => {
+      listener.meth()
+    })
+  },
+  remove(state, library) {
+    state.libraries = state.libraries.filter(a => a.id !== library.id)
+
+    state.listeners.forEach((listener) => {
+      listener.meth()
+    })
+  },
+  addListener(state, listener) {
+    var index = state.listeners.findIndex(l => l.id === listener.id)
+    if (index >= 0) state.listeners.splice(index, 1, listener)
+    else state.listeners.push(listener)
+  },
+  removeListener(state, listenerId) {
+    state.listeners = state.listeners.filter(l => l.id !== listenerId)
+  }
+}

client/store/scanners.js

@@ -0,0 +1,27 @@
+export const state = () => ({
+  libraryScans: []
+})
+
+export const getters = {
+  getLibraryScan: state => id => {
+    return state.libraryScans.find(ls => ls.id === id)
+  }
+}
+
+export const actions = {
+
+}
+
+export const mutations = {
+  addUpdate(state, data) {
+    var index = state.libraryScans.findIndex(lib => lib.id === data.id)
+    if (index >= 0) {
+      state.libraryScans.splice(index, 1, data)
+    } else {
+      state.libraryScans.push(data)
+    }
+  },
+  remove(state, data) {
+    state.libraryScans = state.libraryScans.filter(scan => scan.id !== data.id)
+  }
+}

client/store/user.js

@@ -22,9 +22,6 @@ export const getters = {
   getUserSetting: (state) => (key) => {
     return state.settings ? state.settings[key] || null : null
   },
-  getFilterOrderKey: (state) => {
-    return Object.values(state.settings).join('-')
-  },
   getUserCanUpdate: (state) => {
     return state.user && state.user.permissions ? !!state.user.permissions.update : false
   },

client/store/users.js

@@ -0,0 +1,26 @@
+
+export const state = () => ({
+  users: []
+})
+
+export const getters = {
+
+}
+
+export const actions = {
+
+}
+
+export const mutations = {
+  updateUser(state, user) {
+    var index = state.users.findIndex(u => u.id === user.id)
+    if (index >= 0) {
+      state.users.splice(index, 1, user)
+    } else {
+      state.users.push(user)
+    }
+  },
+  removeUser(state, user) {
+    state.users = state.users.filter(u => u.id !== user.id)
+  }
+}

client/tailwind.config.js

@@ -6,7 +6,8 @@ module.exports = {
       safelist: [
         'bg-success',
         'bg-red-600',
-        'py-1.5'
+        'py-1.5',
+        'bg-info'
       ]
     }
   },
@@ -44,7 +45,7 @@ module.exports = {
         none: 'none'
       },
       fontFamily: {
-        sans: ['Open Sans', ...defaultTheme.fontFamily.sans],
+        sans: ['Source Sans Pro', ...defaultTheme.fontFamily.sans],
         mono: ['Ubuntu Mono', ...defaultTheme.fontFamily.mono],
         book: ['Gentium Book Basic', 'serif']
       }

docker-template.xml

@@ -9,7 +9,7 @@
   <Privileged>false</Privileged>
   <Support>https://forums.unraid.net/topic/112698-support-audiobookshelf/</Support>
   <Project>https://github.com/advplyr/audiobookshelf</Project>
-  <Overview>**(Android app in beta, try it out)** Audiobook manager and player. Saves your progress, supports multiple accounts, stream all audio formats on the fly. No more switching between dozens of audio files for a single audiobook, Audiobookshelf shows you one audio track with skipping, seeking and adjustable playback speed. Free &amp; open source mobile apps under construction, consider contributing by posting feedback, suggestions, feature requests on github or the forums.</Overview>
+  <Overview>**(Android app is live)** Audiobook manager and player. Saves your progress, supports multiple accounts, stream all audio formats on the fly. No more switching between dozens of audio files for a single audiobook, Audiobookshelf shows you one audio track with skipping, seeking and adjustable playback speed. Free &amp; open source mobile apps under construction, consider contributing by posting feedback, suggestions, feature requests on github or the forums.</Overview>
   <Category>MediaApp:Books MediaServer:Books</Category>
   <WebUI>http://[IP]:[PORT:80]</WebUI>
   <TemplateURL>https://raw.githubusercontent.com/advplyr/docker-templates/master/audiobookshelf.xml</TemplateURL>
@@ -48,7 +48,18 @@
       <Mode>rw</Mode>
     </Volume>
   </Data>
-  <Environment/>
+  <Environment>
+    <Variable>
+      <Value>99</Value>
+      <Name>AUDIOBOOKSHELF_UID</Name>
+      <Mode/>
+    </Variable>
+    <Variable>
+      <Value>100</Value>
+      <Name>AUDIOBOOKSHELF_GID</Name>
+      <Mode/>
+    </Variable>
+  </Environment>
   <Labels/>
   <Config Name="Audiobooks" Target="/audiobooks" Default="" Mode="rw" Description="Container Path: /audiobooks" Type="Path" Display="always" Required="true" Mask="false" />
   <Config Name="Config" Target="/config" Default="/mnt/user/appdata/audiobookshelf/config/" Mode="rw" Description="Container Path: /config" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/audiobookshelf/config/</Config>

images/banner.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 6702.73 1277.37"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:url(#linear-gradient);}.cls-3{font-size:800px;fill:#c9c9c9;font-family:GentiumBookBasic, Gentium Book Basic;}.cls-4{font-size:420px;fill:#474747;font-family:GentiumBasic, Gentium Basic;}</style><linearGradient id="linear-gradient" x1="617.37" y1="20.7" x2="617.37" y2="1216.56" gradientUnits="userSpaceOnUse"><stop offset="0.32" stop-color="#cd9d49"/><stop offset="0.99" stop-color="#875d27"/></linearGradient></defs><title>bgAsset 6</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_2-2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><g id="Layer_5" data-name="Layer 5"><circle class="cls-1" cx="618.63" cy="618.63" r="618.63"/></g><circle class="cls-2" cx="617.37" cy="618.63" r="597.93"/></g><path class="cls-1" d="M1005.57,574.08c-4.84-4-12.37-10-22.58-17v-79.2c0-201.93-163.69-365.63-365.62-365.63h0c-201.93,0-365.63,163.7-365.63,365.63v79.2c-10.21,7-17.74,13-22.58,17A18.15,18.15,0,0,0,222.63,588v94.89a18.15,18.15,0,0,0,6.53,14c11.29,9.4,37.19,29.1,77.52,49.31v9.22c0,24.88,16,45,35.84,45h0c19.79,0,35.84-20.16,35.84-45V527.83c0-24.87-16.05-45-35.84-45h0c-19,0-34.48,18.51-35.75,41.94l-.09,0v-46.9c0-171.59,139.1-310.69,310.69-310.69h0c171.58,0,310.68,139.1,310.68,310.69v46.9l-.08,0c-1.27-23.43-16.79-41.94-35.76-41.94h0c-19.79,0-35.83,20.17-35.83,45V755.4c0,24.88,16,45,35.83,45h0c19.8,0,35.84-20.16,35.84-45v-9.22c40.33-20.21,66.24-39.91,77.52-49.31a18.15,18.15,0,0,0,6.53-14V588A18.15,18.15,0,0,0,1005.57,574.08Z"/><path class="cls-1" d="M489.87,969.71a43.31,43.31,0,0,0,43.3-43.3V441.64a43.3,43.3,0,0,0-43.3-43.29H445.15a43.3,43.3,0,0,0-43.3,43.29V926.41a43.31,43.31,0,0,0,43.3,43.3Zm-71.69-455.1h98.67v10.31H418.18Z"/><path class="cls-1" d="M639.73,969.71A43.3,43.3,0,0,0,683,926.41V441.64a43.29,43.29,0,0,0-43.29-43.29H595a43.29,43.29,0,0,0-43.29,43.29V926.41A43.3,43.3,0,0,0,595,969.71ZM568,514.61H666.7v10.31H568Z"/><path class="cls-1" d="M789.59,969.71a43.3,43.3,0,0,0,43.29-43.3V441.64a43.29,43.29,0,0,0-43.29-43.29H744.86a43.3,43.3,0,0,0-43.3,43.29V926.41a43.31,43.31,0,0,0,43.3,43.3Zm-71.7-455.1h98.67v10.31H717.89Z"/><rect class="cls-1" x="294.5" y="984.69" width="645.74" height="65.25" rx="32.63"/></g><g id="Layer_6" data-name="Layer 6"><text class="cls-3" transform="translate(1492.27 670.42)">audiobookshelf</text><text class="cls-4" transform="translate(1492.27 1128.69)">self-hosted audiobook server</text></g></g></svg>

index.js

@@ -18,8 +18,10 @@ const PORT = process.env.PORT || 80
 const CONFIG_PATH = process.env.CONFIG_PATH || '/config'
 const AUDIOBOOK_PATH = process.env.AUDIOBOOK_PATH || '/audiobooks'
 const METADATA_PATH = process.env.METADATA_PATH || '/metadata'
+const UID = process.env.AUDIOBOOKSHELF_UID || 99
+const GID = process.env.AUDIOBOOKSHELF_GID || 100
 
 console.log('Config', CONFIG_PATH, METADATA_PATH, AUDIOBOOK_PATH)
 
-const Server = new server(PORT, CONFIG_PATH, METADATA_PATH, AUDIOBOOK_PATH)
+const Server = new server(PORT, UID, GID, CONFIG_PATH, METADATA_PATH, AUDIOBOOK_PATH)
 Server.start()

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.2.7",
+  "version": "1.4.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -69,6 +69,12 @@
         "@types/node": "*"
       }
     },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "optional": true
+    },
     "aborter": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/aborter/-/aborter-1.1.0.tgz",
@@ -83,6 +89,23 @@
         "negotiator": "0.6.2"
       }
     },
+    "adm-zip": {
+      "version": "0.4.16",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz",
+      "integrity": "sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg=="
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "optional": true
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "optional": true
+    },
     "archiver": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.0.tgz",
@@ -138,6 +161,33 @@
         "is-primitive": "^3.0.1"
       }
     },
+    "are-we-there-yet": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+      "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+      "optional": true,
+      "requires": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        }
+      }
+    },
     "array-back": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
@@ -285,6 +335,12 @@
         "responselike": "^2.0.0"
       }
     },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "optional": true
+    },
     "clone-response": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
@@ -293,6 +349,12 @@
         "mimic-response": "^1.0.0"
       }
     },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "optional": true
+    },
     "command-line-args": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.0.tgz",
@@ -325,6 +387,12 @@
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+      "optional": true
+    },
     "content-disposition": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@@ -343,15 +411,6 @@
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
       "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
     },
-    "cookie-parser": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.5.tgz",
-      "integrity": "sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw==",
-      "requires": {
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6"
-      }
-    },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -389,6 +448,11 @@
         "readable-stream": "^3.4.0"
       }
     },
+    "date-and-time": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-2.0.1.tgz",
+      "integrity": "sha512-O7Xe5dLaqvY/aF/MFWArsAM1J4j7w1CSZlPCX9uHgmb+6SbkPd8Q4YOvfvH/cZGvFlJFfHOZKxQtmMUOoZhc/w=="
+    },
     "debounce": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
@@ -417,11 +481,23 @@
         }
       }
     },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "optional": true
+    },
     "defer-to-connect": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
       "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="
     },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "optional": true
+    },
     "depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -432,6 +508,12 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
       "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
     },
+    "detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "optional": true
+    },
     "dicer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.3.0.tgz",
@@ -508,6 +590,16 @@
         "base64-arraybuffer": "0.1.4"
       }
     },
+    "epub": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/epub/-/epub-1.2.1.tgz",
+      "integrity": "sha512-2GDDr2qcH3dvwX1lgwCQ3gki0CwwrxELLI005SauhT2TacJUiDqZrQuGuOSWEYIHX6ox5kXHpn1ZjsHqkNCb+g==",
+      "requires": {
+        "adm-zip": "^0.4.11",
+        "xml2js": "^0.4.23",
+        "zipfile": "^0.5.11"
+      }
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -573,6 +665,11 @@
       "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.3.0.tgz",
       "integrity": "sha512-qJhfEgCnmteSeZAeuOKQ2WEIFTX5ajrzE0xS6gCOBCoRQcU+xEzQmgYQQTpzCcqUAAzTEtu4YEih4pnLfvNtew=="
     },
+    "file-type": {
+      "version": "10.11.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
+      "integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="
+    },
     "finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
@@ -634,11 +731,36 @@
         "universalify": "^2.0.0"
       }
     },
+    "fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "optional": true,
+      "requires": {
+        "minipass": "^2.6.0"
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "optional": true,
+      "requires": {
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      }
+    },
     "get-stream": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -684,6 +806,12 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
       "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
     },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "optional": true
+    },
     "http-cache-semantics": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
@@ -723,6 +851,23 @@
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
+    "ignore-walk": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz",
+      "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==",
+      "optional": true,
+      "requires": {
+        "minimatch": "^3.0.4"
+      }
+    },
+    "image-type": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/image-type/-/image-type-4.1.0.tgz",
+      "integrity": "sha512-CFJMJ8QK8lJvRlTCEgarL4ro6hfDQKif2HjSvYCdQZESaIPV4v9imrf7BQHK+sQeTeNeMpWciR9hyC/g8ybXEg==",
+      "requires": {
+        "file-type": "^10.10.0"
+      }
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -737,6 +882,12 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
+    "ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "optional": true
+    },
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -747,6 +898,15 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "optional": true,
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
     "is-primitive": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-3.0.1.tgz",
@@ -970,11 +1130,92 @@
         "brace-expansion": "^1.1.7"
       }
     },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "optional": true
+    },
+    "minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "optional": true,
+      "requires": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "optional": true,
+      "requires": {
+        "minipass": "^2.9.0"
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "optional": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "moment": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+    },
+    "moment-timezone": {
+      "version": "0.5.33",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz",
+      "integrity": "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==",
+      "requires": {
+        "moment": ">= 2.9.0"
+      }
+    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
+    "nan": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
+      "optional": true
+    },
+    "needle": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
+      "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
+      "optional": true,
+      "requires": {
+        "debug": "^3.2.6",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "optional": true
+        }
+      }
+    },
     "negotiator": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
@@ -988,6 +1229,14 @@
         "proper-lockfile": "^4.1.2"
       }
     },
+    "node-cron": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/node-cron/-/node-cron-3.0.0.tgz",
+      "integrity": "sha512-DDwIvvuCwrNiaU7HEivFDULcaQualDv7KoNlB/UU1wPW0n1tDEmBJKhEIE6DlF2FuoOHcNbLJ8ITL2Iv/3AWmA==",
+      "requires": {
+        "moment-timezone": "^0.5.31"
+      }
+    },
     "node-dir": {
       "version": "0.1.17",
       "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
@@ -996,6 +1245,39 @@
         "minimatch": "^3.0.2"
       }
     },
+    "node-pre-gyp": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
+      "integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==",
+      "optional": true,
+      "requires": {
+        "detect-libc": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "needle": "^2.2.1",
+        "nopt": "^4.0.1",
+        "npm-packlist": "^1.1.6",
+        "npmlog": "^4.0.2",
+        "rc": "^1.2.7",
+        "rimraf": "^2.6.1",
+        "semver": "^5.3.0",
+        "tar": "^4"
+      }
+    },
+    "node-stream-zip": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz",
+      "integrity": "sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw=="
+    },
+    "nopt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "optional": true,
+      "requires": {
+        "abbrev": "1",
+        "osenv": "^0.1.4"
+      }
+    },
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -1006,6 +1288,50 @@
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
       "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="
     },
+    "npm-bundled": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
+      "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
+      "optional": true,
+      "requires": {
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
+      "optional": true
+    },
+    "npm-packlist": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
+      "optional": true,
+      "requires": {
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "optional": true,
+      "requires": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "optional": true
+    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -1027,11 +1353,43 @@
         "wrappy": "1"
       }
     },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "optional": true
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "optional": true
+    },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "optional": true,
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
     "p-cancelable": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
       "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="
     },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+    },
     "parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -1047,6 +1405,11 @@
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
     },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+    },
     "podcast": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/podcast/-/podcast-1.3.0.tgz",
@@ -1124,6 +1487,27 @@
         "unpipe": "1.0.0"
       }
     },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "optional": true,
+      "requires": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      }
+    },
+    "read-chunk": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.1.0.tgz",
+      "integrity": "sha512-ZdiZJXXoZYE08SzZvTipHhI+ZW0FpzxmFtLI3vIeMuRN9ySbIZ+SZawKogqJ7dxW9fJ/W73BNtxu4Zu/bZp+Ng==",
+      "requires": {
+        "pify": "^4.0.1",
+        "with-open-file": "^0.1.5"
+      }
+    },
     "readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -1160,6 +1544,15 @@
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
       "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs="
     },
+    "rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "optional": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
     "ripstat": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ripstat/-/ripstat-1.1.1.tgz",
@@ -1202,6 +1595,11 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
     "semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -1245,6 +1643,12 @@
         "send": "0.17.1"
       }
     },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "optional": true
+    },
     "setprototypeof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
@@ -1331,6 +1735,17 @@
       "resolved": "https://registry.npmjs.org/string-indexes/-/string-indexes-1.0.0.tgz",
       "integrity": "sha512-RUlx+2YydZJNlRAvoh1siPYWj/Xfk6t1sQLkA5n1tMGRCKkRLzkRtJhHk4qRmKergEBh8R3pWhsUsDqia/bolw=="
     },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "optional": true,
+      "requires": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      }
+    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -1339,6 +1754,44 @@
         "safe-buffer": "~5.1.0"
       }
     },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "optional": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "optional": true
+    },
+    "tar": {
+      "version": "4.4.19",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+      "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+      "optional": true,
+      "requires": {
+        "chownr": "^1.1.4",
+        "fs-minipass": "^1.2.7",
+        "minipass": "^2.9.0",
+        "minizlib": "^1.3.3",
+        "mkdirp": "^0.5.5",
+        "safe-buffer": "^5.2.1",
+        "yallist": "^3.1.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "optional": true
+        }
+      }
+    },
     "tar-stream": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
@@ -1424,6 +1877,25 @@
         "isexe": "^2.0.0"
       }
     },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "optional": true,
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
+    "with-open-file": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz",
+      "integrity": "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==",
+      "requires": {
+        "p-finally": "^1.0.0",
+        "p-try": "^2.1.0",
+        "pify": "^4.0.1"
+      }
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -1439,6 +1911,26 @@
       "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
       "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU="
     },
+    "xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      }
+    },
+    "xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+    },
+    "yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "optional": true
+    },
     "zip-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz",
@@ -1448,6 +1940,16 @@
         "compress-commons": "^4.1.0",
         "readable-stream": "^3.6.0"
       }
+    },
+    "zipfile": {
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.12.tgz",
+      "integrity": "sha512-zA60gW+XgQBu/Q4qV3BCXNIDRald6Xi5UOPj3jWGlnkjmBHaKDwIz7kyXWV3kq7VEsQN/2t/IWjdXdKeVNm6Eg==",
+      "optional": true,
+      "requires": {
+        "nan": "~2.10.0",
+        "node-pre-gyp": "~0.10.2"
+      }
     }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "audiobookshelf",
-  "version": "1.3.1",
+  "version": "1.4.7",
   "description": "Self-hosted audiobook server for managing and playing audiobooks",
   "main": "index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "start": "node index.js",
     "client": "cd client && npm install && npm run generate",
     "prod": "npm run client && npm install && node prod.js",
-    "build-win": "npm run build-prep && pkg -t node12-win-x64 -o ./dist/win/audiobookshelf .",
+    "build-win": "pkg -t node12-win-x64 -o ./dist/win/audiobookshelf .",
     "build-linux": "build/linuxpackager"
   },
   "bin": "prod.js",
@@ -26,18 +26,23 @@
     "axios": "^0.21.1",
     "bcryptjs": "^2.4.3",
     "command-line-args": "^5.2.0",
-    "cookie-parser": "^1.4.5",
+    "date-and-time": "^2.0.1",
+    "epub": "^1.2.1",
     "express": "^4.17.1",
     "express-fileupload": "^1.2.1",
     "express-rate-limit": "^5.3.0",
     "fluent-ffmpeg": "^2.1.2",
     "fs-extra": "^10.0.0",
+    "image-type": "^4.1.0",
     "ip": "^1.1.5",
     "jsonwebtoken": "^8.5.1",
     "libgen": "^2.1.0",
     "njodb": "^0.4.20",
+    "node-cron": "^3.0.0",
     "node-dir": "^0.1.17",
+    "node-stream-zip": "^1.15.0",
     "podcast": "^1.3.0",
+    "read-chunk": "^3.1.0",
     "socket.io": "^4.1.3",
     "watcher": "^1.2.0"
   },

prod.js

@@ -24,8 +24,10 @@ const PORT = options.port || process.env.PORT || 3333
 const CONFIG_PATH = inputConfig || process.env.CONFIG_PATH || Path.resolve('config')
 const AUDIOBOOK_PATH = inputAudiobook || process.env.AUDIOBOOK_PATH || Path.resolve('audiobooks')
 const METADATA_PATH = inputMetadata || process.env.METADATA_PATH || Path.resolve('metadata')
+const UID = 99
+const GID = 100
 
 console.log(process.env.NODE_ENV, 'Config', CONFIG_PATH, METADATA_PATH, AUDIOBOOK_PATH)
 
-const Server = new server(PORT, CONFIG_PATH, METADATA_PATH, AUDIOBOOK_PATH)
+const Server = new server(PORT, UID, GID, CONFIG_PATH, METADATA_PATH, AUDIOBOOK_PATH)
 Server.start()

readme.md

@@ -1,72 +1,45 @@
-# AudioBookshelf
+<br />
+<div align="center">
+   <img alt="Audiobookshelf Banner" src="https://github.com/advplyr/audiobookshelf/raw/master/images/banner.svg" width="600">
 
-AudioBookshelf is a self-hosted audiobook server for managing and playing your audiobooks.
+  <p align="center">
+    <br />
+    <a href="https://audiobookshelf.org/docs">Documentation</a>
+    ·
+    <a href="https://audiobookshelf.org/install">Install Guides</a>
+    ·
+    <a href="https://audiobookshelf.org/showcase">Showcase</a>
+  </p>
+</div>
 
-See [Install guides](https://audiobookshelf.org/install) and [documentation](https://audiobookshelf.org/docs)
+## About
+
+Audiobookshelf is a self-hosted audiobook server for managing and playing your audiobooks.
+
+### Features
+
+* Fully **open-source**, including the [android app](https://github.com/advplyr/audiobookshelf-app) *(in beta)*
+* Stream all audiobook formats on the fly
+* Multi-user support w/ custom permissions
+* Keeps progress per user and syncs across devices
+* Auto-detects library updates, no need to re-scan
+* Upload full audiobooks and covers
+* Backup your metadata + automated daily backups
+
+Is there a feature you are looking for? [Suggest it](https://github.com/advplyr/audiobookshelf/issues/new)
 
 Android app is in beta, try it out on the [Google Play Store](https://play.google.com/store/apps/details?id=com.audiobookshelf.app)
 
-**Free & open source Android/iOS app is in development**
+<img alt="Library Screenshot" src="https://github.com/advplyr/audiobookshelf/raw/master/images/LibraryStream.png" />
 
-<img alt="Screenshot1" src="https://github.com/advplyr/audiobookshelf/raw/master/images/ss_streaming.png" />
+## Organizing your audiobooks
+
+#### Directory structure and folder names are critical to AudioBookshelf!
+
+ See [documentation](https://audiobookshelf.org/docs) for supported directory structure, folder naming conventions, and audio file metadata usage.
 
 
-## Directory Structure
 
- See [documentation](https://audiobookshelf.org/docs) for directory structure and naming.
-
-Author, Series, Volume Number, Title and Publish Year can all be parsed from your folder structure.
-
-**Note**: Files in the root directory `/audiobooks` will be ignored, all audiobooks should be in a directory
-
-**1 Folder:** `/Title/...`\
-**2 Folders:** `/Author/Title/...`\
-**3 Folders:** `/Author/Series/Title/...`
-
-### Parsing publish year
-
-`/1984 - Hackers/...`\
-Will save the publish year as `1984` and the title as `Hackers`
-
-### Parsing volume number (only for series)
-
-`/Book 3 - Hackers/...`\
-Will save the volume number as `3` and the title as `Hackers`
-
-`Book` `Volume` `Vol` `Vol.` are all supported case insensitive
-
-These combinations will also work:\
-`/Hackers - Vol. 3/...`\
-`/1984 - Volume 3 - Hackers/...`\
-`/1984 - Hackers Book 3/...`
-
-
-### Parsing subtitles (optional in settings)
-
-Title Folder: `/Hackers - Heroes of the Computer Revolution/...`
-
-Will save the title as `Hackers` and the subtitle as `Heroes of the Computer Revolution`
-
-
-### Full example
-
-`/Steven Levy/The Hacker Series/1984 - Hackers - Heroes of the Computer Revolution - Vol. 1/...`
-
-**Becomes:**
-| Key           | Value                             |
-|---------------|-----------------------------------|
-| Author        | Steven Levy                       |
-| Series        | The Hacker Series                 |
-| Publish Year  | 1984                              |
-| Title         | Hackers                           |
-| Subtitle      | Heroes of the Computer Revolution |
-| Volume Number | 1                                 |
-
-
-## Features coming soon
-
-* Support different views to see more details of each audiobook
-* iOS App (Android is in beta [here](https://play.google.com/store/apps/details?id=com.audiobookshelf.app))
 
 ## Installation
 
@@ -120,7 +93,7 @@ Get the `deb` file from the [github repo](https://github.com/advplyr/audiobooksh
 See [instructions](https://www.audiobookshelf.org/install#debian)
 
 
-#### File locations
+#### Linux file locations
 
 Project directory: `/usr/share/audiobookshelf/`
 

server/ApiController.js

@@ -3,17 +3,20 @@ const Path = require('path')
 const fs = require('fs-extra')
 const Logger = require('./Logger')
 const User = require('./objects/User')
-const { isObject, isAcceptableCoverMimeType } = require('./utils/index')
-const { CoverDestination } = require('./utils/constants')
+const { isObject } = require('./utils/index')
+const Library = require('./objects/Library')
 
 class ApiController {
-  constructor(MetadataPath, db, scanner, auth, streamManager, rssFeeds, downloadManager, emitter, clientEmitter) {
+  constructor(MetadataPath, db, scanner, auth, streamManager, rssFeeds, downloadManager, coverController, backupManager, watcher, emitter, clientEmitter) {
     this.db = db
     this.scanner = scanner
     this.auth = auth
     this.streamManager = streamManager
     this.rssFeeds = rssFeeds
     this.downloadManager = downloadManager
+    this.coverController = coverController
+    this.backupManager = backupManager
+    this.watcher = watcher
     this.emitter = emitter
     this.clientEmitter = clientEmitter
     this.MetadataPath = MetadataPath
@@ -26,7 +29,16 @@ class ApiController {
     this.router.get('/find/covers', this.findCovers.bind(this))
     this.router.get('/find/:method', this.find.bind(this))
 
-    this.router.get('/audiobooks', this.getAudiobooks.bind(this))
+    this.router.get('/libraries', this.getLibraries.bind(this))
+    this.router.patch('/libraries/order', this.reorderLibraries.bind(this))
+    this.router.get('/library/:id/search', this.searchLibrary.bind(this))
+    this.router.get('/library/:id', this.getLibrary.bind(this))
+    this.router.delete('/library/:id', this.deleteLibrary.bind(this))
+    this.router.patch('/library/:id', this.updateLibrary.bind(this))
+    this.router.get('/library/:id/audiobooks', this.getLibraryAudiobooks.bind(this))
+    this.router.post('/library', this.createNewLibrary.bind(this))
+
+    this.router.get('/audiobooks', this.getAudiobooks.bind(this)) // Old route should pass library id
     this.router.delete('/audiobooks', this.deleteAllAudiobooks.bind(this))
     this.router.post('/audiobooks/delete', this.batchDeleteAudiobooks.bind(this))
     this.router.post('/audiobooks/update', this.batchUpdateAudiobooks.bind(this))
@@ -52,6 +64,9 @@ class ApiController {
 
     this.router.patch('/serverSettings', this.updateServerSettings.bind(this))
 
+    this.router.delete('/backup/:id', this.deleteBackup.bind(this))
+    this.router.post('/backup/upload', this.uploadBackup.bind(this))
+
     this.router.post('/authorize', this.authorize.bind(this))
 
     this.router.get('/genres', this.getGenres.bind(this))
@@ -59,6 +74,8 @@ class ApiController {
     this.router.post('/feed', this.openRssFeed.bind(this))
 
     this.router.get('/download/:id', this.download.bind(this))
+
+    this.router.get('/filesystem', this.getFileSystemPaths.bind(this))
   }
 
   find(req, res) {
@@ -77,6 +94,180 @@ class ApiController {
     res.json({ user: req.user })
   }
 
+  getLibraries(req, res) {
+    var libraries = this.db.libraries.map(lib => lib.toJSON())
+    res.json(libraries)
+  }
+
+  async reorderLibraries(req, res) {
+    if (!req.user || !req.user.isRoot) {
+      Logger.error('[ApiController] ReorderLibraries invalid user', req.user)
+      return res.sendStatus(401)
+    }
+
+    var orderdata = req.body
+    var hasUpdates = false
+    for (let i = 0; i < orderdata.length; i++) {
+      var library = this.db.libraries.find(lib => lib.id === orderdata[i].id)
+      if (!library) {
+        Logger.error(`[ApiController] Invalid library not found in reorder ${orderdata[i].id}`)
+        return res.sendStatus(500)
+      }
+      if (library.update({ displayOrder: orderdata[i].newOrder })) {
+        hasUpdates = true
+        await this.db.updateEntity('library', library)
+      }
+    }
+
+    if (hasUpdates) {
+      Logger.info(`[ApiController] Updated library display orders`)
+    } else {
+      Logger.info(`[ApiController] Library orders were up to date`)
+    }
+
+    var libraries = this.db.libraries.map(lib => lib.toJSON())
+    res.json(libraries)
+  }
+
+  searchLibrary(req, res) {
+    var library = this.db.libraries.find(lib => lib.id === req.params.id)
+    if (!library) {
+      return res.status(404).send('Library not found')
+    }
+    if (!req.query.q) {
+      return res.status(400).send('No query string')
+    }
+    var maxResults = req.query.max || 3
+
+    var bookMatches = []
+    var authorMatches = {}
+    var seriesMatches = {}
+
+    var audiobooksInLibrary = this.db.audiobooks.filter(ab => ab.libraryId === library.id)
+    audiobooksInLibrary.forEach((ab) => {
+      var queryResult = ab.searchQuery(req.query.q)
+      if (queryResult.book) {
+        bookMatches.push({
+          audiobook: ab,
+          matchKey: queryResult.book
+        })
+      }
+      if (queryResult.author && !authorMatches[queryResult.author]) {
+        authorMatches[queryResult.author] = {
+          author: queryResult.author
+        }
+      }
+      if (queryResult.series) {
+        if (!seriesMatches[queryResult.series]) {
+          seriesMatches[queryResult.series] = {
+            series: queryResult.series,
+            audiobooks: [ab]
+          }
+        } else {
+          seriesMatches[queryResult.series].audiobooks.push(ab)
+        }
+      }
+    })
+
+    res.json({
+      audiobooks: bookMatches.slice(0, maxResults),
+      authors: Object.values(authorMatches).slice(0, maxResults),
+      series: Object.values(seriesMatches).slice(0, maxResults)
+    })
+  }
+
+  getLibrary(req, res) {
+    var library = this.db.libraries.find(lib => lib.id === req.params.id)
+    if (!library) {
+      return res.status(404).send('Library not found')
+    }
+    return res.json(library.toJSON())
+  }
+
+  async deleteLibrary(req, res) {
+    var library = this.db.libraries.find(lib => lib.id === req.params.id)
+    if (!library) {
+      return res.status(404).send('Library not found')
+    }
+
+    // Remove library watcher
+    this.watcher.removeLibrary(library)
+
+    // Remove audiobooks in this library
+    var audiobooks = this.db.audiobooks.filter(ab => ab.libraryId === library.id)
+    Logger.info(`[Server] deleting library "${library.name}" with ${audiobooks.length} audiobooks"`)
+    for (let i = 0; i < audiobooks.length; i++) {
+      await this.handleDeleteAudiobook(audiobooks[i])
+    }
+
+    var libraryJson = library.toJSON()
+    await this.db.removeEntity('library', library.id)
+    this.emitter('library_removed', libraryJson)
+    return res.json(libraryJson)
+  }
+
+  async updateLibrary(req, res) {
+    var library = this.db.libraries.find(lib => lib.id === req.params.id)
+    if (!library) {
+      return res.status(404).send('Library not found')
+    }
+    var hasUpdates = library.update(req.body)
+    if (hasUpdates) {
+      // Update watcher
+      this.watcher.updateLibrary(library)
+
+      // Remove audiobooks no longer in library
+      var audiobooksToRemove = this.db.audiobooks.filter(ab => !library.checkFullPathInLibrary(ab.fullPath))
+      if (audiobooksToRemove.length) {
+        Logger.info(`[Scanner] Updating library, removing ${audiobooksToRemove.length} audiobooks`)
+        for (let i = 0; i < audiobooksToRemove.length; i++) {
+          await this.handleDeleteAudiobook(audiobooksToRemove[i])
+        }
+      }
+      await this.db.updateEntity('library', library)
+      this.emitter('library_updated', library.toJSON())
+    }
+    return res.json(library.toJSON())
+  }
+
+  getLibraryAudiobooks(req, res) {
+    var libraryId = req.params.id
+    var library = this.db.libraries.find(lib => lib.id === libraryId)
+    if (!library) {
+      return res.status(400).send('Library does not exist')
+    }
+
+    var audiobooks = []
+    if (req.query.q) {
+      audiobooks = this.db.audiobooks.filter(ab => {
+        return ab.libraryId === libraryId && ab.isSearchMatch(req.query.q)
+      }).map(ab => ab.toJSONMinified())
+    } else {
+      audiobooks = this.db.audiobooks.filter(ab => ab.libraryId === libraryId).map(ab => ab.toJSONMinified())
+    }
+    res.json(audiobooks)
+  }
+
+  async createNewLibrary(req, res) {
+    var newLibraryPayload = {
+      ...req.body
+    }
+    if (!newLibraryPayload.name || !newLibraryPayload.folders || !newLibraryPayload.folders.length) {
+      return res.status(500).send('Invalid request')
+    }
+
+    var library = new Library()
+    newLibraryPayload.displayOrder = this.db.libraries.length + 1
+    library.setData(newLibraryPayload)
+    await this.db.insertEntity('library', library)
+    this.emitter('library_added', library.toJSON())
+
+    // Add library watcher
+    this.watcher.addLibrary(library)
+
+    res.json(library)
+  }
+
   getAudiobooks(req, res) {
     var audiobooks = []
     if (req.query.q) {
@@ -221,77 +412,36 @@ class ApiController {
       Logger.warn('User attempted to upload a cover without permission', req.user)
       return res.sendStatus(403)
     }
-    if (!req.files || !req.files.cover) {
-      return res.status(400).send('No files were uploaded')
-    }
+
     var audiobookId = req.params.id
     var audiobook = this.db.audiobooks.find(ab => ab.id === audiobookId)
     if (!audiobook) {
       return res.status(404).send('Audiobook not found')
     }
 
-    var coverFile = req.files.cover
-    var mimeType = coverFile.mimetype
-    var extname = Path.extname(coverFile.name.toLowerCase()) || '.jpg'
-    if (!isAcceptableCoverMimeType(mimeType)) {
-      return res.status(400).send('Invalid image file type: ' + mimeType)
-    }
-
-    var coverDestination = this.db.serverSettings ? this.db.serverSettings.coverDestination : CoverDestination.METADATA
-    Logger.info(`[ApiController] Cover Upload destination ${coverDestination}`)
-
-    var coverDirpath = audiobook.fullPath
-    var coverRelDirpath = Path.join('/local', audiobook.path)
-    if (coverDestination === CoverDestination.METADATA) {
-      coverDirpath = Path.join(this.MetadataPath, 'books', audiobookId)
-      coverRelDirpath = Path.join('/metadata', 'books', audiobookId)
-      Logger.debug(`[ApiController] storing in metadata | ${coverDirpath}`)
-      await fs.ensureDir(coverDirpath)
+    var result = null
+    if (req.body && req.body.url) {
+      Logger.debug(`[ApiController] Requesting download cover from url "${req.body.url}"`)
+      result = await this.coverController.downloadCoverFromUrl(audiobook, req.body.url)
+    } else if (req.files && req.files.cover) {
+      Logger.debug(`[ApiController] Handling uploaded cover`)
+      var coverFile = req.files.cover
+      result = await this.coverController.uploadCover(audiobook, coverFile)
     } else {
-      Logger.debug(`[ApiController] storing in audiobook | ${coverRelDirpath}`)
+      return res.status(400).send('Invalid request no file or url')
     }
 
-    var coverFilename = `cover${extname}`
-    var coverFullPath = Path.join(coverDirpath, coverFilename)
-    var coverPath = Path.join(coverRelDirpath, coverFilename)
-
-    // If current cover is a metadata cover and does not match replacement, then remove it
-    var currentBookCover = audiobook.book.cover
-    if (currentBookCover && currentBookCover.startsWith(Path.sep + 'metadata')) {
-      Logger.debug(`Current Book Cover is metadata ${currentBookCover}`)
-      if (currentBookCover !== coverPath) {
-        Logger.info(`[ApiController] removing old metadata cover "${currentBookCover}"`)
-        var oldFullBookCoverPath = Path.join(this.MetadataPath, currentBookCover.replace(Path.sep + 'metadata', ''))
-
-        // Metadata path may have changed, check if exists first
-        var exists = await fs.pathExists(oldFullBookCoverPath)
-        if (exists) {
-          try {
-            await fs.remove(oldFullBookCoverPath)
-          } catch (error) {
-            Logger.error(`[ApiController] Failed to remove old metadata book cover ${oldFullBookCoverPath}`)
-          }
-        }
-      }
+    if (result && result.error) {
+      return res.status(400).send(result.error)
+    } else if (!result || !result.cover) {
+      return res.status(500).send('Unknown error occurred')
     }
 
-    var success = await coverFile.mv(coverFullPath).then(() => true).catch((error) => {
-      Logger.error('Failed to move cover file', path, error)
-      return false
-    })
-
-    if (!success) {
-      return res.status(500).send('Failed to move cover into destination')
-    }
-
-    Logger.info(`[ApiController] Uploaded audiobook cover "${coverPath}" for "${audiobook.title}"`)
-
-    audiobook.updateBookCover(coverPath)
     await this.db.updateAudiobook(audiobook)
     this.emitter('audiobook_updated', audiobook.toJSONMinified())
     res.json({
       success: true,
-      cover: coverPath
+      cover: result.cover
     })
   }
 
@@ -411,7 +561,7 @@ class ApiController {
     account.token = await this.auth.generateAccessToken({ userId: account.id })
     account.createdAt = Date.now()
     var newUser = new User(account)
-    var success = await this.db.insertUser(newUser)
+    var success = await this.db.insertEntity('user', newUser)
     if (success) {
       this.clientEmitter(req.user.id, 'user_added', newUser)
       res.json({
@@ -491,10 +641,16 @@ class ApiController {
     }
     var settingsUpdate = req.body
     if (!settingsUpdate || !isObject(settingsUpdate)) {
-      return res.sendStatus(500)
+      return res.status(500).send('Invalid settings update object')
     }
+
     var madeUpdates = this.db.serverSettings.update(settingsUpdate)
     if (madeUpdates) {
+      // If backup schedule is updated - update backup manager
+      if (settingsUpdate.backupSchedule !== undefined) {
+        this.backupManager.updateCronSchedule()
+      }
+
       await this.db.updateEntity('settings', this.db.serverSettings)
     }
     return res.json({
@@ -503,6 +659,31 @@ class ApiController {
     })
   }
 
+  async deleteBackup(req, res) {
+    if (!req.user.isRoot) {
+      Logger.error(`[ApiController] Non-Root user attempting to delete backup`, req.user)
+      return res.sendStatus(403)
+    }
+    var backup = this.backupManager.backups.find(b => b.id === req.params.id)
+    if (!backup) {
+      return res.sendStatus(404)
+    }
+    await this.backupManager.removeBackup(backup)
+    res.json(this.backupManager.backups.map(b => b.toJSON()))
+  }
+
+  async uploadBackup(req, res) {
+    if (!req.user.isRoot) {
+      Logger.error(`[ApiController] Non-Root user attempting to upload backup`, req.user)
+      return res.sendStatus(403)
+    }
+    if (!req.files.file) {
+      Logger.error('[ApiController] Upload backup invalid')
+      return res.sendStatus(500)
+    }
+    this.backupManager.uploadBackup(req, res)
+  }
+
   async download(req, res) {
     if (!req.user.canDownload) {
       Logger.error('User attempting to download without permission', req.user)
@@ -533,5 +714,53 @@ class ApiController {
       genres: this.db.getGenres()
     })
   }
+
+  async getDirectories(dir, relpath, excludedDirs, level = 0) {
+    try {
+      var paths = await fs.readdir(dir)
+
+      var dirs = await Promise.all(paths.map(async dirname => {
+        var fullPath = Path.join(dir, dirname)
+        var path = Path.join(relpath, dirname)
+
+        var isDir = (await fs.lstat(fullPath)).isDirectory()
+        if (isDir && !excludedDirs.includes(path) && dirname !== 'node_modules') {
+          return {
+            path,
+            dirname,
+            fullPath,
+            level,
+            dirs: level < 4 ? (await this.getDirectories(fullPath, path, excludedDirs, level + 1)) : []
+          }
+        } else {
+          return false
+        }
+      }))
+      dirs = dirs.filter(d => d)
+      return dirs
+    } catch (error) {
+      Logger.error('Failed to readdir', dir, error)
+      return []
+    }
+  }
+
+  async getFileSystemPaths(req, res) {
+    var excludedDirs = ['node_modules', 'client', 'server', '.git', 'static', 'build', 'dist', 'metadata', 'config', 'sys', 'proc'].map(dirname => {
+      return Path.sep + dirname
+    })
+
+    // Do not include existing mapped library paths in response
+    this.db.libraries.forEach(lib => {
+      lib.folders.forEach((folder) => {
+        var dir = folder.fullPath
+        if (dir.includes(global.appRoot)) dir = dir.replace(global.appRoot, '')
+        excludedDirs.push(dir)
+      })
+    })
+
+    Logger.debug(`[Server] get file system paths, excluded: ${excludedDirs.join(', ')}`)
+    var dirs = await this.getDirectories(global.appRoot, '/', excludedDirs)
+    res.json(dirs)
+  }
 }
 module.exports = ApiController

server/BackupManager.js

@@ -0,0 +1,321 @@
+const Path = require('path')
+
+const cron = require('node-cron')
+const fs = require('fs-extra')
+const archiver = require('archiver')
+const StreamZip = require('node-stream-zip')
+
+// Utils
+const { getFileSize } = require('./utils/fileUtils')
+const filePerms = require('./utils/filePerms')
+const Logger = require('./Logger')
+
+const Backup = require('./objects/Backup')
+
+class BackupManager {
+  constructor(MetadataPath, Uid, Gid, db) {
+    this.MetadataPath = MetadataPath
+    this.BackupPath = Path.join(this.MetadataPath, 'backups')
+
+    this.Uid = Uid
+    this.Gid = Gid
+    this.db = db
+
+    this.scheduleTask = null
+
+    this.backups = []
+
+    // If backup exceeds this value it will be aborted
+    this.MaxBytesBeforeAbort = 1000000000 // ~ 1GB
+  }
+
+  get serverSettings() {
+    return this.db.serverSettings || {}
+  }
+
+  async init() {
+    var backupsDirExists = await fs.pathExists(this.BackupPath)
+    if (!backupsDirExists) {
+      await fs.ensureDir(this.BackupPath)
+      await filePerms(this.BackupPath, 0o774, this.Uid, this.Gid)
+    }
+
+    await this.loadBackups()
+    this.scheduleCron()
+  }
+
+  scheduleCron() {
+    if (!this.serverSettings.backupSchedule) {
+      Logger.info(`[BackupManager] Auto Backups are disabled`)
+      return
+    }
+    try {
+      var cronSchedule = this.serverSettings.backupSchedule
+      this.scheduleTask = cron.schedule(cronSchedule, this.runBackup.bind(this))
+    } catch (error) {
+      Logger.error(`[BackupManager] Failed to schedule backup cron ${this.serverSettings.backupSchedule}`, error)
+    }
+  }
+
+  updateCronSchedule() {
+    if (this.scheduleTask && !this.serverSettings.backupSchedule) {
+      Logger.info(`[BackupManager] Disabling backup schedule`)
+      if (this.scheduleTask.destroy) this.scheduleTask.destroy()
+      this.scheduleTask = null
+    } else if (!this.scheduleTask && this.serverSettings.backupSchedule) {
+      Logger.info(`[BackupManager] Starting backup schedule ${this.serverSettings.backupSchedule}`)
+      this.scheduleCron()
+    } else if (this.serverSettings.backupSchedule) {
+      Logger.info(`[BackupManager] Restarting backup schedule ${this.serverSettings.backupSchedule}`)
+      if (this.scheduleTask.destroy) this.scheduleTask.destroy()
+      this.scheduleCron()
+    }
+  }
+
+  async uploadBackup(req, res) {
+    var backupFile = req.files.file
+    if (Path.extname(backupFile.name) !== '.audiobookshelf') {
+      Logger.error(`[BackupManager] Invalid backup file uploaded "${backupFile.name}"`)
+      return res.status(500).send('Invalid backup file')
+    }
+
+    var tempPath = Path.join(this.BackupPath, backupFile.name)
+    var success = await backupFile.mv(tempPath).then(() => true).catch((error) => {
+      Logger.error('[BackupManager] Failed to move backup file', path, error)
+      return false
+    })
+    if (!success) {
+      return res.status(500).send('Failed to move backup file into backups directory')
+    }
+
+    const zip = new StreamZip.async({ file: tempPath })
+    const data = await zip.entryData('details')
+    var details = data.toString('utf8').split('\n')
+
+    var backup = new Backup({ details, fullPath: tempPath })
+    backup.fileSize = await getFileSize(backup.fullPath)
+
+    var existingBackupIndex = this.backups.findIndex(b => b.id === backup.id)
+    if (existingBackupIndex >= 0) {
+      Logger.warn(`[BackupManager] Backup already exists with id ${backup.id} - overwriting`)
+      this.backups.splice(existingBackupIndex, 1, backup)
+    } else {
+      this.backups.push(backup)
+    }
+
+    return res.json(this.backups.map(b => b.toJSON()))
+  }
+
+  async requestCreateBackup(socket) {
+    // Only Root User allowed
+    var client = socket.sheepClient
+    if (!client || !client.user) {
+      Logger.error(`[BackupManager] Invalid user attempting to create backup`)
+      socket.emit('backup_complete', false)
+      return
+    } else if (!client.user.isRoot) {
+      Logger.error(`[BackupManager] Non-Root user attempting to create backup`)
+      socket.emit('backup_complete', false)
+      return
+    }
+
+    var backupSuccess = await this.runBackup()
+    socket.emit('backup_complete', backupSuccess ? this.backups.map(b => b.toJSON()) : false)
+  }
+
+  async requestApplyBackup(socket, id) {
+    // Only Root User allowed
+    var client = socket.sheepClient
+    if (!client || !client.user) {
+      Logger.error(`[BackupManager] Invalid user attempting to create backup`)
+      socket.emit('apply_backup_complete', false)
+      return
+    } else if (!client.user.isRoot) {
+      Logger.error(`[BackupManager] Non-Root user attempting to create backup`)
+      socket.emit('apply_backup_complete', false)
+      return
+    }
+
+    var backup = this.backups.find(b => b.id === id)
+    if (!backup) {
+      socket.emit('apply_backup_complete', false)
+      return
+    }
+    const zip = new StreamZip.async({ file: backup.fullPath })
+    await zip.extract('config/', this.db.ConfigPath)
+    if (backup.backupMetadataCovers) {
+      var metadataBooksPath = Path.join(this.MetadataPath, 'books')
+      await zip.extract('metadata-books/', metadataBooksPath)
+    }
+    await this.db.reinit()
+    socket.emit('apply_backup_complete', true)
+    socket.broadcast.emit('backup_applied')
+  }
+
+  async setLastBackup() {
+    this.backups.sort((a, b) => b.createdAt - a.createdAt)
+    var lastBackup = this.backups.shift()
+
+    const zip = new StreamZip.async({ file: lastBackup.fullPath })
+    await zip.extract('config/', this.db.ConfigPath)
+    console.log('Set Last Backup')
+    await this.db.reinit()
+  }
+
+  async loadBackups() {
+    try {
+      var filesInDir = await fs.readdir(this.BackupPath)
+      for (let i = 0; i < filesInDir.length; i++) {
+        var filename = filesInDir[i]
+        if (filename.endsWith('.audiobookshelf')) {
+          var fullFilePath = Path.join(this.BackupPath, filename)
+          const zip = new StreamZip.async({ file: fullFilePath })
+          const data = await zip.entryData('details')
+          var details = data.toString('utf8').split('\n')
+
+          var backup = new Backup({ details, fullPath: fullFilePath })
+          backup.fileSize = await getFileSize(backup.fullPath)
+          var existingBackupWithId = this.backups.find(b => b.id === backup.id)
+          if (existingBackupWithId) {
+            Logger.warn(`[BackupManager] Backup already loaded with id ${backup.id} - ignoring`)
+          } else {
+            this.backups.push(backup)
+          }
+
+
+          Logger.debug(`[BackupManager] Backup found "${backup.id}"`)
+          zip.close()
+        }
+      }
+      Logger.info(`[BackupManager] ${this.backups.length} Backups Found`)
+    } catch (error) {
+      Logger.error('[BackupManager] Failed to load backups', error)
+    }
+  }
+
+  async runBackup() {
+    // Check if Metadata Path is inside Config Path (otherwise there will be an infinite loop as the archiver tries to zip itself)
+    Logger.info(`[BackupManager] Running Backup`)
+    var metadataBooksPath = this.serverSettings.backupMetadataCovers ? Path.join(this.MetadataPath, 'books') : null
+
+    var newBackup = new Backup()
+
+    const newBackData = {
+      backupMetadataCovers: this.serverSettings.backupMetadataCovers,
+      backupDirPath: this.BackupPath
+    }
+    newBackup.setData(newBackData)
+
+    var zipResult = await this.zipBackup(this.db.ConfigPath, metadataBooksPath, newBackup).then(() => true).catch((error) => {
+      Logger.error(`[BackupManager] Backup Failed ${error}`)
+      return false
+    })
+    if (zipResult) {
+      Logger.info(`[BackupManager] Backup successful ${newBackup.id}`)
+      await filePerms(newBackup.fullPath, 0o774, this.Uid, this.Gid)
+      newBackup.fileSize = await getFileSize(newBackup.fullPath)
+      var existingIndex = this.backups.findIndex(b => b.id === newBackup.id)
+      if (existingIndex >= 0) {
+        this.backups.splice(existingIndex, 1, newBackup)
+      } else {
+        this.backups.push(newBackup)
+      }
+
+      // Check remove oldest backup
+      if (this.backups.length > this.serverSettings.backupsToKeep) {
+        this.backups.sort((a, b) => a.createdAt - b.createdAt)
+
+        var oldBackup = this.backups.shift()
+        Logger.debug(`[BackupManager] Removing old backup ${oldBackup.id}`)
+        this.removeBackup(oldBackup)
+      }
+      return true
+    } else {
+      return false
+    }
+  }
+
+  async removeBackup(backup) {
+    try {
+      Logger.debug(`[BackupManager] Removing Backup "${backup.fullPath}"`)
+      await fs.remove(backup.fullPath)
+      this.backups = this.backups.filter(b => b.id !== backup.id)
+      Logger.info(`[BackupManager] Backup "${backup.id}" Removed`)
+    } catch (error) {
+      Logger.error(`[BackupManager] Failed to remove backup`, error)
+    }
+  }
+
+  zipBackup(configPath, metadataBooksPath, backup) {
+    return new Promise((resolve, reject) => {
+      // create a file to stream archive data to
+      const output = fs.createWriteStream(backup.fullPath)
+      const archive = archiver('zip', {
+        zlib: { level: 9 } // Sets the compression level.
+      })
+
+      // listen for all archive data to be written
+      // 'close' event is fired only when a file descriptor is involved
+      output.on('close', () => {
+        Logger.info('[BackupManager]', archive.pointer() + ' total bytes')
+        resolve()
+      })
+
+      // This event is fired when the data source is drained no matter what was the data source.
+      // It is not part of this library but rather from the NodeJS Stream API.
+      // @see: https://nodejs.org/api/stream.html#stream_event_end
+      output.on('end', () => {
+        Logger.debug('Data has been drained')
+      })
+
+      output.on('finish', () => {
+        Logger.debug('Write Stream Finished')
+      })
+
+      output.on('error', (err) => {
+        Logger.debug('Write Stream Error', err)
+        reject(err)
+      })
+
+      // good practice to catch warnings (ie stat failures and other non-blocking errors)
+      archive.on('warning', function (err) {
+        if (err.code === 'ENOENT') {
+          // log warning
+          Logger.warn(`[BackupManager] Archiver warning: ${err.message}`)
+        } else {
+          // throw error
+          Logger.error(`[BackupManager] Archiver error: ${err.message}`)
+          // throw err
+          reject(err)
+        }
+      })
+      archive.on('error', function (err) {
+        Logger.error(`[BackupManager] Archiver error: ${err.message}`)
+        reject(err)
+      })
+      archive.on('progress', ({ fs: fsobj }) => {
+        if (fsobj.processedBytes > this.MaxBytesBeforeAbort) {
+          Logger.error(`[BackupManager] Archiver is too large - aborting to prevent endless loop, Bytes Processed: ${fsobj.processedBytes}`)
+          archive.abort()
+          setTimeout(() => {
+            this.removeBackup(backup)
+            output.destroy('Backup too large') // Promise is reject in write stream error evt
+          }, 500)
+        }
+      })
+
+      // pipe archive data to the file
+      archive.pipe(output)
+
+      archive.directory(configPath, 'config')
+      if (metadataBooksPath) {
+        Logger.debug(`[BackupManager] Backing up Metadata Books "${metadataBooksPath}"`)
+        archive.directory(metadataBooksPath, 'metadata-books')
+      }
+      archive.append(backup.detailsString, { name: 'details' })
+
+      archive.finalize()
+    })
+  }
+}
+module.exports = BackupManager

server/BookFinder.js

@@ -7,6 +7,8 @@ class BookFinder {
   constructor() {
     this.openLibrary = new OpenLibrary()
     this.libGen = new LibGen()
+
+    this.verbose = false
   }
 
   async findByISBN(isbn) {
@@ -92,17 +94,17 @@ class BookFinder {
       return b
     }).filter(b => {
       if (b.includesTitle) { // If search title was found in result title then skip over leven distance check
-        Logger.debug(`Exact title was included in "${b.title}", Search: "${b.includesTitle}"`)
+        if (this.verbose) Logger.debug(`Exact title was included in "${b.title}", Search: "${b.includesTitle}"`)
       } else if (b.titleDistance > maxTitleDistance) {
-        Logger.debug(`Filtering out search result title distance = ${b.titleDistance}: "${b.cleanedTitle}"/"${searchTitle}"`)
+        if (this.verbose) Logger.debug(`Filtering out search result title distance = ${b.titleDistance}: "${b.cleanedTitle}"/"${searchTitle}"`)
         return false
       }
 
       if (author) {
         if (b.includesAuthor) { // If search author was found in result author then skip over leven distance check
-          Logger.debug(`Exact author was included in "${b.author}", Search: "${b.includesAuthor}"`)
+          if (this.verbose) Logger.debug(`Exact author was included in "${b.author}", Search: "${b.includesAuthor}"`)
         } else if (b.authorDistance > maxAuthorDistance) {
-          Logger.debug(`Filtering out search result "${b.author}", author distance = ${b.authorDistance}: "${b.author}"/"${author}"`)
+          if (this.verbose) Logger.debug(`Filtering out search result "${b.author}", author distance = ${b.authorDistance}: "${b.author}"/"${author}"`)
           return false
         }
       }
@@ -115,28 +117,28 @@ class BookFinder {
 
   async getLibGenResults(title, author, maxTitleDistance, maxAuthorDistance) {
     var books = await this.libGen.search(title)
-    Logger.debug(`LibGen Book Search Results: ${books.length || 0}`)
+    if (this.verbose) Logger.debug(`LibGen Book Search Results: ${books.length || 0}`)
     if (books.errorCode) {
       Logger.error(`LibGen Search Error ${books.errorCode}`)
       return []
     }
     var booksFiltered = this.filterSearchResults(books, title, author, maxTitleDistance, maxAuthorDistance)
     if (!booksFiltered.length && books.length) {
-      Logger.debug(`Search has ${books.length} matches, but no close title matches`)
+      if (this.verbose) Logger.debug(`Search has ${books.length} matches, but no close title matches`)
     }
     return booksFiltered
   }
 
   async getOpenLibResults(title, author, maxTitleDistance, maxAuthorDistance) {
     var books = await this.openLibrary.searchTitle(title)
-    Logger.debug(`OpenLib Book Search Results: ${books.length || 0}`)
+    if (this.verbose) Logger.debug(`OpenLib Book Search Results: ${books.length || 0}`)
     if (books.errorCode) {
       Logger.error(`OpenLib Search Error ${books.errorCode}`)
       return []
     }
     var booksFiltered = this.filterSearchResults(books, title, author, maxTitleDistance, maxAuthorDistance)
     if (!booksFiltered.length && books.length) {
-      Logger.debug(`Search has ${books.length} matches, but no close title matches`)
+      if (this.verbose) Logger.debug(`Search has ${books.length} matches, but no close title matches`)
     }
     return booksFiltered
   }
@@ -145,7 +147,7 @@ class BookFinder {
     var books = []
     var maxTitleDistance = !isNaN(options.titleDistance) ? Number(options.titleDistance) : 4
     var maxAuthorDistance = !isNaN(options.authorDistance) ? Number(options.authorDistance) : 4
-    Logger.debug(`Book Search, title: "${title}", author: "${author}", provider: ${provider}`)
+    Logger.debug(`Cover Search: title: "${title}", author: "${author}", provider: ${provider}`)
 
     if (provider === 'libgen') {
       books = await this.getLibGenResults(title, author, maxTitleDistance, maxAuthorDistance)

server/CoverController.js

@@ -0,0 +1,184 @@
+const fs = require('fs-extra')
+const Path = require('path')
+const axios = require('axios')
+const Logger = require('./Logger')
+const readChunk = require('read-chunk')
+const imageType = require('image-type')
+
+const globals = require('./utils/globals')
+const { CoverDestination } = require('./utils/constants')
+
+class CoverController {
+  constructor(db, MetadataPath, AudiobookPath) {
+    this.db = db
+    this.MetadataPath = MetadataPath
+    this.BookMetadataPath = Path.join(this.MetadataPath, 'books')
+    this.AudiobookPath = AudiobookPath
+  }
+
+  getCoverDirectory(audiobook) {
+    if (this.db.serverSettings.coverDestination === CoverDestination.AUDIOBOOK) {
+      return {
+        fullPath: audiobook.fullPath,
+        relPath: '/s/book/' + audiobook.id
+      }
+    } else {
+      return {
+        fullPath: Path.join(this.BookMetadataPath, audiobook.id),
+        relPath: Path.join('/metadata', 'books', audiobook.id)
+      }
+    }
+  }
+
+  getFilesInDirectory(dir) {
+    try {
+      return fs.readdir(dir)
+    } catch (error) {
+      Logger.error(`[CoverController] Failed to get files in dir ${dir}`, error)
+      return []
+    }
+  }
+
+  removeFile(filepath) {
+    try {
+      return fs.pathExists(filepath).then((exists) => {
+        if (!exists) Logger.warn(`[CoverController] Attempting to remove file that does not exist ${filepath}`)
+        return exists ? fs.unlink(filepath) : false
+      })
+    } catch (error) {
+      Logger.error(`[CoverController] Failed to remove file "${filepath}"`, error)
+      return false
+    }
+  }
+
+  // Remove covers that dont have the same filename as the new cover
+  async removeOldCovers(dirpath, newCoverExt) {
+    var filesInDir = await this.getFilesInDirectory(dirpath)
+
+    for (let i = 0; i < filesInDir.length; i++) {
+      var file = filesInDir[i]
+      var _extname = Path.extname(file)
+      var _filename = Path.basename(file, _extname)
+      if (_filename === 'cover' && _extname !== newCoverExt) {
+        var filepath = Path.join(dirpath, file)
+        Logger.debug(`[CoverController] Removing old cover from metadata "${filepath}"`)
+        await this.removeFile(filepath)
+      }
+    }
+  }
+
+  async checkFileIsValidImage(imagepath) {
+    const buffer = await readChunk(imagepath, 0, 12)
+    const imgType = imageType(buffer)
+    if (!imgType) {
+      await this.removeFile(imagepath)
+      return {
+        error: 'Invalid image'
+      }
+    }
+
+    if (!globals.SupportedImageTypes.includes(imgType.ext)) {
+      await this.removeFile(imagepath)
+      return {
+        error: `Invalid image type ${imgType.ext} (Supported: ${globals.SupportedImageTypes.join(',')})`
+      }
+    }
+    return imgType
+  }
+
+  async uploadCover(audiobook, coverFile) {
+    var extname = Path.extname(coverFile.name.toLowerCase())
+    if (!extname || !globals.SupportedImageTypes.includes(extname.slice(1))) {
+      return {
+        error: `Invalid image type ${extname} (Supported: ${globals.SupportedImageTypes.join(',')})`
+      }
+    }
+
+    var { fullPath, relPath } = this.getCoverDirectory(audiobook)
+    await fs.ensureDir(fullPath)
+
+    var coverFilename = `cover${extname}`
+    var coverFullPath = Path.join(fullPath, coverFilename)
+    var coverPath = Path.join(relPath, coverFilename)
+
+    // Move cover from temp upload dir to destination
+    var success = await coverFile.mv(coverFullPath).then(() => true).catch((error) => {
+      Logger.error('[CoverController] Failed to move cover file', path, error)
+      return false
+    })
+
+    if (!success) {
+      return {
+        error: 'Failed to move cover into destination'
+      }
+    }
+
+    await this.removeOldCovers(fullPath, extname)
+
+    Logger.info(`[CoverController] Uploaded audiobook cover "${coverPath}" for "${audiobook.title}"`)
+
+    audiobook.updateBookCover(coverPath, coverFullPath)
+    return {
+      cover: coverPath
+    }
+  }
+
+  async downloadFile(url, filepath) {
+    Logger.debug(`[CoverController] Starting file download to ${filepath}`)
+    const writer = fs.createWriteStream(filepath)
+    const response = await axios({
+      url,
+      method: 'GET',
+      responseType: 'stream'
+    })
+    response.data.pipe(writer)
+    return new Promise((resolve, reject) => {
+      writer.on('finish', resolve)
+      writer.on('error', reject)
+    })
+  }
+
+  async downloadCoverFromUrl(audiobook, url) {
+    try {
+      var { fullPath, relPath } = this.getCoverDirectory(audiobook)
+      await fs.ensureDir(fullPath)
+
+      var temppath = Path.join(fullPath, 'cover')
+      var success = await this.downloadFile(url, temppath).then(() => true).catch((err) => {
+        Logger.error(`[CoverController] Download image file failed for "${url}"`, err)
+        return false
+      })
+      if (!success) {
+        return {
+          error: 'Failed to download image from url'
+        }
+      }
+
+      var imgtype = await this.checkFileIsValidImage(temppath)
+
+      if (imgtype.error) {
+        return imgtype
+      }
+
+      var coverFilename = `cover.${imgtype.ext}`
+      var coverPath = Path.join(relPath, coverFilename)
+      var coverFullPath = Path.join(fullPath, coverFilename)
+      await fs.rename(temppath, coverFullPath)
+
+      await this.removeOldCovers(fullPath, '.' + imgtype.ext)
+
+      Logger.info(`[CoverController] Downloaded audiobook cover "${coverPath}" from url "${url}" for "${audiobook.title}"`)
+
+      audiobook.updateBookCover(coverPath, coverFullPath)
+      return {
+        cover: coverPath
+      }
+    } catch (error) {
+      Logger.error(`[CoverController] Fetch cover image from url "${url}" failed`, error)
+      return {
+        error: 'Failed to fetch image from url'
+      }
+    }
+  }
+}
+module.exports = CoverController

server/Db.js

@@ -4,20 +4,25 @@ const jwt = require('jsonwebtoken')
 const Logger = require('./Logger')
 const Audiobook = require('./objects/Audiobook')
 const User = require('./objects/User')
+const Library = require('./objects/Library')
 const ServerSettings = require('./objects/ServerSettings')
 
 class Db {
-  constructor(CONFIG_PATH) {
-    this.ConfigPath = CONFIG_PATH
-    this.AudiobooksPath = Path.join(CONFIG_PATH, 'audiobooks')
-    this.UsersPath = Path.join(CONFIG_PATH, 'users')
-    this.SettingsPath = Path.join(CONFIG_PATH, 'settings')
+  constructor(ConfigPath, AudiobookPath) {
+    this.ConfigPath = ConfigPath
+    this.AudiobookPath = AudiobookPath
+    this.AudiobooksPath = Path.join(ConfigPath, 'audiobooks')
+    this.UsersPath = Path.join(ConfigPath, 'users')
+    this.LibrariesPath = Path.join(ConfigPath, 'libraries')
+    this.SettingsPath = Path.join(ConfigPath, 'settings')
 
     this.audiobooksDb = new njodb.Database(this.AudiobooksPath)
     this.usersDb = new njodb.Database(this.UsersPath)
+    this.librariesDb = new njodb.Database(this.LibrariesPath, { datastores: 2 })
     this.settingsDb = new njodb.Database(this.SettingsPath, { datastores: 2 })
 
     this.users = []
+    this.libraries = []
     this.audiobooks = []
     this.settings = []
 
@@ -27,18 +32,14 @@ class Db {
   getEntityDb(entityName) {
     if (entityName === 'user') return this.usersDb
     else if (entityName === 'audiobook') return this.audiobooksDb
+    else if (entityName === 'library') return this.librariesDb
     return this.settingsDb
   }
 
-  getEntityDbKey(entityName) {
-    if (entityName === 'user') return 'usersDb'
-    else if (entityName === 'audiobook') return 'audiobooksDb'
-    return 'settingsDb'
-  }
-
   getEntityArrayKey(entityName) {
     if (entityName === 'user') return 'users'
     else if (entityName === 'audiobook') return 'audiobooks'
+    else if (entityName === 'library') return 'libraries'
     return 'settings'
   }
 
@@ -46,7 +47,6 @@ class Db {
     return new User({
       id: 'root',
       type: 'root',
-
       username: 'root',
       pash: '',
       stream: null,
@@ -56,6 +56,28 @@ class Db {
     })
   }
 
+  getDefaultLibrary() {
+    var defaultLibrary = new Library()
+    defaultLibrary.setData({
+      id: 'main',
+      name: 'Main',
+      folder: { // Generates default folder
+        id: 'audiobooks',
+        fullPath: this.AudiobookPath,
+        libraryId: 'main'
+      }
+    })
+    return defaultLibrary
+  }
+
+  reinit() {
+    this.audiobooksDb = new njodb.Database(this.AudiobooksPath)
+    this.usersDb = new njodb.Database(this.UsersPath)
+    this.librariesDb = new njodb.Database(this.LibrariesPath, { datastores: 2 })
+    this.settingsDb = new njodb.Database(this.SettingsPath, { datastores: 2 })
+    return this.init()
+  }
+
   async init() {
     await this.load()
 
@@ -63,25 +85,33 @@ class Db {
     if (!this.users.find(u => u.type === 'root')) {
       var token = await jwt.sign({ userId: 'root' }, process.env.TOKEN_SECRET)
       Logger.debug('Generated default token', token)
-      await this.insertUser(this.getDefaultUser(token))
+      await this.insertEntity('user', this.getDefaultUser(token))
+    }
+
+    if (!this.libraries.length) {
+      await this.insertEntity('library', this.getDefaultLibrary())
     }
 
     if (!this.serverSettings) {
       this.serverSettings = new ServerSettings()
-      await this.insertSettings(this.serverSettings)
+      await this.insertEntity('settings', this.serverSettings)
     }
   }
 
   async load() {
     var p1 = this.audiobooksDb.select(() => true).then((results) => {
       this.audiobooks = results.data.map(a => new Audiobook(a))
-      Logger.info(`[DB] Audiobooks Loaded ${this.audiobooks.length}`)
+      Logger.info(`[DB] ${this.audiobooks.length} Audiobooks Loaded`)
     })
     var p2 = this.usersDb.select(() => true).then((results) => {
       this.users = results.data.map(u => new User(u))
-      Logger.info(`[DB] Users Loaded ${this.users.length}`)
+      Logger.info(`[DB] ${this.users.length} Users Loaded`)
     })
-    var p3 = this.settingsDb.select(() => true).then((results) => {
+    var p3 = this.librariesDb.select(() => true).then((results) => {
+      this.libraries = results.data.map(l => new Library(l))
+      Logger.info(`[DB] ${this.libraries.length} Libraries Loaded`)
+    })
+    var p4 = this.settingsDb.select(() => true).then((results) => {
       if (results.data && results.data.length) {
         this.settings = results.data
         var serverSettings = this.settings.find(s => s.id === 'server-settings')
@@ -90,30 +120,21 @@ class Db {
         }
       }
     })
-    await Promise.all([p1, p2, p3])
+    await Promise.all([p1, p2, p3, p4])
   }
 
-  insertSettings(settings) {
-    return this.settingsDb.insert([settings]).then((results) => {
-      Logger.debug(`[DB] Inserted ${results.inserted} settings`)
-      this.settings = this.settings.concat(settings)
-    }).catch((error) => {
-      Logger.error(`[DB] Insert settings Failed ${error}`)
-    })
-  }
+  // insertAudiobook(audiobook) {
+  //   return this.insertAudiobooks([audiobook])
+  // }
 
-  insertAudiobook(audiobook) {
-    return this.insertAudiobooks([audiobook])
-  }
-
-  insertAudiobooks(audiobooks) {
-    return this.audiobooksDb.insert(audiobooks).then((results) => {
-      Logger.debug(`[DB] Inserted ${results.inserted} audiobooks`)
-      this.audiobooks = this.audiobooks.concat(audiobooks)
-    }).catch((error) => {
-      Logger.error(`[DB] Insert audiobooks Failed ${error}`)
-    })
-  }
+  // insertAudiobooks(audiobooks) {
+  //   return this.audiobooksDb.insert(audiobooks).then((results) => {
+  //     Logger.debug(`[DB] Inserted ${results.inserted} audiobooks`)
+  //     this.audiobooks = this.audiobooks.concat(audiobooks)
+  //   }).catch((error) => {
+  //     Logger.error(`[DB] Insert audiobooks Failed ${error}`)
+  //   })
+  // }
 
   updateAudiobook(audiobook) {
     return this.audiobooksDb.update((record) => record.id === audiobook.id, () => audiobook).then((results) => {
@@ -125,16 +146,25 @@ class Db {
     })
   }
 
-  insertUser(user) {
-    return this.usersDb.insert([user]).then((results) => {
-      Logger.debug(`[DB] Inserted user ${results.inserted}`)
-      this.users.push(user)
-      return true
-    }).catch((error) => {
-      Logger.error(`[DB] Insert user Failed ${error}`)
-      return false
-    })
-  }
+  // insertUser(user) {
+  //   return this.usersDb.insert([user]).then((results) => {
+  //     Logger.debug(`[DB] Inserted user ${results.inserted}`)
+  //     this.users.push(user)
+  //     return true
+  //   }).catch((error) => {
+  //     Logger.error(`[DB] Insert user Failed ${error}`)
+  //     return false
+  //   })
+  // }
+
+  // insertSettings(settings) {
+  //   return this.settingsDb.insert([settings]).then((results) => {
+  //     Logger.debug(`[DB] Inserted ${results.inserted} settings`)
+  //     this.settings = this.settings.concat(settings)
+  //   }).catch((error) => {
+  //     Logger.error(`[DB] Insert settings Failed ${error}`)
+  //   })
+  // }
 
   updateUserStream(userId, streamId) {
     return this.usersDb.update((record) => record.id === userId, (user) => {
@@ -153,6 +183,20 @@ class Db {
     })
   }
 
+  insertEntity(entityName, entity) {
+    var entityDb = this.getEntityDb(entityName)
+    return entityDb.insert([entity]).then((results) => {
+      Logger.debug(`[DB] Inserted ${results.inserted} ${entityName}`)
+
+      var arrayKey = this.getEntityArrayKey(entityName)
+      this[arrayKey].push(entity)
+      return true
+    }).catch((error) => {
+      Logger.error(`[DB] Failed to insert ${entityName}`, error)
+      return false
+    })
+  }
+
   updateEntity(entityName, entity) {
     var entityDb = this.getEntityDb(entityName)
     return entityDb.update((record) => record.id === entity.id, () => entity).then((results) => {

server/DownloadManager.js

@@ -240,8 +240,8 @@ class DownloadManager {
     }
 
     if (shouldIncludeCover) {
-      var _cover = audiobook.book.cover
-      if (_cover.startsWith(Path.sep + 'local')) {
+      var _cover = audiobook.book.coverFullPath
+      if (!_cover && audiobook.book.cover && audiobook.book.cover.startsWith(Path.sep + 'local')) {
         _cover = Path.join(this.AudiobookPath, _cover.replace(Path.sep + 'local', ''))
         Logger.debug('Local cover url', _cover)
       }

server/EbookReader.js

@@ -1,42 +0,0 @@
-// const express = require('express')
-// const EPub = require('epub')
-// const Logger = require('./Logger')
-
-// class EbookReader {
-//   constructor(db, MetadataPath, AudiobookPath) {
-//     this.db = db
-//     this.MetadataPath = MetadataPath
-//     this.AudiobookPath = AudiobookPath
-
-//     this.router = express()
-//     this.init()
-//   }
-
-//   init() {
-//     this.router.get('/open/:id/:ino', this.openRequest.bind(this))
-//   }
-
-//   openRequest(req, res) {
-//     Logger.info('Open request received', req.params)
-//     var audiobookId = req.params.id
-//     var fileIno = req.params.ino
-//     var audiobook = this.db.audiobooks.find(ab => ab.id === audiobookId)
-//     if (!audiobook) {
-//       return res.sendStatus(404)
-//     }
-//     var ebook = audiobook.ebooks.find(eb => eb.ino === fileIno)
-//     if (!ebook) {
-//       Logger.error('Ebook file not found', fileIno)
-//       return res.sendStatus(404)
-//     }
-//     Logger.info('Ebook found', ebook)
-//     this.open(ebook.fullPath)
-//     res.sendStatus(200)
-//   }
-
-//   open(path) {
-//     var epub = new EPub(path)
-//     console.log('epub', epub)
-//   }
-// }
-// module.exports = EbookReader

server/Scanner.js

@@ -1,24 +1,32 @@
 const fs = require('fs-extra')
 const Path = require('path')
+
+// Utils
 const Logger = require('./Logger')
-const BookFinder = require('./BookFinder')
-const Audiobook = require('./objects/Audiobook')
+const { version } = require('../package.json')
 const audioFileScanner = require('./utils/audioFileScanner')
 const { groupFilesIntoAudiobookPaths, getAudiobookFileData, scanRootDir } = require('./utils/scandir')
 const { comparePaths, getIno } = require('./utils/index')
 const { secondsToTimestamp } = require('./utils/fileUtils')
 const { ScanResult, CoverDestination } = require('./utils/constants')
 
+// Classes
+const BookFinder = require('./BookFinder')
+const Audiobook = require('./objects/Audiobook')
+
 class Scanner {
-  constructor(AUDIOBOOK_PATH, METADATA_PATH, db, emitter) {
+  constructor(AUDIOBOOK_PATH, METADATA_PATH, db, coverController, emitter) {
     this.AudiobookPath = AUDIOBOOK_PATH
     this.MetadataPath = METADATA_PATH
     this.BookMetadataPath = Path.join(this.MetadataPath, 'books')
 
     this.db = db
+    this.coverController = coverController
     this.emitter = emitter
 
     this.cancelScan = false
+    this.cancelLibraryScan = {}
+    this.librariesScanning = []
 
     this.bookFinder = new BookFinder()
   }
@@ -31,7 +39,7 @@ class Scanner {
     if (this.db.serverSettings.coverDestination === CoverDestination.AUDIOBOOK) {
       return {
         fullPath: audiobook.fullPath,
-        relPath: Path.join('/local', audiobook.path)
+        relPath: '/s/book/' + audiobook.id
       }
     } else {
       return {
@@ -60,162 +68,233 @@ class Scanner {
     return audiobookDataAudioFiles.filter(abdFile => !!abdFile.ino)
   }
 
-  async scanAudiobookData(audiobookData, forceAudioFileScan = false) {
-    var existingAudiobook = this.audiobooks.find(a => a.ino === audiobookData.ino)
-    // Logger.debug(`[Scanner] Scanning "${audiobookData.title}" (${audiobookData.ino}) - ${!!existingAudiobook ? 'Exists' : 'New'}`)
+  // Only updates audio files with matching paths
+  syncAudiobookInodeValues(audiobook, { audioFiles, otherFiles }) {
+    var filesUpdated = 0
 
-    if (existingAudiobook) {
-
-      // TEMP: Check if is older audiobook and needs force rescan
-      if (!forceAudioFileScan && existingAudiobook.checkNeedsAudioFileRescan()) {
-        Logger.info(`[Scanner] Re-Scanning all audio files for "${existingAudiobook.title}" (last scan <= 1.3.0)`)
-        forceAudioFileScan = true
-      }
-
-
-      // REMOVE: No valid audio files
-      // TODO: Label as incomplete, do not actually delete
-      if (!audiobookData.audioFiles.length) {
-        Logger.error(`[Scanner] "${existingAudiobook.title}" no valid audio files found - removing audiobook`)
-
-        await this.db.removeEntity('audiobook', existingAudiobook.id)
-        this.emitter('audiobook_removed', existingAudiobook.toJSONMinified())
-
-        return ScanResult.REMOVED
-      }
-
-      // ino is now set for every file in scandir
-      audiobookData.audioFiles = audiobookData.audioFiles.filter(af => af.ino)
-
-      // Check for audio files that were removed
-      var abdAudioFileInos = audiobookData.audioFiles.map(af => af.ino)
-      var removedAudioFiles = existingAudiobook.audioFiles.filter(file => !abdAudioFileInos.includes(file.ino))
-      if (removedAudioFiles.length) {
-        Logger.info(`[Scanner] ${removedAudioFiles.length} audio files removed for audiobook "${existingAudiobook.title}"`)
-        removedAudioFiles.forEach((af) => existingAudiobook.removeAudioFile(af))
-      }
-
-      // Check for mismatched audio tracks - tracks with no matching audio file
-      var removedAudioTracks = existingAudiobook.tracks.filter(track => !abdAudioFileInos.includes(track.ino))
-      if (removedAudioTracks.length) {
-        Logger.info(`[Scanner] ${removedAudioTracks.length} tracks removed no matching audio file for audiobook "${existingAudiobook.title}"`)
-        removedAudioTracks.forEach((at) => existingAudiobook.removeAudioTrack(at))
-      }
-
-      // Check for new audio files and sync existing audio files
-      var newAudioFiles = []
-      var hasUpdatedAudioFiles = false
-      audiobookData.audioFiles.forEach((file) => {
-        var existingAudioFile = existingAudiobook.getAudioFileByIno(file.ino)
-        if (existingAudioFile) { // Audio file exists, sync paths
-          if (existingAudiobook.syncAudioFile(existingAudioFile, file)) {
-            hasUpdatedAudioFiles = true
-          }
+    // Sync audio files & audio tracks with updated inodes
+    audiobook._audioFiles.forEach((audioFile) => {
+      var matchingAudioFile = audioFiles.find(af => af.ino !== audioFile.ino && af.path === audioFile.path)
+      if (matchingAudioFile) {
+        // Audio Track should always have the same ino as the equivalent audio file (not all audio files have a track)
+        var audioTrack = audiobook.tracks.find(t => t.ino === audioFile.ino)
+        if (audioTrack) {
+          Logger.debug(`[Scanner] Found audio file & track with mismatched inode "${audioFile.filename}" - updating it`)
+          audioTrack.ino = matchingAudioFile.ino
+          filesUpdated++
         } else {
-          var audioFileWithMatchingPath = existingAudiobook.getAudioFileByPath(file.fullPath)
-          if (audioFileWithMatchingPath) {
-            Logger.warn(`[Scanner] Audio file with path already exists with different inode, New: "${file.filename}" (${file.ino}) | Existing: ${audioFileWithMatchingPath.filename} (${audioFileWithMatchingPath.ino})`)
-          } else {
-            newAudioFiles.push(file)
-          }
+          Logger.debug(`[Scanner] Found audio file with mismatched inode "${audioFile.filename}" - updating it`)
         }
-      })
 
-      // Rescan audio file metadata
-      if (forceAudioFileScan) {
-        Logger.info(`[Scanner] Rescanning ${existingAudiobook.audioFiles.length} audio files for "${existingAudiobook.title}"`)
-        var numAudioFilesUpdated = await audioFileScanner.rescanAudioFiles(existingAudiobook)
-        if (numAudioFilesUpdated > 0) {
-          Logger.info(`[Scanner] Rescan complete, ${numAudioFilesUpdated} audio files were updated for "${existingAudiobook.title}"`)
-          hasUpdatedAudioFiles = true
+        audioFile.ino = matchingAudioFile.ino
+        filesUpdated++
+      }
+    })
 
-          // Use embedded cover art if audiobook has no cover
-          if (existingAudiobook.hasEmbeddedCoverArt && !existingAudiobook.cover) {
-            var outputCoverDirs = this.getCoverDirectory(existingAudiobook)
-            var relativeDir = await existingAudiobook.saveEmbeddedCoverArt(outputCoverDirs.fullPath, outputCoverDirs.relPath)
-            if (relativeDir) {
-              Logger.debug(`[Scanner] Saved embedded cover art "${relativeDir}"`)
-            }
-          }
+    // Sync other files with updated inodes
+    audiobook._otherFiles.forEach((otherFile) => {
+      var matchingOtherFile = otherFiles.find(of => of.ino !== otherFile.ino && of.path === otherFile.path)
+      if (matchingOtherFile) {
+        Logger.debug(`[Scanner] Found other file with mismatched inode "${otherFile.filename}" - updating it`)
+        otherFile.ino = matchingOtherFile.ino
+        filesUpdated++
+      }
+    })
+
+    return filesUpdated
+  }
+
+  async searchForCover(audiobook) {
+    var options = {
+      titleDistance: 2,
+      authorDistance: 2
+    }
+    var results = await this.bookFinder.findCovers('openlibrary', audiobook.title, audiobook.author, options)
+    if (results.length) {
+      Logger.debug(`[Scanner] Found best cover for "${audiobook.title}"`)
+
+      // If the first cover result fails, attempt to download the second
+      for (let i = 0; i < results.length && i < 2; i++) {
+
+        // Downloads and updates the book cover
+        var result = await this.coverController.downloadCoverFromUrl(audiobook, results[i])
+
+        if (result.error) {
+          Logger.error(`[Scanner] Failed to download cover from url "${results[i]}" | Attempt ${i + 1}`, result.error)
         } else {
-          Logger.info(`[Scanner] Rescan complete, audio files were up to date for "${existingAudiobook.title}"`)
+          return true
         }
       }
+    }
+    return false
+  }
 
-      // Scan and add new audio files found and set tracks
-      if (newAudioFiles.length) {
-        Logger.info(`[Scanner] ${newAudioFiles.length} new audio files were found for audiobook "${existingAudiobook.title}"`)
-        await audioFileScanner.scanAudioFiles(existingAudiobook, newAudioFiles)
-      }
-
-      // If after a scan no valid audio tracks remain
-      // TODO: Label as incomplete, do not actually delete
-      if (!existingAudiobook.tracks.length) {
-        Logger.error(`[Scanner] "${existingAudiobook.title}" has no valid tracks after update - removing audiobook`)
-
-        await this.db.removeEntity('audiobook', existingAudiobook.id)
-        this.emitter('audiobook_removed', existingAudiobook.toJSONMinified())
-        return ScanResult.REMOVED
-      }
-
-      var hasUpdates = removedAudioFiles.length || removedAudioTracks.length || newAudioFiles.length || hasUpdatedAudioFiles
-
-      // Check that audio tracks are in sequential order with no gaps
-      if (existingAudiobook.checkUpdateMissingParts()) {
-        Logger.info(`[Scanner] "${existingAudiobook.title}" missing parts updated`)
-        hasUpdates = true
-      }
-
-      // Sync other files (all files that are not audio files)
-      var otherFilesUpdated = await existingAudiobook.syncOtherFiles(audiobookData.otherFiles, forceAudioFileScan)
-      if (otherFilesUpdated) {
-        hasUpdates = true
-      }
-
-      // Syncs path and fullPath
-      if (existingAudiobook.syncPaths(audiobookData)) {
-        hasUpdates = true
-      }
-
-      if (existingAudiobook.isMissing) {
-        existingAudiobook.isMissing = false
-        hasUpdates = true
-        Logger.info(`[Scanner] "${existingAudiobook.title}" was missing but now it is found`)
-      }
-
-      if (hasUpdates) {
-        existingAudiobook.setChapters()
-
-        Logger.info(`[Scanner] "${existingAudiobook.title}" was updated - saving`)
-        existingAudiobook.lastUpdate = Date.now()
-        await this.db.updateAudiobook(existingAudiobook)
-        this.emitter('audiobook_updated', existingAudiobook.toJSONMinified())
-
-        return ScanResult.UPDATED
-      }
-
-      return ScanResult.UPTODATE
+  async scanExistingAudiobook(existingAudiobook, audiobookData, hasUpdatedIno, hasUpdatedLibraryOrFolder, forceAudioFileScan) {
+    // Always sync files and inode values
+    var filesInodeUpdated = this.syncAudiobookInodeValues(existingAudiobook, audiobookData)
+    if (hasUpdatedIno || filesInodeUpdated > 0) {
+      Logger.info(`[Scanner] Updating inode value for "${existingAudiobook.title}" - ${filesInodeUpdated} files updated`)
+      hasUpdatedIno = true
     }
 
-    // NEW: Check new audiobook
-    if (!audiobookData.audioFiles.length) {
-      Logger.error('[Scanner] No valid audio tracks for Audiobook', audiobookData.path)
-      return ScanResult.NOTHING
+    // TEMP: Check if is older audiobook and needs force rescan
+    if (!forceAudioFileScan && (!existingAudiobook.scanVersion || existingAudiobook.checkHasOldCoverPath())) {
+      Logger.info(`[Scanner] Force rescan for "${existingAudiobook.title}" | Last scan v${existingAudiobook.scanVersion} | Old Cover Path ${!!existingAudiobook.checkHasOldCoverPath()}`)
+      forceAudioFileScan = true
+    }
+
+    // inode is required
+    audiobookData.audioFiles = audiobookData.audioFiles.filter(af => af.ino)
+
+    // No valid ebook and audio files found, mark as incomplete
+    var ebookFiles = audiobookData.otherFiles.filter(f => f.filetype === 'ebook')
+    if (!audiobookData.audioFiles.length && !ebookFiles.length) {
+      Logger.error(`[Scanner] "${existingAudiobook.title}" no valid book files found - marking as incomplete`)
+      existingAudiobook.setLastScan(version)
+      existingAudiobook.isIncomplete = true
+      await this.db.updateAudiobook(existingAudiobook)
+      this.emitter('audiobook_updated', existingAudiobook.toJSONMinified())
+      return ScanResult.UPDATED
+    } else if (existingAudiobook.isIncomplete) { // Was incomplete but now is not
+      Logger.info(`[Scanner] "${existingAudiobook.title}" was incomplete but now has book files`)
+      existingAudiobook.isIncomplete = false
+    }
+
+    // Check for audio files that were removed
+    var abdAudioFileInos = audiobookData.audioFiles.map(af => af.ino)
+    var removedAudioFiles = existingAudiobook.audioFiles.filter(file => !abdAudioFileInos.includes(file.ino))
+    if (removedAudioFiles.length) {
+      Logger.info(`[Scanner] ${removedAudioFiles.length} audio files removed for audiobook "${existingAudiobook.title}"`)
+      removedAudioFiles.forEach((af) => existingAudiobook.removeAudioFile(af))
+    }
+
+    // Check for mismatched audio tracks - tracks with no matching audio file
+    var removedAudioTracks = existingAudiobook.tracks.filter(track => !abdAudioFileInos.includes(track.ino))
+    if (removedAudioTracks.length) {
+      Logger.error(`[Scanner] ${removedAudioTracks.length} tracks removed no matching audio file for audiobook "${existingAudiobook.title}"`)
+      removedAudioTracks.forEach((at) => existingAudiobook.removeAudioTrack(at))
+    }
+
+    // Check for new audio files and sync existing audio files
+    var newAudioFiles = []
+    var hasUpdatedAudioFiles = false
+    audiobookData.audioFiles.forEach((file) => {
+      var existingAudioFile = existingAudiobook.getAudioFileByIno(file.ino)
+      if (existingAudioFile) { // Audio file exists, sync path (path may have been renamed)
+        if (existingAudiobook.syncAudioFile(existingAudioFile, file)) {
+          hasUpdatedAudioFiles = true
+        }
+      } else {
+        // New audio file, triple check for matching file path
+        var audioFileWithMatchingPath = existingAudiobook.getAudioFileByPath(file.fullPath)
+        if (audioFileWithMatchingPath) {
+          Logger.warn(`[Scanner] Audio file with path already exists with different inode, New: "${file.filename}" (${file.ino}) | Existing: ${audioFileWithMatchingPath.filename} (${audioFileWithMatchingPath.ino})`)
+        } else {
+          newAudioFiles.push(file)
+        }
+      }
+    })
+
+    // Rescan audio file metadata
+    if (forceAudioFileScan) {
+      Logger.info(`[Scanner] Rescanning ${existingAudiobook.audioFiles.length} audio files for "${existingAudiobook.title}"`)
+      var numAudioFilesUpdated = await audioFileScanner.rescanAudioFiles(existingAudiobook)
+      if (numAudioFilesUpdated > 0) {
+        Logger.info(`[Scanner] Rescan complete, ${numAudioFilesUpdated} audio files were updated for "${existingAudiobook.title}"`)
+        hasUpdatedAudioFiles = true
+
+        // Use embedded cover art if audiobook has no cover
+        if (existingAudiobook.hasEmbeddedCoverArt && !existingAudiobook.cover) {
+          var outputCoverDirs = this.getCoverDirectory(existingAudiobook)
+          var relativeDir = await existingAudiobook.saveEmbeddedCoverArt(outputCoverDirs.fullPath, outputCoverDirs.relPath)
+          if (relativeDir) {
+            Logger.debug(`[Scanner] Saved embedded cover art "${relativeDir}"`)
+          }
+        }
+      } else {
+        Logger.info(`[Scanner] Rescan complete, audio files were up to date for "${existingAudiobook.title}"`)
+      }
+    }
+
+    // Scan and add new audio files found and set tracks
+    if (newAudioFiles.length) {
+      Logger.info(`[Scanner] ${newAudioFiles.length} new audio files were found for audiobook "${existingAudiobook.title}"`)
+      await audioFileScanner.scanAudioFiles(existingAudiobook, newAudioFiles)
+    }
+
+    // After scanning audio files, some may no longer be valid
+    //   so make sure the directory still has valid book files
+    if (!existingAudiobook.tracks.length && !ebookFiles.length) {
+      Logger.error(`[Scanner] "${existingAudiobook.title}" no valid book files found after update - marking as incomplete`)
+      existingAudiobook.setLastScan(version)
+      existingAudiobook.isIncomplete = true
+      await this.db.updateAudiobook(existingAudiobook)
+      this.emitter('audiobook_updated', existingAudiobook.toJSONMinified())
+      return ScanResult.UPDATED
+    }
+
+    var hasUpdates = hasUpdatedIno || hasUpdatedLibraryOrFolder || removedAudioFiles.length || removedAudioTracks.length || newAudioFiles.length || hasUpdatedAudioFiles
+
+    // Check that audio tracks are in sequential order with no gaps
+    if (existingAudiobook.checkUpdateMissingParts()) {
+      Logger.info(`[Scanner] "${existingAudiobook.title}" missing parts updated`)
+      hasUpdates = true
+    }
+
+    // Sync other files (all files that are not audio files) - Updates cover path
+    var otherFilesUpdated = await existingAudiobook.syncOtherFiles(audiobookData.otherFiles, this.MetadataPath, forceAudioFileScan)
+    if (otherFilesUpdated) {
+      hasUpdates = true
+    }
+
+    // Syncs path and fullPath
+    if (existingAudiobook.syncPaths(audiobookData)) {
+      hasUpdates = true
+    }
+
+    // If audiobook was missing before, it is now found
+    if (existingAudiobook.isMissing) {
+      existingAudiobook.isMissing = false
+      hasUpdates = true
+      Logger.info(`[Scanner] "${existingAudiobook.title}" was missing but now it is found`)
+    }
+
+    if (hasUpdates || version !== existingAudiobook.scanVersion) {
+      existingAudiobook.setChapters()
+      existingAudiobook.setLastScan(version)
+      await this.db.updateAudiobook(existingAudiobook)
+
+      Logger.info(`[Scanner] "${existingAudiobook.title}" was updated`)
+      this.emitter('audiobook_updated', existingAudiobook.toJSONMinified())
+      return ScanResult.UPDATED
+    }
+
+    return ScanResult.UPTODATE
+  }
+
+  async scanNewAudiobook(audiobookData) {
+    var ebookFiles = audiobookData.otherFiles.map(f => f.filetype === 'ebook')
+    if (!audiobookData.audioFiles.length && !ebookFiles.length) {
+      Logger.error('[Scanner] No valid audio files and ebooks for Audiobook', audiobookData.path)
+      return null
     }
 
     var audiobook = new Audiobook()
     audiobook.setData(audiobookData)
+
+    // Scan audio files and set tracks, pulls metadata
     await audioFileScanner.scanAudioFiles(audiobook, audiobookData.audioFiles)
-    if (!audiobook.tracks.length) {
-      Logger.warn('[Scanner] Invalid audiobook, no valid tracks', audiobook.title)
-      return ScanResult.NOTHING
+
+    if (!audiobook.tracks.length && !audiobook.ebooks.length) {
+      Logger.warn('[Scanner] Invalid audiobook, no valid audio tracks and ebook files', audiobook.title)
+      return null
     }
 
-    if (audiobook.hasDescriptionTextFile) {
-      await audiobook.saveDescriptionFromTextFile()
-    }
+    // Look for desc.txt and reader.txt and update
+    await audiobook.saveDataFromTextFiles()
 
-    if (audiobook.hasEmbeddedCoverArt) {
+    // Extract embedded cover art if cover is not already in directory
+    if (audiobook.hasEmbeddedCoverArt && !audiobook.cover) {
       var outputCoverDirs = this.getCoverDirectory(audiobook)
       var relativeDir = await audiobook.saveEmbeddedCoverArt(outputCoverDirs.fullPath, outputCoverDirs.relPath)
       if (relativeDir) {
@@ -223,26 +302,164 @@ class Scanner {
       }
     }
 
+    // Set book details from metadata pulled from audio files
     audiobook.setDetailsFromFileMetadata()
+
+    // Check for gaps in track numbers
     audiobook.checkUpdateMissingParts()
+
+    // Set chapters from audio files
     audiobook.setChapters()
 
+    audiobook.setLastScan(version)
+
     Logger.info(`[Scanner] Audiobook "${audiobook.title}" Scanned (${audiobook.sizePretty}) [${audiobook.durationPretty}]`)
-    await this.db.insertAudiobook(audiobook)
+    await this.db.insertEntity('audiobook', audiobook)
     this.emitter('audiobook_added', audiobook.toJSONMinified())
-    return ScanResult.ADDED
+    return audiobook
   }
 
-  async scan(forceAudioFileScan = false) {
+  async scanAudiobookData(audiobookData, forceAudioFileScan = false) {
+    var scannerFindCovers = this.db.serverSettings.scannerFindCovers
+    var libraryId = audiobookData.libraryId
+    var folderId = audiobookData.folderId
+
+    var hasUpdatedLibraryOrFolder = false
+
+    var existingAudiobook = this.audiobooks.find(ab => ab.ino === audiobookData.ino)
+
+    // Make sure existing audiobook has the same library & folder id
+    if (existingAudiobook && (existingAudiobook.libraryId !== libraryId || existingAudiobook.folderId !== folderId)) {
+      var existingAudiobookLibrary = this.db.libraries.find(lib => lib.id === existingAudiobook.libraryId)
+
+      if (!existingAudiobookLibrary) {
+        Logger.error(`[Scanner] Audiobook "${existingAudiobook.title}" found in different library that no longer exists ${existingAudiobook.libraryId}`)
+      } else if (existingAudiobook.libraryId !== libraryId) {
+        Logger.warn(`[Scanner] Audiobook "${existingAudiobook.title}" found in different library "${existingAudiobookLibrary.name}"`)
+      } else {
+        Logger.warn(`[Scanner] Audiobook "${existingAudiobook.title}" found in different folder "${existingAudiobook.folderId}" of library "${existingAudiobookLibrary.name}"`)
+      }
+
+      existingAudiobook.libraryId = libraryId
+      existingAudiobook.folderId = folderId
+      hasUpdatedLibraryOrFolder = true
+      Logger.info(`[Scanner] Updated Audiobook "${existingAudiobook.title}" library and folder to "${libraryId}" "${folderId}"`)
+    }
+
+    // var audiobooksInLibrary = this.audiobooks.filter(ab => ab.libraryId === libraryId)
+    // var existingAudiobook = audiobooksInLibrary.find(a => a.ino === audiobookData.ino)
+
+    // inode value may change when using shared drives, update inode if matching path is found
+    // Note: inode will not change on rename
+    var hasUpdatedIno = false
+    if (!existingAudiobook) {
+      // check an audiobook exists with matching path, then update inodes
+      existingAudiobook = this.audiobooks.find(a => a.path === audiobookData.path)
+      if (existingAudiobook) {
+        var oldIno = existingAudiobook.ino
+        existingAudiobook.ino = audiobookData.ino
+        Logger.debug(`[Scanner] Scan Audiobook Data: Updated inode from "${oldIno}" to "${existingAudiobook.ino}"`)
+        hasUpdatedIno = true
+
+        if (existingAudiobook.libraryId !== libraryId || existingAudiobook.folderId !== folderId) {
+          Logger.warn(`[Scanner] Audiobook found by path is in a different library or folder, ${existingAudiobook.libraryId}/${existingAudiobook.folderId} should be ${libraryId}/${folderId}`)
+
+          existingAudiobook.libraryId = libraryId
+          existingAudiobook.folderId = folderId
+          hasUpdatedLibraryOrFolder = true
+          Logger.info(`[Scanner] Updated Audiobook "${existingAudiobook.title}" library and folder to "${libraryId}" "${folderId}"`)
+        }
+      }
+    }
+
+    var scanResult = null
+    var finalAudiobook = null
+
+    if (existingAudiobook) {
+      finalAudiobook = existingAudiobook
+
+      scanResult = await this.scanExistingAudiobook(existingAudiobook, audiobookData, hasUpdatedIno, hasUpdatedLibraryOrFolder, forceAudioFileScan)
+
+      if (scanResult === ScanResult.REMOVED || scanResult === ScanResult.NOTHING) {
+        finalAudiobook = null
+      }
+    } else {
+      finalAudiobook = await this.scanNewAudiobook(audiobookData)
+
+      scanResult = finalAudiobook ? ScanResult.ADDED : ScanResult.NOTHING
+
+      if (finalAudiobook === ScanResult.NOTHING) {
+        finalAudiobook = null
+        scanResult = ScanResult.NOTHING
+      } else {
+        scanResult = ScanResult.ADDED
+      }
+    }
+
+    // Scan for cover if enabled and has no cover
+    if (finalAudiobook && scannerFindCovers && !finalAudiobook.cover) {
+      if (finalAudiobook.book.shouldSearchForCover) {
+        var updatedCover = await this.searchForCover(finalAudiobook)
+
+        finalAudiobook.book.updateLastCoverSearch(updatedCover)
+
+        if (updatedCover && scanResult === ScanResult.UPTODATE) {
+          scanResult = ScanResult.UPDATED
+        }
+        await this.db.updateAudiobook(finalAudiobook)
+        this.emitter('audiobook_updated', finalAudiobook.toJSONMinified())
+      } else {
+        Logger.debug(`[Scanner] Audiobook "${finalAudiobook.title}" cover already scanned - not re-scanning`)
+      }
+    }
+
+    return scanResult
+  }
+
+  async scan(libraryId, forceAudioFileScan = false) {
+    if (this.librariesScanning.includes(libraryId)) {
+      Logger.error(`[Scanner] Already scanning ${libraryId}`)
+      return
+    }
+
+    var library = this.db.libraries.find(lib => lib.id === libraryId)
+    if (!library) {
+      Logger.error(`[Scanner] Library not found for scan ${libraryId}`)
+      return
+    } else if (!library.folders.length) {
+      Logger.warn(`[Scanner] Library has no folders to scan "${library.name}"`)
+      return
+    }
+
+    var scanPayload = {
+      id: libraryId,
+      name: library.name,
+      scanType: 'library',
+      folders: library.folders.length
+    }
+    this.emitter('scan_start', scanPayload)
+    Logger.info(`[Scanner] Starting scan of library "${library.name}" with ${library.folders.length} folders`)
+
+    library.lastScan = Date.now()
+    await this.db.updateEntity('library', library)
+
+    this.librariesScanning.push(scanPayload)
+
+    var audiobooksInLibrary = this.db.audiobooks.filter(ab => ab.libraryId === libraryId)
+
     // TODO: This temporary fix from pre-release should be removed soon, "checkUpdateInos"
     // TEMP - update ino for each audiobook
-    if (this.audiobooks.length) {
-      for (let i = 0; i < this.audiobooks.length; i++) {
-        var ab = this.audiobooks[i]
+    if (audiobooksInLibrary.length) {
+      for (let i = 0; i < audiobooksInLibrary.length; i++) {
+        var ab = audiobooksInLibrary[i]
         // Update ino if inos are not set
         var shouldUpdateIno = ab.hasMissingIno
         if (shouldUpdateIno) {
-          Logger.debug(`Updating inos for ${ab.title}`)
+          var filesWithMissingIno = ab.getFilesWithMissingIno()
+
+          Logger.debug(`\n\Updating inos for "${ab.title}"`)
+          Logger.debug(`In Scan, Files with missing inode`, filesWithMissingIno)
+
           var hasUpdates = await ab.checkUpdateInos()
           if (hasUpdates) {
             await this.db.updateAudiobook(ab)
@@ -252,13 +469,22 @@ class Scanner {
     }
 
     const scanStart = Date.now()
-    var audiobookDataFound = await scanRootDir(this.AudiobookPath, this.db.serverSettings)
+    var audiobookDataFound = []
+    for (let i = 0; i < library.folders.length; i++) {
+      var folder = library.folders[i]
+      var abDataFoundInFolder = await scanRootDir(folder, this.db.serverSettings)
+      Logger.debug(`[Scanner] ${abDataFoundInFolder.length} ab data found in folder "${folder.fullPath}"`)
+      audiobookDataFound = audiobookDataFound.concat(abDataFoundInFolder)
+    }
 
     // Remove audiobooks with no inode
     audiobookDataFound = audiobookDataFound.filter(abd => abd.ino)
 
-    if (this.cancelScan) {
-      this.cancelScan = false
+    if (this.cancelLibraryScan[libraryId]) {
+      Logger.info(`[Scanner] Canceling scan ${libraryId}`)
+      delete this.cancelLibraryScan[libraryId]
+      this.librariesScanning = this.librariesScanning.filter(l => l.id !== libraryId)
+      this.emitter('scan_complete', { id: libraryId, name: library.name, scanType: 'library', results: null })
       return null
     }
 
@@ -270,8 +496,8 @@ class Scanner {
     }
 
     // Check for removed audiobooks
-    for (let i = 0; i < this.audiobooks.length; i++) {
-      var audiobook = this.audiobooks[i]
+    for (let i = 0; i < audiobooksInLibrary.length; i++) {
+      var audiobook = audiobooksInLibrary[i]
       var dataFound = audiobookDataFound.find(abd => abd.ino === audiobook.ino)
       if (!dataFound) {
         Logger.info(`[Scanner] Audiobook "${audiobook.title}" is missing`)
@@ -281,9 +507,12 @@ class Scanner {
         await this.db.updateAudiobook(audiobook)
         this.emitter('audiobook_updated', audiobook.toJSONMinified())
       }
-      if (this.cancelScan) {
-        this.cancelScan = false
-        return null
+      if (this.cancelLibraryScan[libraryId]) {
+        Logger.info(`[Scanner] Canceling scan ${libraryId}`)
+        delete this.cancelLibraryScan[libraryId]
+        this.librariesScanning = this.librariesScanning.filter(l => l.id !== libraryId)
+        this.emitter('scan_complete', { id: libraryId, name: library.name, scanType: 'library', results: scanResults })
+        return
       }
     }
 
@@ -296,21 +525,25 @@ class Scanner {
 
       var progress = Math.round(100 * (i + 1) / audiobookDataFound.length)
       this.emitter('scan_progress', {
-        scanType: 'files',
+        id: libraryId,
+        name: library.name,
+        scanType: 'library',
         progress: {
           total: audiobookDataFound.length,
           done: i + 1,
           progress
         }
       })
-      if (this.cancelScan) {
-        this.cancelScan = false
+      if (this.cancelLibraryScan[libraryId]) {
+        Logger.info(`[Scanner] Canceling scan ${libraryId}`)
+        delete this.cancelLibraryScan[libraryId]
         break
       }
     }
     const scanElapsed = Math.floor((Date.now() - scanStart) / 1000)
     Logger.info(`[Scanned] Finished | ${scanResults.added} added | ${scanResults.updated} updated | ${scanResults.removed} removed | ${scanResults.missing} missing | elapsed: ${secondsToTimestamp(scanElapsed)}`)
-    return scanResults
+    this.librariesScanning = this.librariesScanning.filter(l => l.id !== libraryId)
+    this.emitter('scan_complete', { id: libraryId, name: library.name, scanType: 'library', results: scanResults })
   }
 
   async scanAudiobookById(audiobookId) {
@@ -319,122 +552,234 @@ class Scanner {
       Logger.error(`[Scanner] Scan audiobook by id not found ${audiobookId}`)
       return ScanResult.NOTHING
     }
+    const library = this.db.libraries.find(lib => lib.id === audiobook.libraryId)
+    if (!library) {
+      Logger.error(`[Scanner] Scan audiobook by id library not found "${audiobook.libraryId}"`)
+      return ScanResult.NOTHING
+    }
+    const folder = library.folders.find(f => f.id === audiobook.folderId)
+    if (!folder) {
+      Logger.error(`[Scanner] Scan audiobook by id folder not found "${audiobook.folderId}" in library "${library.name}"`)
+      return ScanResult.NOTHING
+    }
+    if (!folder.libraryId) {
+      Logger.fatal(`[Scanner] Folder does not have a library id set...`, folder)
+      return ScanResult.NOTHING
+    }
+
     Logger.info(`[Scanner] Scanning Audiobook "${audiobook.title}"`)
-    return this.scanAudiobook(audiobook.fullPath, true)
+    return this.scanAudiobook(folder, audiobook.fullPath, true)
   }
 
-  async scanAudiobook(audiobookPath, forceAudioFileScan = false) {
-    Logger.debug('[Scanner] scanAudiobook', audiobookPath)
-    var audiobookData = await getAudiobookFileData(this.AudiobookPath, audiobookPath, this.db.serverSettings)
+  async scanAudiobook(folder, audiobookFullPath, forceAudioFileScan = false) {
+    Logger.debug('[Scanner] scanAudiobook', audiobookFullPath)
+    var audiobookData = await getAudiobookFileData(folder, audiobookFullPath, this.db.serverSettings)
     if (!audiobookData) {
       return ScanResult.NOTHING
     }
-    audiobookData.ino = await getIno(audiobookData.fullPath)
     return this.scanAudiobookData(audiobookData, forceAudioFileScan)
   }
 
   // Files were modified in this directory, check it out
-  async checkDir(dir) {
-    var exists = await fs.pathExists(dir)
-    if (!exists) {
-      // Audiobook was deleted, TODO: Should confirm this better
-      var audiobook = this.db.audiobooks.find(ab => ab.fullPath === dir)
-      if (audiobook) {
-        var audiobookJSON = audiobook.toJSONMinified()
-        await this.db.removeEntity('audiobook', audiobook.id)
-        this.emitter('audiobook_removed', audiobookJSON)
-        return ScanResult.REMOVED
-      }
+  // async checkDir(dir) {
+  //   var exists = await fs.pathExists(dir)
+  //   if (!exists) {
+  //     // Audiobook was deleted, TODO: Should confirm this better
+  //     var audiobook = this.db.audiobooks.find(ab => ab.fullPath === dir)
+  //     if (audiobook) {
+  //       var audiobookJSON = audiobook.toJSONMinified()
+  //       await this.db.removeEntity('audiobook', audiobook.id)
+  //       this.emitter('audiobook_removed', audiobookJSON)
+  //       return ScanResult.REMOVED
+  //     }
 
-      // Path inside audiobook was deleted, scan audiobook
-      audiobook = this.db.audiobooks.find(ab => dir.startsWith(ab.fullPath))
-      if (audiobook) {
-        Logger.info(`[Scanner] Path inside audiobook "${audiobook.title}" was deleted: ${dir}`)
-        return this.scanAudiobook(audiobook.fullPath)
-      }
+  //     // Path inside audiobook was deleted, scan audiobook
+  //     audiobook = this.db.audiobooks.find(ab => dir.startsWith(ab.fullPath))
+  //     if (audiobook) {
+  //       Logger.info(`[Scanner] Path inside audiobook "${audiobook.title}" was deleted: ${dir}`)
+  //       return this.scanAudiobook(audiobook.fullPath)
+  //     }
 
-      Logger.warn('[Scanner] Path was deleted but no audiobook found', dir)
-      return ScanResult.NOTHING
+  //     Logger.warn('[Scanner] Path was deleted but no audiobook found', dir)
+  //     return ScanResult.NOTHING
+  //   }
+
+  //   // Check if this is a subdirectory of an audiobook
+  //   var audiobook = this.db.audiobooks.find((ab) => dir.startsWith(ab.fullPath))
+  //   if (audiobook) {
+  //     Logger.debug(`[Scanner] Check Dir audiobook "${audiobook.title}" found: ${dir}`)
+  //     return this.scanAudiobook(audiobook.fullPath)
+  //   }
+
+  //   // Check if an audiobook is a subdirectory of this dir
+  //   audiobook = this.db.audiobooks.find(ab => ab.fullPath.startsWith(dir))
+  //   if (audiobook) {
+  //     Logger.warn(`[Scanner] Files were added/updated in a root directory of an existing audiobook, ignore files: ${dir}`)
+  //     return ScanResult.NOTHING
+  //   }
+
+  //   // Must be a new audiobook
+  //   Logger.debug(`[Scanner] Check Dir must be a new audiobook: ${dir}`)
+  //   return this.scanAudiobook(dir)
+  // }
+
+  async scanFolderUpdates(libraryId, folderId, fileUpdateBookGroup) {
+    var library = this.db.libraries.find(lib => lib.id === libraryId)
+    if (!library) {
+      Logger.error(`[Scanner] Library "${libraryId}" not found for scan library updates`)
+      return null
+    }
+    var folder = library.folders.find(f => f.id === folderId)
+    if (!folder) {
+      Logger.error(`[Scanner] Folder "${folderId}" not found in library "${library.name}" for scan library updates`)
+      return null
     }
 
-    // Check if this is a subdirectory of an audiobook
-    var audiobook = this.db.audiobooks.find((ab) => dir.startsWith(ab.fullPath))
-    if (audiobook) {
-      Logger.debug(`[Scanner] Check Dir audiobook "${audiobook.title}" found: ${dir}`)
-      return this.scanAudiobook(audiobook.fullPath)
-    }
+    Logger.debug(`[Scanner] Scanning file update groups in folder "${folder.id}" of library "${library.name}"`)
 
-    // Check if an audiobook is a subdirectory of this dir
-    audiobook = this.db.audiobooks.find(ab => ab.fullPath.startsWith(dir))
-    if (audiobook) {
-      Logger.warn(`[Scanner] Files were added/updated in a root directory of an existing audiobook, ignore files: ${dir}`)
-      return ScanResult.NOTHING
-    }
+    var bookGroupingResults = {}
+    for (const bookDir in fileUpdateBookGroup) {
+      var fullPath = Path.join(folder.fullPath, bookDir)
 
-    // Must be a new audiobook
-    Logger.debug(`[Scanner] Check Dir must be a new audiobook: ${dir}`)
-    return this.scanAudiobook(dir)
-  }
+      // Check if book dir group is already an audiobook or in a subdir of an audiobook
+      var existingAudiobook = this.db.audiobooks.find(ab => fullPath.startsWith(ab.fullPath))
+      if (existingAudiobook) {
 
-  // Array of files that may have been renamed, removed or added
-  async filesChanged(filepaths) {
-    if (!filepaths.length) return ScanResult.NOTHING
-    var relfilepaths = filepaths.map(path => path.replace(this.AudiobookPath, ''))
-    var fileGroupings = groupFilesIntoAudiobookPaths(relfilepaths, true)
+        // Is the audiobook exactly - check if was deleted
+        if (existingAudiobook.fullPath === fullPath) {
+          var exists = await fs.pathExists(fullPath)
+          if (!exists) {
+            Logger.info(`[Scanner] Scanning file update group and audiobook was deleted "${existingAudiobook.title}" - marking as missing`)
+            existingAudiobook.isMissing = true
+            existingAudiobook.lastUpdate = Date.now()
+            await this.db.updateAudiobook(existingAudiobook)
+            this.emitter('audiobook_updated', existingAudiobook.toJSONMinified())
 
-    var results = []
-    for (const dir in fileGroupings) {
-      Logger.debug(`[Scanner] Check dir ${dir}`)
-      var fullPath = Path.join(this.AudiobookPath, dir)
-      var result = await this.checkDir(fullPath)
-      Logger.debug(`[Scanner] Check dir result ${result}`)
-      results.push(result)
-    }
-    return results
-  }
-
-  async scanCovers() {
-    var audiobooksNeedingCover = this.audiobooks.filter(ab => !ab.cover && ab.author)
-    var found = 0
-    var notFound = 0
-    for (let i = 0; i < audiobooksNeedingCover.length; i++) {
-      var audiobook = audiobooksNeedingCover[i]
-      var options = {
-        titleDistance: 2,
-        authorDistance: 2
-      }
-      var results = await this.bookFinder.findCovers('openlibrary', audiobook.title, audiobook.author, options)
-      if (results.length) {
-        Logger.debug(`[Scanner] Found best cover for "${audiobook.title}"`)
-        audiobook.book.cover = results[0]
-        await this.db.updateAudiobook(audiobook)
-        found++
-        this.emitter('audiobook_updated', audiobook.toJSONMinified())
-      } else {
-        notFound++
-      }
-
-      var progress = Math.round(100 * (i + 1) / audiobooksNeedingCover.length)
-      this.emitter('scan_progress', {
-        scanType: 'covers',
-        progress: {
-          total: audiobooksNeedingCover.length,
-          done: i + 1,
-          progress
+            bookGroupingResults[bookDir] = ScanResult.REMOVED
+            continue;
+          }
         }
-      })
 
-      if (this.cancelScan) {
-        this.cancelScan = false
-        break
+        // Scan audiobook for updates
+        Logger.debug(`[Scanner] Folder update for relative path "${bookDir}" is in audiobook "${existingAudiobook.title}" - scan for updates`)
+        bookGroupingResults[bookDir] = await this.scanAudiobook(folder, existingAudiobook.fullPath)
+        continue;
       }
+
+      // Check if an audiobook is a subdirectory of this dir
+      var childAudiobook = this.db.audiobooks.find(ab => ab.fullPath.startsWith(fullPath))
+      if (childAudiobook) {
+        Logger.warn(`[Scanner] Files were modified in a parent directory of an audiobook "${childAudiobook.title}" - ignoring`)
+        bookGroupingResults[bookDir] = ScanResult.NOTHING
+        continue;
+      }
+
+      Logger.debug(`[Scanner] Folder update group must be a new book "${bookDir}" in library "${library.name}"`)
+      bookGroupingResults[bookDir] = await this.scanAudiobook(folder, fullPath)
     }
-    return {
-      found,
-      notFound
-    }
+
+    return bookGroupingResults
   }
 
+  // Array of file update objects that may have been renamed, removed or added
+  async filesChanged(fileUpdates) {
+    if (!fileUpdates.length) return null
+
+    // Group files by folder
+    var folderGroups = {}
+    fileUpdates.forEach((file) => {
+      if (folderGroups[file.folderId]) {
+        folderGroups[file.folderId].fileUpdates.push(file)
+      } else {
+        folderGroups[file.folderId] = {
+          libraryId: file.libraryId,
+          folderId: file.folderId,
+          fileUpdates: [file]
+        }
+      }
+    })
+
+    const libraryScanResults = {}
+
+    // Group files by book
+    for (const folderId in folderGroups) {
+      var libraryId = folderGroups[folderId].libraryId
+      var library = this.db.libraries.find(lib => lib.id === libraryId)
+      if (!library) {
+        Logger.error(`[Scanner] Library not found in files changed ${libraryId}`)
+        continue;
+      }
+      var folder = library.getFolderById(folderId)
+      if (!folder) {
+        Logger.error(`[Scanner] Folder is not in library in files changed "${folderId}", Library "${library.name}"`)
+
+        Logger.debug(`Looking at folders in library "${library.name}" for folderid ${folderId}`)
+        library.folders.forEach((fold) => {
+          Logger.debug(`Folder "${fold.id}" "${fold.fullPath}"`)
+        })
+        continue;
+      }
+
+      var relFilePaths = folderGroups[folderId].fileUpdates.map(fileUpdate => fileUpdate.relPath)
+      var fileUpdateBookGroup = groupFilesIntoAudiobookPaths(relFilePaths, true)
+      var folderScanResults = await this.scanFolderUpdates(libraryId, folderId, fileUpdateBookGroup)
+      libraryScanResults[libraryId] = folderScanResults
+    }
+
+    Logger.debug(`[Scanner] Finished scanning file changes, results:`, libraryScanResults)
+    return libraryScanResults
+  }
+
+  // async scanCovers() {
+  //   var audiobooksNeedingCover = this.audiobooks.filter(ab => !ab.cover && ab.author)
+  //   var found = 0
+  //   var notFound = 0
+  //   var failed = 0
+
+  //   for (let i = 0; i < audiobooksNeedingCover.length; i++) {
+  //     var audiobook = audiobooksNeedingCover[i]
+  //     var options = {
+  //       titleDistance: 2,
+  //       authorDistance: 2
+  //     }
+  //     var results = await this.bookFinder.findCovers('openlibrary', audiobook.title, audiobook.author, options)
+  //     if (results.length) {
+  //       Logger.debug(`[Scanner] Found best cover for "${audiobook.title}"`)
+  //       var coverUrl = results[0]
+  //       var result = await this.coverController.downloadCoverFromUrl(audiobook, coverUrl)
+  //       if (result.error) {
+  //         failed++
+  //       } else {
+  //         found++
+  //         await this.db.updateAudiobook(audiobook)
+  //         this.emitter('audiobook_updated', audiobook.toJSONMinified())
+  //       }
+  //     } else {
+  //       notFound++
+  //     }
+
+  //     var progress = Math.round(100 * (i + 1) / audiobooksNeedingCover.length)
+  //     this.emitter('scan_progress', {
+  //       scanType: 'covers',
+  //       progress: {
+  //         total: audiobooksNeedingCover.length,
+  //         done: i + 1,
+  //         progress
+  //       }
+  //     })
+
+  //     if (this.cancelScan) {
+  //       this.cancelScan = false
+  //       break
+  //     }
+  //   }
+  //   return {
+  //     found,
+  //     notFound,
+  //     failed
+  //   }
+  // }
+
   async saveMetadata(audiobookId) {
     if (audiobookId) {
       var audiobook = this.db.audiobooks.find(ab => ab.id === audiobookId)

server/Server.js

@@ -6,56 +6,67 @@ const fs = require('fs-extra')
 const fileUpload = require('express-fileupload')
 const rateLimit = require('express-rate-limit')
 
-const { ScanResult } = require('./utils/constants')
+const { version } = require('../package.json')
 
+// Utils
+const { ScanResult } = require('./utils/constants')
+const filePerms = require('./utils/filePerms')
+const Logger = require('./Logger')
+
+// Classes
 const Auth = require('./Auth')
 const Watcher = require('./Watcher')
 const Scanner = require('./Scanner')
 const Db = require('./Db')
+const BackupManager = require('./BackupManager')
 const ApiController = require('./ApiController')
 const HlsController = require('./HlsController')
 const StreamManager = require('./StreamManager')
 const RssFeeds = require('./RssFeeds')
 const DownloadManager = require('./DownloadManager')
-// const EbookReader = require('./EbookReader')
-const Logger = require('./Logger')
+const CoverController = require('./CoverController')
 
 class Server {
-  constructor(PORT, CONFIG_PATH, METADATA_PATH, AUDIOBOOK_PATH) {
+  constructor(PORT, UID, GID, CONFIG_PATH, METADATA_PATH, AUDIOBOOK_PATH) {
     this.Port = PORT
+    this.Uid = isNaN(UID) ? 0 : Number(UID)
+    this.Gid = isNaN(GID) ? 0 : Number(GID)
     this.Host = '0.0.0.0'
     this.ConfigPath = Path.normalize(CONFIG_PATH)
     this.AudiobookPath = Path.normalize(AUDIOBOOK_PATH)
     this.MetadataPath = Path.normalize(METADATA_PATH)
 
-    fs.ensureDirSync(CONFIG_PATH)
-    fs.ensureDirSync(METADATA_PATH)
-    fs.ensureDirSync(AUDIOBOOK_PATH)
+    fs.ensureDirSync(CONFIG_PATH, 0o774)
+    fs.ensureDirSync(METADATA_PATH, 0o774)
+    fs.ensureDirSync(AUDIOBOOK_PATH, 0o774)
 
-    this.db = new Db(this.ConfigPath)
+    this.db = new Db(this.ConfigPath, this.AudiobookPath)
     this.auth = new Auth(this.db)
+    this.backupManager = new BackupManager(this.MetadataPath, this.Uid, this.Gid, this.db)
     this.watcher = new Watcher(this.AudiobookPath)
-    this.scanner = new Scanner(this.AudiobookPath, this.MetadataPath, this.db, this.emitter.bind(this))
+    this.coverController = new CoverController(this.db, this.MetadataPath, this.AudiobookPath)
+    this.scanner = new Scanner(this.AudiobookPath, this.MetadataPath, this.db, this.coverController, this.emitter.bind(this))
     this.streamManager = new StreamManager(this.db, this.MetadataPath)
     this.rssFeeds = new RssFeeds(this.Port, this.db)
     this.downloadManager = new DownloadManager(this.db, this.MetadataPath, this.AudiobookPath, this.emitter.bind(this))
-    this.apiController = new ApiController(this.MetadataPath, this.db, this.scanner, this.auth, this.streamManager, this.rssFeeds, this.downloadManager, this.emitter.bind(this), this.clientEmitter.bind(this))
+    this.apiController = new ApiController(this.MetadataPath, this.db, this.scanner, this.auth, this.streamManager, this.rssFeeds, this.downloadManager, this.coverController, this.backupManager, this.watcher, this.emitter.bind(this), this.clientEmitter.bind(this))
     this.hlsController = new HlsController(this.db, this.scanner, this.auth, this.streamManager, this.emitter.bind(this), this.streamManager.StreamsPath)
-    // this.ebookReader = new EbookReader(this.db, this.MetadataPath, this.AudiobookPath)
 
+    this.expressApp = null
     this.server = null
     this.io = null
 
     this.clients = {}
 
-    this.isScanning = false
     this.isScanningCovers = false
-    this.isInitialized = false
   }
 
   get audiobooks() {
     return this.db.audiobooks
   }
+  get libraries() {
+    return this.db.libraries
+  }
   get serverSettings() {
     return this.db.serverSettings
   }
@@ -81,59 +92,12 @@ class Server {
     })
   }
 
-  async filesChanged(files) {
-    Logger.info('[Server]', files.length, 'Files Changed')
-    var result = await this.scanner.filesChanged(files)
-    Logger.debug('[Server] Files changed result', result)
-  }
-
-  async scan(forceAudioFileScan = false) {
-    Logger.info('[Server] Starting Scan')
-    this.isScanning = true
-    this.isInitialized = true
-    this.emitter('scan_start', 'files')
-    var results = await this.scanner.scan(forceAudioFileScan)
-    this.isScanning = false
-    this.emitter('scan_complete', { scanType: 'files', results })
-    Logger.info('[Server] Scan complete')
-  }
-
-  async scanAudiobook(socket, audiobookId) {
-    var result = await this.scanner.scanAudiobookById(audiobookId)
-    var scanResultName = ''
-    for (const key in ScanResult) {
-      if (ScanResult[key] === result) {
-        scanResultName = key
-      }
-    }
-    socket.emit('audiobook_scan_complete', scanResultName)
-  }
-
-  async scanCovers() {
-    Logger.info('[Server] Start cover scan')
-    this.isScanningCovers = true
-    this.emitter('scan_start', 'covers')
-    var results = await this.scanner.scanCovers()
-    this.isScanningCovers = false
-    this.emitter('scan_complete', { scanType: 'covers', results })
-    Logger.info('[Server] Cover scan complete')
-  }
-
-  cancelScan() {
-    if (!this.isScanningCovers && !this.isScanning) return
-    this.scanner.cancelScan = true
-  }
-
-  // Generates an NFO metadata file, if no audiobookId is passed then all audiobooks are done
-  async saveMetadata(socket, audiobookId = null) {
-    Logger.info('[Server] Starting save metadata files')
-    var response = await this.scanner.saveMetadata(audiobookId)
-    Logger.info(`[Server] Finished saving metadata files Successful: ${response.success}, Failed: ${response.failed}`)
-    socket.emit('save_metadata_complete', response)
+  authMiddleware(req, res, next) {
+    this.auth.authMiddleware(req, res, next)
   }
 
   async init() {
-    Logger.info('[Server] Init')
+    Logger.info('[Server] Init v' + version)
     await this.streamManager.ensureStreamsDir()
     await this.streamManager.removeOrphanStreams()
     await this.downloadManager.removeOrphanDownloads()
@@ -141,111 +105,87 @@ class Server {
     await this.db.init()
     this.auth.init()
 
-    this.watcher.initWatcher()
+    await this.purgeMetadata()
+    await this.backupManager.init()
+
+    this.watcher.initWatcher(this.libraries)
     this.watcher.on('files', this.filesChanged.bind(this))
   }
 
-  authMiddleware(req, res, next) {
-    this.auth.authMiddleware(req, res, next)
-  }
-
-  async handleUpload(req, res) {
-    if (!req.user.canUpload) {
-      Logger.warn('User attempted to upload without permission', req.user)
-      return res.sendStatus(403)
-    }
-    var files = Object.values(req.files)
-    var title = req.body.title
-    var author = req.body.author
-    var series = req.body.series
-
-    if (!files.length || !title || !author) {
-      return res.json({
-        error: 'Invalid post data received'
-      })
-    }
-
-    var outputDirectory = ''
-    if (series && series.length && series !== 'null') {
-      outputDirectory = Path.join(this.AudiobookPath, author, series, title)
-    } else {
-      outputDirectory = Path.join(this.AudiobookPath, author, title)
-    }
-
-    var exists = await fs.pathExists(outputDirectory)
-    if (exists) {
-      Logger.error(`[Server] Upload directory "${outputDirectory}" already exists`)
-      return res.json({
-        error: `Directory "${outputDirectory}" already exists`
-      })
-    }
-
-    await fs.ensureDir(outputDirectory)
-    Logger.info(`Uploading ${files.length} files to`, outputDirectory)
-
-    for (let i = 0; i < files.length; i++) {
-      var file = files[i]
-
-      var path = Path.join(outputDirectory, file.name)
-      await file.mv(path).catch((error) => {
-        Logger.error('Failed to move file', path, error)
-      })
-    }
-    res.sendStatus(200)
-  }
-
-  // First time login rate limit is hit
-  loginLimitReached(req, res, options) {
-    Logger.error(`[Server] Login rate limit (${options.max}) was hit for ip ${req.ip}`)
-    options.message = 'Too many attempts. Login temporarily locked.'
-  }
-
-  getLoginRateLimiter() {
-    return rateLimit({
-      windowMs: this.db.serverSettings.rateLimitLoginWindow, // 5 minutes
-      max: this.db.serverSettings.rateLimitLoginRequests,
-      skipSuccessfulRequests: true,
-      onLimitReached: this.loginLimitReached
-    })
-  }
-
   async start() {
     Logger.info('=== Starting Server ===')
     await this.init()
 
     const app = express()
+    this.expressApp = app
 
     this.server = http.createServer(app)
 
     app.use(this.auth.cors)
     app.use(fileUpload())
-
-    // Static path to generated nuxt
-    const distPath = Path.join(global.appRoot, '/client/dist')
-    if (process.env.NODE_ENV === 'production') {
-      app.use(express.static(distPath))
-      app.use('/local', express.static(this.AudiobookPath))
-    } else {
-      app.use(express.static(this.AudiobookPath))
-    }
-
-    app.use('/metadata', this.authMiddleware.bind(this), express.static(this.MetadataPath))
-
-    app.use(express.static(this.MetadataPath))
-    app.use(express.static(Path.join(global.appRoot, 'static')))
     app.use(express.urlencoded({ extended: true }));
     app.use(express.json())
 
-    // Dynamic routes are not generated on client
+    // Static path to generated nuxt
+    const distPath = Path.join(global.appRoot, '/client/dist')
+    app.use(express.static(distPath))
+
+    // Old static path for covers
+    app.use('/local', this.authMiddleware.bind(this), express.static(this.AudiobookPath))
+
+    // Metadata folder static path
+    app.use('/metadata', this.authMiddleware.bind(this), express.static(this.MetadataPath))
+
+    // Downloads folder static path
+    app.use('/downloads', this.authMiddleware.bind(this), express.static(this.downloadManager.downloadDirPath))
+
+    // Static folder
+    app.use(express.static(Path.join(global.appRoot, 'static')))
+
+    // Static file routes
+    app.get('/lib/:library/:folder/*', this.authMiddleware.bind(this), (req, res) => {
+      var library = this.libraries.find(lib => lib.id === req.params.library)
+      if (!library) return res.sendStatus(404)
+      var folder = library.folders.find(fol => fol.id === req.params.folder)
+      if (!folder) return res.status(404).send('Folder not found')
+
+      var remainingPath = req.params['0']
+      var fullPath = Path.join(folder.fullPath, remainingPath)
+      res.sendFile(fullPath)
+    })
+
+    // Book static file routes
+    app.get('/s/book/:id/*', this.authMiddleware.bind(this), (req, res) => {
+      var audiobook = this.audiobooks.find(ab => ab.id === req.params.id)
+      if (!audiobook) return res.status(404).send('Book not found with id ' + req.params.id)
+
+      var remainingPath = req.params['0']
+      var fullPath = Path.join(audiobook.fullPath, remainingPath)
+      res.sendFile(fullPath)
+    })
+
+    // EBook static file routes
+    app.get('/ebook/:library/:folder/*', (req, res) => {
+      var library = this.libraries.find(lib => lib.id === req.params.library)
+      if (!library) return res.sendStatus(404)
+      var folder = library.folders.find(fol => fol.id === req.params.folder)
+      if (!folder) return res.status(404).send('Folder not found')
+
+      var remainingPath = req.params['0']
+      var fullPath = Path.join(folder.fullPath, remainingPath)
+      res.sendFile(fullPath)
+    })
+
+    // Client routes
     app.get('/audiobook/:id', (req, res) => res.sendFile(Path.join(distPath, 'index.html')))
-    app.get('/library/:id', (req, res) => res.sendFile(Path.join(distPath, 'index.html')))
-    app.get('/library', (req, res) => res.sendFile(Path.join(distPath, 'index.html')))
+    app.get('/audiobook/:id/edit', (req, res) => res.sendFile(Path.join(distPath, 'index.html')))
+    app.get('/library/:library', (req, res) => res.sendFile(Path.join(distPath, 'index.html')))
+    app.get('/library/:library/bookshelf/:id?', (req, res) => res.sendFile(Path.join(distPath, 'index.html')))
 
     app.use('/api', this.authMiddleware.bind(this), this.apiController.router)
     app.use('/hls', this.authMiddleware.bind(this), this.hlsController.router)
 
     // Incomplete work in progress
-    // app.use('/ebook', this.ebookReader.router)
     // app.use('/feeds', this.rssFeeds.router)
 
     app.post('/upload', this.authMiddleware.bind(this), this.handleUpload.bind(this))
@@ -298,7 +238,6 @@ class Server {
 
       // Scanning
       socket.on('scan', this.scan.bind(this))
-      socket.on('scan_covers', this.scanCovers.bind(this))
       socket.on('cancel_scan', this.cancelScan.bind(this))
       socket.on('scan_audiobook', (audiobookId) => this.scanAudiobook(socket, audiobookId))
       socket.on('save_metadata', (audiobookId) => this.saveMetadata(socket, audiobookId))
@@ -314,8 +253,13 @@ class Server {
       socket.on('download', (payload) => this.downloadManager.downloadSocketRequest(socket, payload))
       socket.on('remove_download', (downloadId) => this.downloadManager.removeSocketRequest(socket, downloadId))
 
+      // Logs
       socket.on('set_log_listener', (level) => Logger.addSocketListener(socket, level))
 
+      // Backups
+      socket.on('create_backup', () => this.backupManager.requestCreateBackup(socket))
+      socket.on('apply_backup', (id) => this.backupManager.requestApplyBackup(socket, id))
+
       socket.on('test', () => {
         socket.emit('test_received', socket.id)
       })
@@ -330,6 +274,8 @@ class Server {
           Logger.info('[SOCKET] Unauth socket disconnected ' + socket.id)
           delete this.clients[socket.id]
         } else {
+          socket.broadcast.emit('user_offline', _client.user.toJSONForPublic(this.streamManager.streams))
+
           const disconnectTime = Date.now() - _client.connected_at
           Logger.info(`[SOCKET] Socket ${socket.id} disconnected from client "${_client.user.username}" after ${disconnectTime}ms`)
           delete this.clients[socket.id]
@@ -338,6 +284,147 @@ class Server {
     })
   }
 
+  async filesChanged(fileUpdates) {
+    Logger.info('[Server]', fileUpdates.length, 'Files Changed')
+    await this.scanner.filesChanged(fileUpdates)
+    // Logger.debug('[Server] Files changed result', result)
+  }
+
+  async scan(libraryId, forceAudioFileScan = false) {
+    Logger.info('[Server] Starting Scan')
+    await this.scanner.scan(libraryId, forceAudioFileScan)
+    Logger.info('[Server] Scan complete')
+  }
+
+  async scanAudiobook(socket, audiobookId) {
+    var result = await this.scanner.scanAudiobookById(audiobookId)
+    var scanResultName = ''
+    for (const key in ScanResult) {
+      if (ScanResult[key] === result) {
+        scanResultName = key
+      }
+    }
+    socket.emit('audiobook_scan_complete', scanResultName)
+  }
+
+  cancelScan(id) {
+    Logger.debug('[Server] Cancel scan', id)
+    this.scanner.cancelLibraryScan[id] = true
+  }
+
+  // Generates an NFO metadata file, if no audiobookId is passed then all audiobooks are done
+  async saveMetadata(socket, audiobookId = null) {
+    Logger.info('[Server] Starting save metadata files')
+    var response = await this.scanner.saveMetadata(audiobookId)
+    Logger.info(`[Server] Finished saving metadata files Successful: ${response.success}, Failed: ${response.failed}`)
+    socket.emit('save_metadata_complete', response)
+  }
+
+  // Remove unused /metadata/books/{id} folders
+  async purgeMetadata() {
+    var booksMetadata = Path.join(this.MetadataPath, 'books')
+    var booksMetadataExists = await fs.pathExists(booksMetadata)
+    if (!booksMetadataExists) return
+    var foldersInBooksMetadata = await fs.readdir(booksMetadata)
+
+    var purged = 0
+    await Promise.all(foldersInBooksMetadata.map(async foldername => {
+      var hasMatchingAudiobook = this.audiobooks.find(ab => ab.id === foldername)
+      if (!hasMatchingAudiobook) {
+        var folderPath = Path.join(booksMetadata, foldername)
+        Logger.debug(`[Server] Purging unused metadata ${folderPath}`)
+
+        await fs.remove(folderPath).then(() => {
+          purged++
+        }).catch((err) => {
+          Logger.error(`[Server] Failed to delete folder path ${folderPath}`, err)
+        })
+      }
+    }))
+    if (purged > 0) {
+      Logger.info(`[Server] Purged ${purged} unused audiobook metadata`)
+    }
+    return purged
+  }
+
+  async handleUpload(req, res) {
+    if (!req.user.canUpload) {
+      Logger.warn('User attempted to upload without permission', req.user)
+      return res.sendStatus(403)
+    }
+    var files = Object.values(req.files)
+    var title = req.body.title
+    var author = req.body.author
+    var series = req.body.series
+    var libraryId = req.body.library
+    var folderId = req.body.folder
+
+    var library = this.db.libraries.find(lib => lib.id === libraryId)
+    if (!library) {
+      return res.status(500).error(`Library not found with id ${libraryId}`)
+    }
+    var folder = library.folders.find(fold => fold.id === folderId)
+    if (!folder) {
+      return res.status(500).error(`Folder not found with id ${folderId} in library ${library.name}`)
+    }
+
+    if (!files.length || !title || !author) {
+      return res.status(500).error(`Invalid post data`)
+    }
+
+    // For setting permissions recursively
+    var firstDirPath = Path.join(folder.fullPath, author)
+
+    var outputDirectory = ''
+    if (series && series.length && series !== 'null') {
+      outputDirectory = Path.join(folder.fullPath, author, series, title)
+    } else {
+      outputDirectory = Path.join(folder.fullPath, author, title)
+    }
+
+    var exists = await fs.pathExists(outputDirectory)
+    if (exists) {
+      Logger.error(`[Server] Upload directory "${outputDirectory}" already exists`)
+      return res.status(500).error(`Directory "${outputDirectory}" already exists`)
+    }
+
+    await fs.ensureDir(outputDirectory)
+
+    Logger.info(`Uploading ${files.length} files to`, outputDirectory)
+
+    for (let i = 0; i < files.length; i++) {
+      var file = files[i]
+
+      var path = Path.join(outputDirectory, file.name)
+      await file.mv(path).then(() => {
+        return true
+      }).catch((error) => {
+        Logger.error('Failed to move file', path, error)
+        return false
+      })
+    }
+
+    Logger.info(`[Server] Setting owner/perms for first dir "${firstDirPath}"`)
+    await filePerms(firstDirPath, 0o774, this.Uid, this.Gid)
+
+    res.sendStatus(200)
+  }
+
+  // First time login rate limit is hit
+  loginLimitReached(req, res, options) {
+    Logger.error(`[Server] Login rate limit (${options.max}) was hit for ip ${req.ip}`)
+    options.message = 'Too many attempts. Login temporarily locked.'
+  }
+
+  getLoginRateLimiter() {
+    return rateLimit({
+      windowMs: this.db.serverSettings.rateLimitLoginWindow, // 5 minutes
+      max: this.db.serverSettings.rateLimitLoginRequests,
+      skipSuccessfulRequests: true,
+      onLimitReached: this.loginLimitReached
+    })
+  }
+
   logout(req, res) {
     res.sendStatus(200)
   }
@@ -375,15 +462,20 @@ class Server {
       }
     }
 
+    socket.broadcast.emit('user_online', client.user.toJSONForPublic(this.streamManager.streams))
+
+    user.lastSeen = Date.now()
+    await this.db.updateEntity('user', user)
+
     const initialPayload = {
       serverSettings: this.serverSettings.toJSON(),
-      isScanning: this.isScanning,
-      isInitialized: this.isInitialized,
       audiobookPath: this.AudiobookPath,
       metadataPath: this.MetadataPath,
       configPath: this.ConfigPath,
       user: client.user.toJSONForBrowser(),
-      stream: client.stream || null
+      stream: client.stream || null,
+      librariesScanning: this.scanner.librariesScanning,
+      backups: (this.backupManager.backups || []).map(b => b.toJSON())
     }
     client.socket.emit('init', initialPayload)
 

server/StreamManager.js

@@ -65,7 +65,7 @@ class StreamManager {
       if (!dirs || !dirs.length) return true
 
       await Promise.all(dirs.map(async (dirname) => {
-        if (dirname !== 'streams' && dirname !== 'books' && dirname !== 'downloads') {
+        if (dirname !== 'streams' && dirname !== 'books' && dirname !== 'downloads' && dirname !== 'backups') {
           var fullPath = Path.join(this.MetadataPath, dirname)
           Logger.warn(`Removing OLD Orphan Stream ${dirname}`)
           return fs.remove(fullPath)
@@ -111,6 +111,8 @@ class StreamManager {
 
     var stream = await this.openStream(client, audiobook)
     this.db.updateUserStream(client.user.id, stream.id)
+
+    socket.broadcast.emit('user_stream_update', client.user.toJSONForPublic(this.streams))
   }
 
   async closeStreamRequest(socket) {
@@ -126,6 +128,8 @@ class StreamManager {
     client.user.stream = null
     client.stream = null
     this.db.updateUserStream(client.user.id, null)
+
+    socket.broadcast.emit('user_stream_update', client.user.toJSONForPublic(this.streams))
   }
 
   async openTestStream(StreamsPath, audiobookId) {

server/Watcher.js

@@ -4,107 +4,160 @@ const Watcher = require('watcher')
 const Logger = require('./Logger')
 
 class FolderWatcher extends EventEmitter {
-  constructor(audiobookPath) {
+  constructor() {
     super()
-    this.AudiobookPath = audiobookPath
-    this.folderMap = {}
-    this.watcher = null
+    this.paths = [] // Not used
+    this.pendingFiles = [] // Not used
 
-    this.pendingFiles = []
+    this.libraryWatchers = []
+    this.pendingFileUpdates = []
     this.pendingDelay = 4000
     this.pendingTimeout = null
   }
 
-  initWatcher() {
-    try {
-      Logger.info('[FolderWatcher] Initializing..')
-      this.watcher = new Watcher(this.AudiobookPath, {
-        ignored: /(^|[\/\\])\../, // ignore dotfiles
-        renameDetection: true,
-        renameTimeout: 2000,
-        recursive: true,
-        ignoreInitial: true,
-        persistent: true
+  get pendingFilePaths() {
+    return this.pendingFileUpdates.map(f => f.path)
+  }
+
+  buildLibraryWatcher(library) {
+    if (this.libraryWatchers.find(w => w.id === library.id)) {
+      Logger.warn('[Watcher] Already watching library', library.name)
+      return
+    }
+    Logger.info(`[Watcher] Initializing watcher for "${library.name}"..`)
+    var folderPaths = library.folderPaths
+    var watcher = new Watcher(folderPaths, {
+      ignored: /(^|[\/\\])\../, // ignore dotfiles
+      renameDetection: true,
+      renameTimeout: 2000,
+      recursive: true,
+      ignoreInitial: true,
+      persistent: true
+    })
+    watcher
+      .on('add', (path) => {
+        this.onNewFile(library.id, path)
+      }).on('change', (path) => {
+        // This is triggered from metadata changes, not what we want
+        // this.onFileUpdated(path)
+      }).on('unlink', path => {
+        this.onFileRemoved(library.id, path)
+      }).on('rename', (path, pathNext) => {
+        this.onRename(library.id, path, pathNext)
+      }).on('error', (error) => {
+        Logger.error(`[Watcher] ${error}`)
+      }).on('ready', () => {
+        Logger.info(`[Watcher] "${library.name}" Ready`)
       })
-      this.watcher
-        .on('add', (path) => {
-          this.onNewFile(path)
-        }).on('change', (path) => {
-          // This is triggered from metadata changes, not what we want
-          // this.onFileUpdated(path)
-        }).on('unlink', path => {
-          this.onFileRemoved(path)
-        }).on('rename', (path, pathNext) => {
-          this.onRename(path, pathNext)
-        }).on('error', (error) => {
-          Logger.error(`[FolderWatcher] ${error}`)
-        }).on('ready', () => {
-          Logger.info('[FolderWatcher] Ready')
-        })
-    } catch (error) {
-      Logger.error('Chokidar watcher failed', error)
+
+    this.libraryWatchers.push({
+      id: library.id,
+      name: library.name,
+      folders: library.folders,
+      paths: library.folderPaths,
+      watcher
+    })
+  }
+
+  initWatcher(libraries) {
+    libraries.forEach((lib) => {
+      this.buildLibraryWatcher(lib)
+    })
+  }
+
+  addLibrary(library) {
+    this.buildLibraryWatcher(library)
+  }
+
+  updateLibrary(library) {
+    var libwatcher = this.libraryWatchers.find(lib => lib.id === library.id)
+    if (libwatcher) {
+      libwatcher.name = library.name
+
+      var pathsToAdd = library.folderPaths.filter(path => !libwatcher.paths.includes(path))
+      if (pathsToAdd.length) {
+        Logger.info(`[Watcher] Adding paths to library watcher "${library.name}"`)
+        libwatcher.paths = library.folderPaths
+        libwatcher.folders = library.folders
+        libwatcher.watcher.watchPaths(pathsToAdd)
+      }
+    }
+  }
+
+  removeLibrary(library) {
+    var libwatcher = this.libraryWatchers.find(lib => lib.id === library.id)
+    if (libwatcher) {
+      Logger.info(`[Watcher] Removed watcher for "${library.name}"`)
+      libwatcher.watcher.close()
+      this.libraryWatchers = this.libraryWatchers.filter(lib => lib.id !== library.id)
+    } else {
+      Logger.error(`[Watcher] Library watcher not found for "${library.name}"`)
     }
   }
 
   close() {
-    return this.watcher.close()
+    return this.libraryWatchers.map(lib => lib.watcher.close())
   }
 
-  // After [pendingBatchDelay] seconds emit batch
-  async onNewFile(path) {
-    if (this.pendingFiles.includes(path)) return
-
-    Logger.debug('FolderWatcher: New File', path)
-
-    var dir = Path.dirname(path)
-    if (dir === this.AudiobookPath) {
-      Logger.debug('New File added to root dir, ignoring it')
-      return
-    }
-
-    this.pendingFiles.push(path)
-    clearTimeout(this.pendingTimeout)
-    this.pendingTimeout = setTimeout(() => {
-      this.emit('files', this.pendingFiles.map(f => f))
-      this.pendingFiles = []
-    }, this.pendingDelay)
+  onNewFile(libraryId, path) {
+    Logger.debug('[Watcher] File Added', path)
+    this.addFileUpdate(libraryId, path, 'added')
   }
 
-  onFileRemoved(path) {
-    Logger.debug('[FolderWatcher] File Removed', path)
-
-    var dir = Path.dirname(path)
-    if (dir === this.AudiobookPath) {
-      Logger.debug('New File added to root dir, ignoring it')
-      return
-    }
-
-    this.pendingFiles.push(path)
-    clearTimeout(this.pendingTimeout)
-    this.pendingTimeout = setTimeout(() => {
-      this.emit('files', this.pendingFiles.map(f => f))
-      this.pendingFiles = []
-    }, this.pendingDelay)
+  onFileRemoved(libraryId, path) {
+    Logger.debug('[Watcher] File Removed', path)
+    this.addFileUpdate(libraryId, path, 'deleted')
   }
 
   onFileUpdated(path) {
-    Logger.debug('[FolderWatcher] Updated File', path)
+    Logger.debug('[Watcher] Updated File', path)
   }
 
-  onRename(pathFrom, pathTo) {
-    Logger.debug(`[FolderWatcher] Rename ${pathFrom} => ${pathTo}`)
+  onRename(libraryId, pathFrom, pathTo) {
+    Logger.debug(`[Watcher] Rename ${pathFrom} => ${pathTo}`)
+    this.addFileUpdate(libraryId, pathTo, 'renamed')
+  }
 
-    var dir = Path.dirname(pathTo)
-    if (dir === this.AudiobookPath) {
-      Logger.debug('New File added to root dir, ignoring it')
+  addFileUpdate(libraryId, path, type) {
+    if (this.pendingFilePaths.includes(path)) return
+
+    // Get file library
+    var libwatcher = this.libraryWatchers.find(lw => lw.id === libraryId)
+    if (!libwatcher) {
+      Logger.error(`[Watcher] Invalid library id from watcher ${libraryId}`)
       return
     }
 
-    this.pendingFiles.push(pathTo)
+    // Get file folder
+    var folder = libwatcher.folders.find(fold => path.startsWith(fold.fullPath))
+    if (!folder) {
+      Logger.error(`[Watcher] New file folder not found in library "${libwatcher.name}" with path "${path}"`)
+      return
+    }
+
+    // Check if file was added to root directory
+    var dir = Path.dirname(path)
+    if (dir === folder.fullPath) {
+      Logger.warn(`[Watcher] New file "${Path.basename(path)}" added to folder root - ignoring it`)
+      return
+    }
+
+    var relPath = path.replace(folder.fullPath, '')
+    Logger.debug(`[Watcher] Modified file in library "${libwatcher.name}" and folder "${folder.id}" with relPath "${relPath}"`)
+
+    this.pendingFileUpdates.push({
+      path,
+      relPath,
+      folderId: folder.id,
+      libraryId,
+      type
+    })
+
+    // Notify server of update after "pendingDelay"
     clearTimeout(this.pendingTimeout)
     this.pendingTimeout = setTimeout(() => {
-      this.emit('files', this.pendingFiles.map(f => f))
-      this.pendingFiles = []
+      this.emit('files', this.pendingFileUpdates)
+      this.pendingFileUpdates = []
     }, this.pendingDelay)
   }
 }

server/objects/AudioFile.js

@@ -34,9 +34,6 @@ class AudioFile {
     this.exclude = false
     this.error = null
 
-    // TEMP: For forcing rescan
-    this.isOldAudioFile = false
-
     if (data) {
       this.construct(data)
     }
@@ -103,7 +100,6 @@ class AudioFile {
     // Old version of AudioFile used `tagAlbum` etc.
     var isOldVersion = Object.keys(data).find(key => key.startsWith('tag'))
     if (isOldVersion) {
-      this.isOldAudioFile = true
       this.metadata = new AudioFileMetadata(data)
     } else {
       this.metadata = new AudioFileMetadata(data.metadata || {})

server/objects/AudioTrack.js

@@ -62,6 +62,7 @@ class AudioTrack {
       size: this.size,
       bitRate: this.bitRate,
       language: this.language,
+      codec: this.codec,
       timeBase: this.timeBase,
       channels: this.channels,
       channelLayout: this.channelLayout,
@@ -82,7 +83,7 @@ class AudioTrack {
     this.size = probeData.size
     this.bitRate = probeData.bitRate
     this.language = probeData.language
-    this.codec = probeData.codec
+    this.codec = probeData.codec || null
     this.timeBase = probeData.timeBase
     this.channels = probeData.channels
     this.channelLayout = probeData.channelLayout

server/objects/Audiobook.js

@@ -1,4 +1,5 @@
 const Path = require('path')
+const fs = require('fs-extra')
 const { bytesPretty, elapsedPretty, readTextFile } = require('../utils/fileUtils')
 const { comparePaths, getIno } = require('../utils/index')
 const { extractCoverArt } = require('../utils/ffmpegHelpers')
@@ -14,11 +15,15 @@ class Audiobook {
     this.id = null
     this.ino = null // Inode
 
+    this.libraryId = null
+    this.folderId = null
+
     this.path = null
     this.fullPath = null
-
     this.addedAt = null
     this.lastUpdate = null
+    this.lastScan = null
+    this.scanVersion = null
 
     this.tracks = []
     this.missingParts = []
@@ -32,6 +37,8 @@ class Audiobook {
 
     // Audiobook was scanned and not found
     this.isMissing = false
+    // Audiobook no longer has "book" files
+    this.isInvalid = false
 
     if (audiobook) {
       this.construct(audiobook)
@@ -41,11 +48,14 @@ class Audiobook {
   construct(audiobook) {
     this.id = audiobook.id
     this.ino = audiobook.ino || null
-
+    this.libraryId = audiobook.libraryId || 'main'
+    this.folderId = audiobook.folderId || 'audiobooks'
     this.path = audiobook.path
     this.fullPath = audiobook.fullPath
     this.addedAt = audiobook.addedAt
     this.lastUpdate = audiobook.lastUpdate || this.addedAt
+    this.lastScan = audiobook.lastScan || null
+    this.scanVersion = audiobook.scanVersion || null
 
     this.tracks = audiobook.tracks.map(track => new AudioTrack(track))
     this.missingParts = audiobook.missingParts
@@ -62,6 +72,7 @@ class Audiobook {
     }
 
     this.isMissing = !!audiobook.isMissing
+    this.isInvalid = !!audiobook.isInvalid
   }
 
   get title() {
@@ -105,23 +116,39 @@ class Audiobook {
   }
 
   get invalidParts() {
-    return (this.audioFiles || []).filter(af => af.invalid).map(af => ({ filename: af.filename, error: af.error || 'Unknown Error' }))
+    return this._audioFiles.filter(af => af.invalid).map(af => ({ filename: af.filename, error: af.error || 'Unknown Error' }))
   }
 
+  get _audioFiles() { return this.audioFiles || [] }
+  get _otherFiles() { return this.otherFiles || [] }
+  get _tracks() { return this.tracks || [] }
+
   get ebooks() {
     return this.otherFiles.filter(file => file.filetype === 'ebook')
   }
 
+  get hasEpub() {
+    return this.otherFiles.find(file => file.ext === '.epub')
+  }
+
+  get hasMobi() {
+    return this.otherFiles.find(file => file.ext === '.mobi' || file.ext === '.azw3')
+  }
+
   get hasMissingIno() {
-    return !this.ino || (this.audioFiles || []).find(abf => !abf.ino) || (this.otherFiles || []).find(f => !f.ino) || (this.tracks || []).find(t => !t.ino)
+    return !this.ino || this._audioFiles.find(abf => !abf.ino) || this._otherFiles.find(f => !f.ino) || this._tracks.find(t => !t.ino)
   }
 
   get hasEmbeddedCoverArt() {
-    return !!(this.audioFiles || []).find(af => af.embeddedCoverArt)
+    return !!this._audioFiles.find(af => af.embeddedCoverArt)
   }
 
-  get hasDescriptionTextFile() {
-    return !!(this.otherFiles || []).find(of => of.filename === 'desc.txt')
+  // TEMP: Issue with inodes not always being set for files
+  getFilesWithMissingIno() {
+    var afs = this._audioFiles.filter(af => !af.ino)
+    var ofs = this._otherFiles.filter(f => !f.ino)
+    var ts = this._tracks.filter(t => !t.ino)
+    return afs.concat(ofs).concat(ts)
   }
 
   bookToJSON() {
@@ -137,6 +164,8 @@ class Audiobook {
     return {
       id: this.id,
       ino: this.ino,
+      libraryId: this.libraryId,
+      folderId: this.folderId,
       title: this.title,
       author: this.author,
       cover: this.cover,
@@ -144,14 +173,17 @@ class Audiobook {
       fullPath: this.fullPath,
       addedAt: this.addedAt,
       lastUpdate: this.lastUpdate,
+      lastScan: this.lastScan,
+      scanVersion: this.scanVersion,
       missingParts: this.missingParts,
       tags: this.tags,
       book: this.bookToJSON(),
       tracks: this.tracksToJSON(),
-      audioFiles: (this.audioFiles || []).map(audioFile => audioFile.toJSON()),
-      otherFiles: (this.otherFiles || []).map(otherFile => otherFile.toJSON()),
+      audioFiles: this._audioFiles.map(audioFile => audioFile.toJSON()),
+      otherFiles: this._otherFiles.map(otherFile => otherFile.toJSON()),
       chapters: this.chapters || [],
-      isMissing: !!this.isMissing
+      isMissing: !!this.isMissing,
+      isInvalid: !!this.isInvalid
     }
   }
 
@@ -159,6 +191,8 @@ class Audiobook {
     return {
       id: this.id,
       ino: this.ino,
+      libraryId: this.libraryId,
+      folderId: this.folderId,
       book: this.bookToJSON(),
       tags: this.tags,
       path: this.path,
@@ -170,16 +204,22 @@ class Audiobook {
       hasBookMatch: !!this.book,
       hasMissingParts: this.missingParts ? this.missingParts.length : 0,
       hasInvalidParts: this.invalidParts ? this.invalidParts.length : 0,
-      numEbooks: this.ebooks.length,
+      // numEbooks: this.ebooks.length,
+      ebooks: this.ebooks.map(ebook => ebook.toJSON()),
+      numEbooks: (this.hasEpub || this.hasMobi) ? 1 : 0, // Only supporting epubs in the reader currently
       numTracks: this.tracks.length,
       chapters: this.chapters || [],
-      isMissing: !!this.isMissing
+      isMissing: !!this.isMissing,
+      isInvalid: !!this.isInvalid
     }
   }
 
   toJSONExpanded() {
     return {
       id: this.id,
+      ino: this.ino,
+      libraryId: this.libraryId,
+      folderId: this.folderId,
       path: this.path,
       fullPath: this.fullPath,
       addedAt: this.addedAt,
@@ -190,14 +230,16 @@ class Audiobook {
       sizePretty: this.sizePretty,
       missingParts: this.missingParts,
       invalidParts: this.invalidParts,
-      audioFiles: (this.audioFiles || []).map(audioFile => audioFile.toJSON()),
-      otherFiles: (this.otherFiles || []).map(otherFile => otherFile.toJSON()),
-      ebooks: (this.ebooks || []).map(ebook => ebook.toJSON()),
+      audioFiles: this._audioFiles.map(audioFile => audioFile.toJSON()),
+      otherFiles: this._otherFiles.map(otherFile => otherFile.toJSON()),
+      ebooks: this.ebooks.map(ebook => ebook.toJSON()),
+      numEbooks: this.hasEpub ? 1 : 0,
       tags: this.tags,
       book: this.bookToJSON(),
       tracks: this.tracksToJSON(),
       chapters: this.chapters || [],
-      isMissing: !!this.isMissing
+      isMissing: !!this.isMissing,
+      isInvalid: !!this.isInvalid
     }
   }
 
@@ -276,13 +318,10 @@ class Audiobook {
     return hasUpdates
   }
 
-  // Scans in v1.3.0 or lower will need to rescan audiofiles to pickup metadata and embedded cover
-  checkNeedsAudioFileRescan() {
-    return !!(this.audioFiles || []).find(af => af.isOldAudioFile || af.codec === null)
-  }
-
   setData(data) {
     this.id = (Math.trunc(Math.random() * 1000) + Date.now()).toString(36)
+    this.libraryId = data.libraryId || 'main'
+    this.folderId = data.folderId || 'audiobooks'
     this.ino = data.ino || null
 
     this.path = data.path
@@ -299,7 +338,27 @@ class Audiobook {
     this.setBook(data)
   }
 
+  checkHasOldCoverPath() {
+    return this.book.cover && !this.book.coverFullPath
+  }
+
+  setLastScan(version) {
+    this.lastScan = Date.now()
+    this.lastUpdate = Date.now()
+    this.scanVersion = version
+  }
+
   setBook(data) {
+    // Use first image file as cover
+    if (this.otherFiles && this.otherFiles.length) {
+      var imageFile = this.otherFiles.find(f => f.filetype === 'image')
+      if (imageFile) {
+        data.coverFullPath = Path.normalize(imageFile.fullPath)
+        var relImagePath = imageFile.path.replace(this.path, '')
+        data.cover = Path.normalize(Path.join(`/s/book/${this.id}`, relImagePath))
+      }
+    }
+
     this.book = new Book()
     this.book.setData(data)
   }
@@ -350,9 +409,9 @@ class Audiobook {
   }
 
   // Cover Url may be the same, this ensures the lastUpdate is updated
-  updateBookCover(cover) {
+  updateBookCover(cover, coverFullPath) {
     if (!this.book) return false
-    return this.book.updateCover(cover)
+    return this.book.updateCover(cover, coverFullPath)
   }
 
   updateAudioTracks(orderedFileData) {
@@ -382,6 +441,7 @@ class Audiobook {
         this.addTrack(file)
       }
     })
+    this.setChapters()
     this.lastUpdate = Date.now()
   }
 
@@ -400,11 +460,12 @@ class Audiobook {
 
     var current_index = 1
     var missingParts = []
+
     for (let i = 0; i < this.tracks.length; i++) {
       var _track = this.tracks[i]
       if (_track.index > current_index) {
         var num_parts_missing = _track.index - current_index
-        for (let x = 0; x < num_parts_missing; x++) {
+        for (let x = 0; x < num_parts_missing && x < 9999; x++) {
           missingParts.push(current_index + x)
         }
       }
@@ -423,22 +484,26 @@ class Audiobook {
   }
 
   // On scan check other files found with other files saved
-  async syncOtherFiles(newOtherFiles, forceRescan = false) {
+  async syncOtherFiles(newOtherFiles, metadataPath, forceRescan = false) {
     var hasUpdates = false
 
     var currOtherFileNum = this.otherFiles.length
 
-    var alreadyHadDescTxt = this.otherFiles.find(of => of.filename === 'desc.txt')
+    var alreadyHasDescTxt = this.otherFiles.find(of => of.filename === 'desc.txt')
+    var alreadyHasReaderTxt = this.otherFiles.find(of => of.filename === 'reader.txt')
 
     var newOtherFilePaths = newOtherFiles.map(f => f.path)
     this.otherFiles = this.otherFiles.filter(f => newOtherFilePaths.includes(f.path))
 
     // Some files are not there anymore and filtered out
-    if (currOtherFileNum !== this.otherFiles.length) hasUpdates = true
+    if (currOtherFileNum !== this.otherFiles.length) {
+      Logger.debug(`[Audiobook] ${currOtherFileNum - this.otherFiles.length} other files were removed for "${this.title}"`)
+      hasUpdates = true
+    }
 
-    // If desc.txt is new or forcing rescan then read it and update description if empty
+    // If desc.txt is new or forcing rescan then read it and update description (will overwrite)
     var descriptionTxt = newOtherFiles.find(file => file.filename === 'desc.txt')
-    if (descriptionTxt && (!alreadyHadDescTxt || forceRescan)) {
+    if (descriptionTxt && (!alreadyHasDescTxt || forceRescan)) {
       var newDescription = await readTextFile(descriptionTxt.fullPath)
       if (newDescription) {
         Logger.debug(`[Audiobook] Sync Other File desc.txt: ${newDescription}`)
@@ -446,10 +511,19 @@ class Audiobook {
         hasUpdates = true
       }
     }
+    // If reader.txt is new or forcing rescan then read it and update narrator (will overwrite)
+    var readerTxt = newOtherFiles.find(file => file.filename === 'reader.txt')
+    if (readerTxt && (!alreadyHasReaderTxt || forceRescan)) {
+      var newReader = await readTextFile(readerTxt.fullPath)
+      if (newReader) {
+        Logger.debug(`[Audiobook] Sync Other File reader.txt: ${newReader}`)
+        this.update({ book: { narrator: newReader } })
+        hasUpdates = true
+      }
+    }
 
-    // TODO: Should use inode
     newOtherFiles.forEach((file) => {
-      var existingOtherFile = this.otherFiles.find(f => f.path === file.path)
+      var existingOtherFile = this.otherFiles.find(f => f.ino === file.ino)
       if (!existingOtherFile) {
         Logger.debug(`[Audiobook] New other file found on sync ${file.filename} | "${this.title}"`)
         this.addOtherFile(file)
@@ -457,23 +531,79 @@ class Audiobook {
       }
     })
 
-    // Check if cover was a local image and that it still exists
+
     var imageFiles = this.otherFiles.filter(f => f.filetype === 'image')
+
+    // OLD Path Check if cover was a local image and that it still exists
     if (this.book.cover && this.book.cover.substr(1).startsWith('local')) {
-      var coverStillExists = imageFiles.find(f => comparePaths(f.path, this.book.cover.substr('/local/'.length)))
+      var coverStripped = this.book.cover.substr('/local/'.length)
+      // Check if was removed first
+      var coverStillExists = imageFiles.find(f => comparePaths(f.path, coverStripped))
       if (!coverStillExists) {
         Logger.info(`[Audiobook] Local cover was removed | "${this.title}"`)
-        this.book.cover = null
+        this.book.removeCover()
+      } else {
+        var oldFormat = this.book.cover
+
+        // Update book cover path to new format
+        this.book.coverFullPath = Path.normalize(Path.join(this.fullPath, this.book.cover.substr(7)))
+        this.book.cover = Path.normalize(coverStripped.replace(this.path, `/s/book/${this.id}`))
+        Logger.debug(`[Audiobook] updated book cover to new format "${oldFormat}" => "${this.book.cover}"`)
+      }
+      hasUpdates = true
+    }
+
+    // Check if book was removed from book dir
+    if (this.book.cover && this.book.cover.substr(1).startsWith('s\\book\\')) {
+      // Fixing old cover paths
+      if (!this.book.coverFullPath) {
+        this.book.coverFullPath = Path.normalize(Path.join(this.fullPath, this.book.cover.substr(`/s/book/${this.id}`.length)))
+        Logger.debug(`[Audiobook] Metadata cover full path set "${this.book.coverFullPath}" for "${this.title}"`)
         hasUpdates = true
       }
+
+      var coverStillExists = imageFiles.find(f => f.fullPath === this.book.coverFullPath)
+      if (!coverStillExists) {
+        Logger.info(`[Audiobook] Local cover "${this.book.cover}" was removed | "${this.title}"`)
+        this.book.removeCover()
+        hasUpdates = true
+      }
+    }
+
+    if (this.book.cover && this.book.cover.substr(1).startsWith('metadata')) {
+      // Fixing old cover paths
+      if (!this.book.coverFullPath) {
+        this.book.coverFullPath = Path.normalize(Path.join(metadataPath, this.book.cover.substr('/metadata/'.length)))
+        Logger.debug(`[Audiobook] Metadata cover full path set "${this.book.coverFullPath}" for "${this.title}"`)
+        hasUpdates = true
+      }
+      var coverStillExists = imageFiles.find(f => f.fullPath === this.book.coverFullPath)
+      if (!coverStillExists) {
+        Logger.info(`[Audiobook] Metadata cover "${this.book.cover}" was removed | "${this.title}"`)
+        this.book.removeCover()
+        hasUpdates = true
+      }
+    }
+
+    if (this.book.cover && !this.book.coverFullPath) {
+      if (this.book.cover.startsWith('http')) {
+        Logger.debug(`[Audiobook] Still using http path for cover "${this.book.cover}" - should update to local`)
+        this.book.coverFullPath = this.book.cover
+        hasUpdates = true
+      } else {
+        Logger.warn(`[Audiobook] Full cover path still not set "${this.book.cover}"`)
+      }
     }
 
     // If no cover set and image file exists then use it
     if (!this.book.cover && imageFiles.length) {
-      this.book.cover = Path.join('/local', imageFiles[0].path)
-      Logger.info(`[Audiobook] Local cover was set | "${this.title}"`)
+      var imagePathRelativeToBook = imageFiles[0].path.replace(this.path, '')
+      this.book.cover = Path.normalize(Path.join(`/s/book/${this.id}`, imagePathRelativeToBook))
+      this.book.coverFullPath = imageFiles[0].fullPath
+      Logger.info(`[Audiobook] Local cover was set to "${this.book.cover}" | "${this.title}"`)
       hasUpdates = true
     }
+
     return hasUpdates
   }
 
@@ -505,6 +635,10 @@ class Audiobook {
     return this.book.isSearchMatch(search.toLowerCase().trim())
   }
 
+  searchQuery(search) {
+    return this.book.getQueryMatches(search.toLowerCase().trim())
+  }
+
   getAudioFileByIno(ino) {
     return this.audioFiles.find(af => af.ino === ino)
   }
@@ -570,6 +704,12 @@ class Audiobook {
     var coverFilename = audioFileWithCover.embeddedCoverArt === 'png' ? 'cover.png' : 'cover.jpg'
     var coverFilePath = Path.join(coverDirFullPath, coverFilename)
 
+    var coverAlreadyExists = await fs.pathExists(coverFilePath)
+    if (coverAlreadyExists) {
+      Logger.warn(`[Audiobook] Extract embedded cover art but cover already exists for "${this.title}" - bail`)
+      return false
+    }
+
     var success = await extractCoverArt(audioFileWithCover.fullPath, coverFilePath)
     if (success) {
       var coverRelPath = Path.join(coverDirRelPath, coverFilename)
@@ -579,16 +719,32 @@ class Audiobook {
     return false
   }
 
-  // If desc.txt exists then use it as description
-  async saveDescriptionFromTextFile() {
-    var descriptionTextFile = this.otherFiles.find(file => file.filename === 'desc.txt')
-    if (!descriptionTextFile) return false
-    var newDescription = await readTextFile(descriptionTextFile.fullPath)
-    if (!newDescription) return false
-    return this.update({ book: { description: newDescription } })
+  // Look for desc.txt and reader.txt and update details if found
+  async saveDataFromTextFiles() {
+    var bookUpdatePayload = {}
+    var descriptionText = await this.fetchTextFromTextFile('desc.txt')
+    if (descriptionText) {
+      Logger.debug(`[Audiobook] "${this.title}" found desc.txt updating description with "${descriptionText.slice(0, 20)}..."`)
+      bookUpdatePayload.description = descriptionText
+    }
+    var readerText = await this.fetchTextFromTextFile('reader.txt')
+    if (readerText) {
+      Logger.debug(`[Audiobook] "${this.title}" found reader.txt updating narrator with "${readerText}"`)
+      bookUpdatePayload.narrator = readerText
+    }
+    if (Object.keys(bookUpdatePayload).length) {
+      return this.update({ book: bookUpdatePayload })
+    }
+    return false
   }
 
-  // Audio file metadata tags map to EMPTY book details
+  fetchTextFromTextFile(textfileName) {
+    var textFile = this.otherFiles.find(file => file.filename === textfileName)
+    if (!textFile) return false
+    return readTextFile(textFile.fullPath)
+  }
+
+  // Audio file metadata tags map to book details (will not overwrite)
   setDetailsFromFileMetadata() {
     if (!this.audioFiles.length) return false
     var audioFile = this.audioFiles[0]

server/objects/AudiobookProgress.js

@@ -1,6 +1,7 @@
 class AudiobookProgress {
   constructor(progress) {
     this.audiobookId = null
+    this.audiobookTitle = null
     this.totalDuration = null // seconds
     this.progress = null // 0 to 1
     this.currentTime = null // seconds
@@ -17,6 +18,7 @@ class AudiobookProgress {
   toJSON() {
     return {
       audiobookId: this.audiobookId,
+      audiobookTitle: this.audiobookTitle,
       totalDuration: this.totalDuration,
       progress: this.progress,
       currentTime: this.currentTime,
@@ -29,6 +31,7 @@ class AudiobookProgress {
 
   construct(progress) {
     this.audiobookId = progress.audiobookId
+    this.audiobookTitle = progress.audiobookTitle || null
     this.totalDuration = progress.totalDuration
     this.progress = progress.progress
     this.currentTime = progress.currentTime
@@ -40,6 +43,7 @@ class AudiobookProgress {
 
   updateFromStream(stream) {
     this.audiobookId = stream.audiobookId
+    this.audiobookTitle = stream.audiobookTitle
     this.totalDuration = stream.totalDuration
     this.progress = stream.clientProgress
     this.currentTime = stream.clientCurrentTime