Version bump 2.0.20

Merge branch 'master' of https://github.com/advplyr/audiobookshelf
Fix:Switching to next track pausing player #685
2026-01-05 22:19:53 -05:00 · 2022-06-05 10:59:01 -05:00 · 2022-06-05 10:16:19 -05:00 · 2022-06-05 10:06:07 -05:00 · 2022-06-04 20:56:04 -05:00 · 2022-06-04 17:50:26 -07:00
10 changed files with 40 additions and 32 deletions
--- a/client/components/modals/ListeningSessionModal.vue
+++ b/client/components/modals/ListeningSessionModal.vue
@@ -87,7 +87,7 @@
          <p class="mb-1">{{ playMethodName }}</p>
          <p class="mb-1">{{ _session.mediaPlayer }}</p>

-          <p class="font-semibold uppercase text-xs text-gray-400 tracking-wide mt-6 mb-2">Device</p>
+          <p v-if="hasDeviceInfo" class="font-semibold uppercase text-xs text-gray-400 tracking-wide mt-6 mb-2">Device</p>
          <p v-if="deviceInfo.ipAddress" class="mb-1">{{ deviceInfo.ipAddress }}</p>
          <p v-if="osDisplayName" class="mb-1">{{ osDisplayName }}</p>
          <p v-if="deviceInfo.browserName" class="mb-1">{{ deviceInfo.browserName }}</p>
@@ -127,6 +127,9 @@ export default {
    deviceInfo() {
      return this._session.deviceInfo || {}
    },
+    hasDeviceInfo() {
+      return Object.keys(this.deviceInfo).length
+    },
    osDisplayName() {
      if (!this.deviceInfo.osName) return null
      return `${this.deviceInfo.osName} ${this.deviceInfo.osVersion}`
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "audiobookshelf-client",
-  "version": "2.0.19",
+  "version": "2.0.20",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
  "name": "audiobookshelf-client",
-  "version": "2.0.19",
+  "version": "2.0.20",
  "description": "Self-hosted audiobook and podcast client",
  "main": "index.js",
  "scripts": {
--- a/client/pages/config/sessions.vue
+++ b/client/pages/config/sessions.vue
@@ -8,21 +8,22 @@

          <ui-dropdown v-model="selectedUser" :items="userItems" label="Filter by User" small class="max-w-48" @input="updateUserFilter" />
        </div>
-        <div v-if="listeningSessions.length">
+        <div v-if="listeningSessions.length" class="block max-w-full">
          <table class="userSessionsTable">
            <tr class="bg-primary bg-opacity-40">
-              <th class="flex-grow text-left">Item</th>
-              <th class="w-20 text-left">User</th>
-              <th class="w-32 text-left hidden md:table-cell">Play Method</th>
-              <th class="w-40 text-left hidden sm:table-cell">Device Info</th>
-              <th class="w-20">Listened</th>
-              <th class="w-20">Last Time</th>
-              <th class="w-40 hidden sm:table-cell">Last Update</th>
+              <th class="w-48 min-w-48 text-left">Item</th>
+              <th class="w-20 min-w-20 text-left hidden md:table-cell">User</th>
+              <th class="w-32 min-w-32 text-left hidden md:table-cell">Play Method</th>
+              <th class="w-32 min-w-32 text-left hidden sm:table-cell">Device Info</th>
+              <th class="w-32 min-w-32">Listened</th>
+              <th class="w-16 min-w-16">Last Time</th>
+              <th class="flex-grow hidden sm:table-cell">Last Update</th>
            </tr>
+
            <tr v-for="session in listeningSessions" :key="session.id" class="cursor-pointer" @click="showSession(session)">
-              <td class="py-1">
-                <p class="text-sm text-gray-200">{{ session.displayTitle }}</p>
-                <p class="text-xs text-gray-400">{{ session.displayAuthor }}</p>
+              <td class="py-1 max-w-48">
+                <p class="text-xs text-gray-200 truncate">{{ session.displayTitle }}</p>
+                <p class="text-xs text-gray-400 truncate">{{ session.displayAuthor }}</p>
              </td>
              <td class="hidden md:table-cell">
                <p v-if="filteredUserUsername" class="text-xs">{{ filteredUserUsername }}</p>
@@ -42,7 +43,7 @@
              </td>
              <td class="text-center hidden sm:table-cell">
                <ui-tooltip v-if="session.updatedAt" direction="top" :text="$formatDate(session.updatedAt, 'MMMM do, yyyy HH:mm')">
-                  <p class="text-xs">{{ $dateDistanceFromNow(session.updatedAt) }}</p>
+                  <p class="text-xs text-gray-200">{{ $dateDistanceFromNow(session.updatedAt) }}</p>
                </ui-tooltip>
              </td>
            </tr>
@@ -166,10 +167,11 @@ export default {
 }
 </script>

-<style>
+<style scoped>
 .userSessionsTable {
  border-collapse: collapse;
  width: 100%;
+  max-width: 100%;
  border: 1px solid #474747;
 }
 .userSessionsTable tr:first-child {
--- a/client/pages/config/users/_id/sessions.vue
+++ b/client/pages/config/users/_id/sessions.vue
@@ -21,17 +21,17 @@
        <div v-if="listeningSessions.length">
          <table class="userSessionsTable">
            <tr class="bg-primary bg-opacity-40">
-              <th class="flex-grow text-left">Item</th>
-              <th class="w-32 text-left hidden md:table-cell">Play Method</th>
-              <th class="w-40 text-left hidden sm:table-cell">Device Info</th>
-              <th class="w-20">Listened</th>
-              <th class="w-20">Last Time</th>
-              <th class="w-40 hidden sm:table-cell">Last Update</th>
+              <th class="w-48 min-w-48 text-left">Item</th>
+              <th class="w-32 min-w-32 text-left hidden md:table-cell">Play Method</th>
+              <th class="w-32 min-w-32 text-left hidden sm:table-cell">Device Info</th>
+              <th class="w-32 min-w-32">Listened</th>
+              <th class="w-16 min-w-16">Last Time</th>
+              <th class="flex-grow hidden sm:table-cell">Last Update</th>
            </tr>
            <tr v-for="session in listeningSessions" :key="session.id" class="cursor-pointer" @click="showSession(session)">
-              <td class="py-1">
-                <p class="text-sm text-gray-200">{{ session.displayTitle }}</p>
-                <p class="text-xs text-gray-400">{{ session.displayAuthor }}</p>
+              <td class="py-1 max-w-48">
+                <p class="text-xs text-gray-200 truncate">{{ session.displayTitle }}</p>
+                <p class="text-xs text-gray-400 truncate">{{ session.displayAuthor }}</p>
              </td>
              <td class="hidden md:table-cell">
                <p class="text-xs">{{ getPlayMethodName(session.playMethod) }}</p>
@@ -47,7 +47,7 @@
              </td>
              <td class="text-center hidden sm:table-cell">
                <ui-tooltip v-if="session.updatedAt" direction="top" :text="$formatDate(session.updatedAt, 'MMMM do, yyyy HH:mm')">
-                  <p class="text-xs">{{ $dateDistanceFromNow(session.updatedAt) }}</p>
+                  <p class="text-xs text-gray-200">{{ $dateDistanceFromNow(session.updatedAt) }}</p>
                </ui-tooltip>
              </td>
            </tr>
@@ -149,10 +149,11 @@ export default {
 }
 </script>

-<style>
+<style scoped>
 .userSessionsTable {
  border-collapse: collapse;
  width: 100%;
+  max-width: 100%;
  border: 1px solid #474747;
 }
 .userSessionsTable tr:first-child {
--- a/client/players/LocalAudioPlayer.js
+++ b/client/players/LocalAudioPlayer.js
@@ -71,7 +71,6 @@ export default class LocalAudioPlayer extends EventEmitter {
      console.log(`[LocalPlayer] Track ended - loading next track ${this.currentTrackIndex + 1}`)
      // Has next track
      this.currentTrackIndex++
-      this.playWhenReady = !this.player.paused
      this.startTime = this.currentTrack.startOffset
      this.loadCurrentTrack()
    } else {
@@ -206,10 +205,12 @@ export default class LocalAudioPlayer extends EventEmitter {
  }

  play() {
+    this.playWhenReady = true
    if (this.player) this.player.play()
  }

  pause() {
+    this.playWhenReady = false
    if (this.player) this.player.pause()
  }

--- a/client/tailwind.config.js
+++ b/client/tailwind.config.js
@@ -39,6 +39,7 @@ module.exports = {
        '6': '1.5rem',
        '12': '3rem',
        '16': '4rem',
+        '20': '5rem',
        '24': '6rem',
        '32': '8rem',
        '48': '12rem',
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "audiobookshelf",
-  "version": "2.0.19",
+  "version": "2.0.20",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "audiobookshelf",
-  "version": "2.0.19",
+  "version": "2.0.20",
  "description": "Self-hosted audiobook and podcast server",
  "main": "index.js",
  "scripts": {
--- a/server/managers/AbMergeManager.js
+++ b/server/managers/AbMergeManager.js
@@ -151,7 +151,7 @@ class AbMergeManager {
        input: coverPath,
        options: ['-f image2pipe']
      })
-      ffmpegOptions.push('-vf [2:v]crop=trunc(iw/2)*2:trunc(ih/2)*2')
+      ffmpegOptions.push('-c:v copy')
      ffmpegOptions.push('-map 2:v')
    }

@@ -281,4 +281,4 @@ class AbMergeManager {
    this.downloads = this.downloads.filter(d => d.id !== download.id)
  }
 }
-module.exports = AbMergeManager
+module.exports = AbMergeManager
Author	SHA1	Message	Date
advplyr	ae8f3aa918	Version bump 2.0.20	2022-06-05 10:59:01 -05:00
advplyr	5d4047c171	Merge branch 'master' of https://github.com/advplyr/audiobookshelf	2022-06-05 10:16:19 -05:00
advplyr	6f80591afd	Fix:Switching to next track pausing player #685	2022-06-05 10:06:07 -05:00
advplyr	788d867ec3	Merge pull request #681 from jmt-gh/m4b_no_coverart Fix cover art not being generated for M4B export	2022-06-04 20:56:04 -05:00
jmt-gh	3bc3914fd9	Fix cover art not being generated for m4b export This commit fixes an issue where cover art was not being generated properly when creating an M4B audiobook. More context can be found in discord: https://discord.com/channels/942908292873723984/981321213882282035/982777444631195681	2022-06-04 17:50:26 -07:00
advplyr	3d821dacb7	Fix:Sessions table cleanup	2022-06-04 15:51:00 -05:00