Merge pull request #20 from zaanposni/release/1.2.2

release/1.2.2
zaanposni · Jan 22, 2024 · 9f85b34 · 9f85b34
2 parents 612ee48 + ff0bc8f
commit 9f85b34
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/src/dataimport/informationopenaianalyze.py b/src/dataimport/informationopenaianalyze.py
@@ -116,7 +116,7 @@ async def openai():
                     continue
 
                 start_date = parse(stream["start"])
-                start_date = start_date.replace(tzinfo=timezone.utc)
+                start_date = start_date.astimezone(timezone.utc)
                 if start_date.year < datetime.now().year:
                     start_date = start_date.replace(year=datetime.now().year)
 

diff --git a/src/dataimport/pietsmietdeuploadplan.py b/src/dataimport/pietsmietdeuploadplan.py
@@ -221,6 +221,18 @@ async def stuff() -> asyncio.coroutine:
             await db.execute(query)
             console.log(f"Updated entry for {content.title} on {content.time}.")
         elif content.type == "TwitchStream" or not existing_imports_for_today:
+            if content.type == "TwitchStream":
+                query = "SELECT * FROM ScheduledContentPiece WHERE startDate = '{}' AND type = 'TwitchStream'".format(
+                    content.time.strftime("%Y-%m-%d %H:%M:%S")
+                )
+                result = await db.fetch_all(query)
+                if len(result) > 0:
+                    console.log(
+                        f"Found existing entry for stream {content.title} on {content.time}. Skipping...",
+                        style="bold yellow",
+                    )
+                    continue
+
             console.log(
                 f"Adding {content.title} on {content.time} to database...",
                 style="bold yellow",

diff --git a/src/psaggregator/package-lock.json b/src/psaggregator/package-lock.json
diff --git a/src/psaggregator/package.json b/src/psaggregator/package.json
@@ -1,6 +1,6 @@
 {
     "name": "psaggregator",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "scripts": {
         "dev": "vite dev",
         "build": "vite build",

diff --git a/src/psaggregator/src/lib/components/UploadPlanEntry.svelte b/src/psaggregator/src/lib/components/UploadPlanEntry.svelte
@@ -28,7 +28,7 @@
         <span class="overflow-x-hidden text-ellipsis whitespace-nowrap" title={entry.title}>{entry.title}</span>
         {#if entry.importedFrom === "OpenAI"}
             <div class="grow" />
-            <div class="shrink-0" title="Diese Ressource wurde von der OpenAI Vision AI erstellt">
+            <div class="shrink-0" title="Diese Ressource wurde von der OpenAI Vision AI importiert">
                 <Sparkle />
             </div>
         {/if}
@@ -54,7 +54,7 @@
         <span class="overflow-x-hidden text-ellipsis whitespace-nowrap" title={entry.title}>{entry.title}</span>
         {#if entry.importedFrom === "OpenAI"}
             <div class="grow" />
-            <div class="shrink-0" title="Diese Ressource wurde von der OpenAI Vision AI erstellt">
+            <div class="shrink-0" title="Diese Ressource wurde von der OpenAI Vision AI importiert">
                 <Sparkle />
             </div>
         {/if}