make logs be in proper order

dtcooper · Aug 17, 2023 · 01ffc55 · 01ffc55
1 parent aa804b4
commit 01ffc55
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 15 deletions.
diff --git a/client/src/main/Player.svelte b/client/src/main/Player.svelte
@@ -197,4 +197,10 @@
   {/if}
 </div>
 
-<PlayList {items} numStopsetsToDisableAddMoreAt={$config.STOPSET_PRELOAD_COUNT + numExtraStopsetsToDisableAddMoreAt} {addStopset} {processItem} {pause} />
+<PlayList
+  {items}
+  numStopsetsToDisableAddMoreAt={$config.STOPSET_PRELOAD_COUNT + numExtraStopsetsToDisableAddMoreAt}
+  {addStopset}
+  {processItem}
+  {pause}
+/>
diff --git a/client/src/stores/client-logs.js b/client/src/stores/client-logs.js
@@ -6,25 +6,28 @@ import { client_log_entry_types } from "../../../server/constants.json"
 import { IS_DEV } from "../utils"
 import { conn, messageServer } from "./connection"
 
-let pendingLogs = {}
+let pendingLogs = new Map()
 try {
-  pendingLogs = JSON.parse(window.localStorage.getItem("pending-logs")) || {}
-} catch {}
+  pendingLogs = new Map(JSON.parse(window.localStorage.getItem("pending-logs")) || [])
+} catch (e) {
+  console.warn("Error loading pendingLog:", e)
+}
 
-const savePendingLogs = () => window.localStorage.setItem("pending-logs", JSON.stringify(pendingLogs, null, ""))
+const savePendingLogs = () =>
+  window.localStorage.setItem("pending-logs", JSON.stringify(Array.from(pendingLogs.entries()), null, ""))
 
 export const log = (window.log = (type = "unspecified", description = "") => {
   if (!client_log_entry_types.includes(type)) {
     console.error(`Invalid log type: ${type} - using unspecified`)
     type = "unspecified"
   }
 
-  pendingLogs[uuid()] = { created_at: dayjs().toISOString(), type, description }
+  pendingLogs.set(uuid(), { created_at: dayjs().toISOString(), type, description })
   savePendingLogs()
 })
 
 export const sendPendingLogs = (forceClear = false) => {
-  const entries = Object.entries(pendingLogs)
+  const entries = Array.from(pendingLogs.entries())
   if (entries.length) {
     const { authenticated, connected } = get(conn)
     if (authenticated && connected) {
@@ -41,7 +44,7 @@ export const sendPendingLogs = (forceClear = false) => {
 }
 
 export const acknowledgeLog = (id) => {
-  delete pendingLogs[id]
+  pendingLogs.delete(id)
   savePendingLogs()
 }
 

diff --git a/client/src/stores/player.js b/client/src/stores/player.js
@@ -71,6 +71,13 @@ class GeneratedStopsetAssetBase {
     return this.beforeActive
   }
 
+  get logLine() {
+    const stopset = this.generatedStopset
+    return `[Stopset=${stopset.name}] [Rotator=${this.rotator.name}] [${this.index + 1}/${
+      stopset.items.length
+    }] [Asset=${this.name}]`
+  }
+
   done() {
     this.playing = false
     this.generatedStopset.donePlaying()
@@ -196,10 +203,7 @@ class PlayableAsset extends GeneratedStopsetAssetBase {
 
   done() {
     clearInterval(this.interval)
-    log(
-      this.didSkip ? "skipped_asset" : "played_asset",
-      `[Stopset=${this.generatedStopset.name}] [Rotator=${this.rotator.name}] [Asset=${this.name}]`
-    )
+    log(this.didSkip ? "skipped_asset" : "played_asset", this.logLine)
     super.done()
   }
 
@@ -317,7 +321,7 @@ export class GeneratedStopset {
     if (subindex !== null) {
       this.didSkip = this.didSkip || subindex !== this.current
       this.items.slice(this.current, subindex).forEach((item) => {
-        log("skipped_asset", `[Stopset=${this.name}] [Rotator=${item.rotator.name}] [Asset=${item.name}]`)
+        log("skipped_asset", item.logLine)
         if (item.playable) {
           item.pause()
         }

diff --git a/client/src/utils.js b/client/src/utils.js
@@ -37,7 +37,7 @@ export const tomatoIcon = {
 if (IS_DEV) {
   const originalSetInterval = setInterval
   const originalClearInterval = clearInterval
-  const intervals = window.activeIntervals = new Set()
+  const intervals = (window.activeIntervals = new Set())
   window.setInterval = (...args) => {
     const id = originalSetInterval(...args)
     intervals.add(id)

diff --git a/server/tomato/models/client_log_entry.py b/server/tomato/models/client_log_entry.py
@@ -61,4 +61,4 @@ class Meta:
         verbose_name = "client log entry"
         verbose_name_plural = "client log entries"
         db_table = "logs"
-        ordering = ("-created_at",)
+        ordering = ("-created_at", "-id")
diff --git a/server/tomato/settings.py b/server/tomato/settings.py
@@ -172,6 +172,10 @@
 USE_I18N = True
 USE_TZ = True
 
+# Let nginx handle these
+DATA_UPLOAD_MAX_NUMBER_FIELDS = None
+DATA_UPLOAD_MAX_MEMORY_SIZE = None
+
 STATIC_URL = "/static/"
 STATIC_ROOT = "/serve/static"
 MEDIA_URL = "/assets/"