✨ Improved transitions

- Better export - Audio will not start if error - Fixed VideoPsalm issue - Open Cache folder button - Fixed capitalize with special chars first - Fixed output paint freeze - New version
ChurchApps · Jun 28, 2024 · 66bf6aa · 66bf6aa
1 parent 7711870
commit 66bf6aa
Show file tree

Hide file tree

Showing 27 changed files with 244 additions and 101 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "freeshow",
-    "version": "1.1.8",
+    "version": "1.1.9",
     "private": true,
     "main": "build/electron/index.js",
     "description": "Show song lyrics and more for free!",

diff --git a/public/lang/en.json b/public/lang/en.json
@@ -540,6 +540,7 @@
         "delete_shows_not_indexed": "Delete shows in 'Shows' folder that are not indexed",
         "delete_thumbnail_cache": "Delete thumbnail cache",
         "open_log_file": "Open log file",
+        "open_cache_folder": "Open cache folder",
         "refresh_all_shows": "Get all shows in 'Shows' folder",
         "start_timer": "Start timer",
         "stop_timers": "Stop active timers",

diff --git a/src/electron/data/export.ts b/src/electron/data/export.ts
@@ -7,9 +7,10 @@ import fs from "fs"
 import { join } from "path"
 import { EXPORT, MAIN, STARTUP } from "../../types/Channels"
 import { isProd, toApp } from "../index"
-import { dataFolderNames, doesPathExist, getDataFolder, openSystemFolder, selectFolderDialog } from "../utils/files"
+import { dataFolderNames, doesPathExist, getDataFolder, openSystemFolder, parseShow, readFile, selectFolderDialog } from "../utils/files"
 import { exportOptions } from "../utils/windowOptions"
 import { Message } from "../../types/Socket"
+import { getAllShows } from "../utils/responses"
 
 // SHOW: .show, PROJECT: .project, BIBLE: .fsb
 const customJSONExtensions: any = {
@@ -35,6 +36,11 @@ export function startExport(_e: any, msg: Message) {
         return
     }
 
+    if (msg.channel === "ALL_SHOWS") {
+        exportAllShows(msg.data)
+        return
+    }
+
     if (msg.channel !== "GENERATE") return
 
     if (msg.data.type === "pdf") createPDFWindow(msg.data)
@@ -44,16 +50,16 @@ export function startExport(_e: any, msg: Message) {
 
 // only open once per session
 let systemOpened: boolean = false
-function doneWritingFile(err: any, exportFolder: string) {
+function doneWritingFile(err: any, exportFolder: string, toMain: boolean = true) {
     let msg: string = "export.exported"
 
     // open export location in system when completed
     if (!err && !systemOpened) {
         openSystemFolder(exportFolder)
         systemOpened = true
-    } else msg = err
+    } else if (err) msg = err
 
-    toApp(MAIN, { channel: "ALERT", data: msg })
+    if (toMain) toApp(MAIN, { channel: "ALERT", data: msg })
 }
 
 // ----- PDF -----
@@ -118,8 +124,8 @@ export function exportJSON(content: any, extension: string, path: string) {
 // ----- TXT -----
 
 export function exportTXT(data: any) {
-    data.shows.forEach((show: any) => {
-        writeFile(join(data.path, show.name), ".txt", getSlidesText(show), "utf-8", (err: any) => doneWritingFile(err, data.path))
+    data.shows.forEach((show: any, i: number) => {
+        writeFile(join(data.path, show.name), ".txt", getSlidesText(show), "utf-8", (err: any) => doneWritingFile(err, data.path, i >= data.shows.length - 1))
     })
 }
 
@@ -168,6 +174,28 @@ function getSlidesText(show: any) {
     return text.trim()
 }
 
+// ----- ALL SHOWS -----
+
+function exportAllShows(data: any) {
+    let type = data.type || "txt"
+
+    if (type !== "txt") return
+
+    let allShows: string[] = getAllShows({ path: data.showsPath })
+    let shows: any[] = []
+    for (let i = 0; i < allShows.length; i++) {
+        const showName: string = allShows[i]
+        const showFilePath = join(data.showsPath, showName)
+        // WIP override existing instead of creating new?
+        const showContent: any = parseShow(readFile(showFilePath))
+
+        if (showContent?.[1]) shows.push(showContent[1])
+    }
+
+    if (shows.length) exportTXT({ ...data, shows })
+    else toApp(MAIN, { channel: "ALERT", data: "Exported 0 shows!" })
+}
+
 // ----- PROJECT -----
 
 export function exportProject(data: any) {

diff --git a/src/electron/data/thumbnails.ts b/src/electron/data/thumbnails.ts
@@ -61,7 +61,7 @@ async function generateThumbnail(data: Thumbnail) {
 }
 
 let thumbnailFolderPath: string = ""
-function getThumbnailFolderPath() {
+export function getThumbnailFolderPath() {
     if (thumbnailFolderPath) return thumbnailFolderPath
 
     let p: string = path.join(app.getPath("temp"), "freeshow-cache")

diff --git a/src/electron/utils/responses.ts b/src/electron/utils/responses.ts
@@ -13,7 +13,7 @@ import { restoreFiles } from "../data/backup"
 import { downloadMedia } from "../data/downloadMedia"
 import { importShow } from "../data/import"
 import { error_log } from "../data/store"
-import { getThumbnail, saveImage } from "../data/thumbnails"
+import { getThumbnail, getThumbnailFolderPath, saveImage } from "../data/thumbnails"
 import { outputWindows } from "../output/output"
 import { closeServers, startServers } from "../servers"
 import { Message } from "./../../types/Socket"
@@ -107,6 +107,7 @@ const mainResponses: any = {
     DATA_PATH: (): string => getDocumentsFolder(null, ""),
     LOG_ERROR: (data: any) => logError(data),
     OPEN_LOG: () => openSystemFolder(error_log.path),
+    OPEN_CACHE: () => openSystemFolder(getThumbnailFolderPath()),
     // SHOWS
     DELETE_SHOWS: (data: any) => deleteShowsNotIndexed(data),
     REFRESH_SHOWS: (data: any) => refreshAllShows(data),

diff --git a/src/frontend/components/context/menuClick.ts b/src/frontend/components/context/menuClick.ts
@@ -83,7 +83,11 @@ const actions: any = {
     save: () => save(),
     import: () => activePopup.set("import"),
     export_more: () => activePopup.set("export"),
-    settings: () => activePage.set("settings"),
+    settings: () => {
+        if (get(activePage) === "stage") settingsTab.set("connection")
+        else if (get(activePage) === "settings") settingsTab.set("general")
+        activePage.set("settings")
+    },
     quit: () => {
         if (get(saved)) send(MAIN, ["CLOSE"])
         else activePopup.set("unsaved")

diff --git a/src/frontend/components/draw/Paint.svelte b/src/frontend/components/draw/Paint.svelte
@@ -6,7 +6,7 @@
 
     export let settings: any = {}
 
-    $: currentOutput = $outputs[getActiveOutputs()[0]]
+    $: currentOutput = $outputs[getActiveOutputs()[0]] || {}
     $: currentLayout = currentOutput.out?.slide ? _show(currentOutput.out.slide.id).layouts([currentOutput.out.slide.layout]).ref()[0] : []
     $: currentSlide = currentOutput.out?.slide ? (currentOutput.out.slide.id === "temp" ? { items: currentOutput.out.slide.tempItems } : _show(currentOutput.out.slide.id).slides([currentLayout![currentOutput.out.slide.index!].id]).get()[0]) : null
     $: resolution = getResolution(currentSlide?.settings?.resolution, { $outputs, $styles })

diff --git a/src/frontend/components/drawer/bible/Scripture.svelte b/src/frontend/components/drawer/bible/Scripture.svelte
@@ -31,7 +31,6 @@
     let chapterId: any = cachedRef?.chapterId ?? "GEN.1"
     let activeVerses: string[] = cachedRef?.activeVerses || ["1"]
 
-    $: console.log(verses, bibles)
     $: if (bookId || chapterId || verses || activeVerses) updateActive()
     function updateActive() {
         if (!loaded) return

diff --git a/src/frontend/components/drawer/bible/scripture.ts b/src/frontend/components/drawer/bible/scripture.ts
@@ -7,6 +7,7 @@ import { clone, removeDuplicates } from "../../helpers/array"
 
 const api = "https://api.scripture.api.bible/v1/bibles/"
 let tempCache: any = {}
+let fetchTimeout: any = null
 export async function fetchBible(load: string, active: string, ref: any = { versesList: [], bookId: "GEN", chapterId: "GEN.1" }) {
     let versesId: any = null
     if (ref.versesList.length) {
@@ -22,19 +23,27 @@ export async function fetchBible(load: string, active: string, ref: any = { vers
         versesText: `${api}${active}/verses/${versesId}`,
     }
 
+    if (fetchTimeout) clearTimeout(fetchTimeout)
     if (tempCache[urls[load]]) return tempCache[urls[load]]
 
     return new Promise((resolve, reject) => {
         if (!get(bibleApiKey)) return reject("No API key!")
         if (urls[load].includes("null")) return reject("Something went wrong!")
 
+        fetchTimeout = setTimeout(() => {
+            // WIP display error messages...
+            reject("Timed out!")
+        }, 10000)
+
         fetch(urls[load], { headers: { "api-key": get(bibleApiKey) } })
             .then((response) => response.json())
             .then((data) => {
                 tempCache[urls[load]] = data.data
+                clearTimeout(fetchTimeout)
                 resolve(data.data)
             })
             .catch((e) => {
+                clearTimeout(fetchTimeout)
                 reject(e)
             })
     })

diff --git a/src/frontend/components/drawer/live/NDIStreams.svelte b/src/frontend/components/drawer/live/NDIStreams.svelte
@@ -9,7 +9,7 @@
 
     let sources: any[] = []
 
-    $: currentOutput = $outputs[getActiveOutputs()[0]]
+    $: currentOutput = $outputs[getActiveOutputs()[0]] || {}
 
     const receiveNDI: any = {
         RECEIVE_LIST: (msg) => {

diff --git a/src/frontend/components/drawer/live/Screens.svelte b/src/frontend/components/drawer/live/Screens.svelte
@@ -13,7 +13,7 @@
     receive(MAIN, { GET_SCREENS: (d: any) => (screens = d) }, "GET_SCREENS")
     onDestroy(() => destroy(MAIN, "GET_SCREENS"))
 
-    $: currentOutput = $outputs[getActiveOutputs()[0]]
+    $: currentOutput = $outputs[getActiveOutputs()[0]] || {}
 
     $: console.log(screens)
 </script>

diff --git a/src/frontend/components/drawer/live/Windows.svelte b/src/frontend/components/drawer/live/Windows.svelte
@@ -27,7 +27,7 @@
         if (searchValue.length > 1) fullFilteredWindows = fullFilteredWindows.filter((a) => filter(a.name).includes(searchValue))
     }
 
-    $: currentOutput = $outputs[getActiveOutputs()[0]]
+    $: currentOutput = $outputs[getActiveOutputs()[0]] || {}
 </script>
 
 {#if fullFilteredWindows.length}

diff --git a/src/frontend/components/drawer/media/Media.svelte b/src/frontend/components/drawer/media/Media.svelte
@@ -238,7 +238,7 @@
         zoomOpened = false
     }
 
-    $: currentOutput = $outputs[getActiveOutputs()[0]]
+    $: currentOutput = $outputs[getActiveOutputs()[0]] || {}
 
     // select all
     $: if ($selectAllMedia) selectAll()

diff --git a/src/frontend/components/edit/MediaTools.svelte b/src/frontend/components/edit/MediaTools.svelte
@@ -99,7 +99,7 @@
         updateStore("media", { keys: [mediaId, input.id], value })
 
         // update output filters
-        let currentOutput: any = $outputs[getActiveOutputs()[0]]
+        let currentOutput: any = $outputs[getActiveOutputs()[0]] || {}
         if (!currentOutput.out?.background || currentOutput.out?.background?.path !== mediaId) return
 
         let bg = currentOutput.out.background

diff --git a/src/frontend/components/helpers/audio.ts b/src/frontend/components/helpers/audio.ts
@@ -61,9 +61,20 @@ export async function playAudio({ path, name = "", audio = null, stream = null }
     }
 
     if (startAt > 0) audio.currentTime = startAt
-    audio.play()
 
-    analyseAudio()
+    audio.addEventListener("error", (err) => {
+        console.error("Could not get audio:", err)
+
+        playingAudio.update((a) => {
+            delete a[path]
+            return a
+        })
+    })
+
+    audio.addEventListener("canplay", () => {
+        audio.play()
+        analyseAudio()
+    })
 }
 
 // if no "path" is provided it will fade out/clear all audio

diff --git a/src/frontend/components/helpers/showActions.ts b/src/frontend/components/helpers/showActions.ts
@@ -140,7 +140,7 @@ export function nextSlide(e: any, start: boolean = false, end: boolean = false,
     if (document.activeElement instanceof window.HTMLElement) document.activeElement.blur()
 
     let outputId = customOutputId || getActiveOutputs()[0]
-    let currentOutput: any = get(outputs)[outputId]
+    let currentOutput: any = get(outputs)[outputId] || {}
     let slide: null | OutSlide = currentOutput.out?.slide || null
 
     // let layout: SlideData[] = GetLayout(slide ? slide.id : null, slide ? slide.layout : null)
@@ -264,7 +264,7 @@ export function previousSlide(e: any) {
     if (get(outLocked)) return
     if (document.activeElement instanceof window.HTMLElement) document.activeElement.blur()
 
-    let currentOutput: any = get(outputs)[getActiveOutputs()[0]]
+    let currentOutput: any = get(outputs)[getActiveOutputs()[0]] || {}
     let slide: null | OutSlide = currentOutput.out?.slide || null
     // let layout: SlideData[] = GetLayout(slide ? slide.id : null, slide ? slide.layout : null)
     let layout: any[] = _show(slide ? slide.id : "active")
@@ -325,7 +325,7 @@ function getNextEnabled(index: null | number, end: boolean = false): null | numb
 
     index++
 
-    let currentOutput: any = get(outputs)[getActiveOutputs()[0]]
+    let currentOutput: any = get(outputs)[getActiveOutputs()[0]] || {}
     let slide: null | OutSlide = currentOutput.out?.slide || null
     let layout: any[] = _show(slide ? slide.id : "active")
         .layouts(slide ? [slide.layout] : "active")
@@ -351,7 +351,7 @@ export function randomSlide() {
     if (document.activeElement instanceof window.HTMLElement) document.activeElement.blur()
 
     let outputId = getActiveOutputs()[0]
-    let currentOutput: any = get(outputs)[outputId]
+    let currentOutput: any = get(outputs)[outputId] || {}
     let slide: null | OutSlide = currentOutput.out?.slide || null
     let showId = slide?.id || get(activeShow)?.id
     if (!showId) return

diff --git a/src/frontend/components/inputs/ShowButton.svelte b/src/frontend/components/inputs/ShowButton.svelte
@@ -85,7 +85,7 @@
     function doubleClick(e: any) {
         if (editActive || $outLocked || e.target.closest("input")) return
 
-        let currentOutput: any = getActiveOutputs()[0]
+        let currentOutput: any = getActiveOutputs()[0] || {}
         let slide: any = currentOutput.out?.slide || null
 
         if (type === "show" && $showsCache[id] && $showsCache[id].layouts[$showsCache[id].settings.activeLayout].slides.length) {

diff --git a/src/frontend/components/main/popups/Export.svelte b/src/frontend/components/main/popups/Export.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { EXPORT } from "../../../../types/Channels"
     import type { Project } from "../../../../types/Projects"
-    import { activePopup, activeProject, activeShow, dataPath, os, projects, selected, showsCache, shows as showsList } from "../../../stores"
+    import { activePopup, activeProject, activeShow, dataPath, os, projects, selected, showsCache, showsPath } from "../../../stores"
     import { newToast } from "../../../utils/common"
     import { send } from "../../../utils/request"
     import Pdf from "../../export/Pdf.svelte"
@@ -32,13 +32,12 @@
             return $selected.data.map(({ id }) => ({ id, ...$showsCache[id] }))
         },
         all_shows: () => {
-            let allShows: any[] = []
-            console.log($showsCache)
-
-            Object.entries($showsCache).forEach(([id, show]) => {
-                allShows.push({ id, ...show })
-            })
-            return allShows
+            // let allShows: any[] = []
+            // console.log($showsCache)
+            // Object.entries($showsCache).forEach(([id, show]) => {
+            //     allShows.push({ id, ...show })
+            // })
+            // return allShows
         },
     }
 
@@ -55,14 +54,17 @@
     let loading: boolean = false
     async function getShowsToExport() {
         shows = []
+        loading = true
+
         if (what.id === "project" && $activeProject) await loadShows($projects[$activeProject].shows.filter(({ type }) => type === undefined || type === "show").map(({ id }) => id))
         else if (what.id === "selected_shows") await loadShows($selected.data.map(({ id }) => id))
         else if (what.id === "all_shows") {
-            loading = true
-            // WIP progress meter & faster loading
-            await loadShows(Object.keys($showsList))
-            loading = false
+            format.id = "txt"
         }
+
+        loading = false
+        if (what.id === "all_shows") return
+
         shows = getShows[what.id]()
     }
 
@@ -104,6 +106,12 @@
             return
         }
 
+        if (what.id === "all_shows") {
+            loading = true
+            send(EXPORT, ["ALL_SHOWS"], { type: "txt", path: $dataPath, showsPath: $showsPath })
+            return
+        }
+
         if (format.id === "project") {
             let project: Project | null = what.id === "project" && $activeProject ? $projects[$activeProject] : null
             if (!project) {
@@ -129,7 +137,11 @@
     <p style="white-space: break-spaces;"><T id="export.export_as" /></p>
     <Dropdown style="min-width: 200px;" options={whats} value={what.name} on:click={(e) => (what = e.detail)} />
     <p style="white-space: break-spaces;"><T id="export.export_as" index={1} />&nbsp;</p>
-    <Dropdown style="min-width: 200px;" options={formats} value={format.name} on:click={(e) => (format = e.detail)} />
+    {#if what.id === "all_shows"}
+        TXT
+    {:else}
+        <Dropdown style="min-width: 200px;" options={formats} value={format.name} on:click={(e) => (format = e.detail)} />
+    {/if}
 </div>
 
 <hr />
@@ -246,7 +258,7 @@
 {/if}
 
 {#if loading}
-    <Center>
+    <Center padding={10}>
         <Loader />
     </Center>
 {/if}
@@ -270,7 +282,7 @@
   </span>
 {/if} -->
 
-<Button style="margin-top: 10px;" disabled={!shows.length} on:click={exportClick} center dark>
+<Button style="margin-top: 10px;" disabled={!shows.length && what.id !== "all_shows"} on:click={exportClick} center dark>
     <Icon id="export" size={1.2} right />
     <T id="export.export" />
     {#if shows.length > 1 && format.id !== "project"}