socket in client, new set of icons

audio-service/metadata.json

@@ -76,18 +76,10 @@
                 "volume": 1
             },
             {
-                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_184043.wav",
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260228_092721.wav",
-                "name": "Clip 20260226_184043",
+                "name": "Clip 20260228_092721",
                 "playbackType": "playStop",
                 "volume": 1
-            },
-            {
-                "endTime": 14.772566995768694,
-                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_194441.wav",
-                "name": "Test",
-                "playbackType": "playStop",
-                "startTime": 9.8548571932299,
-                "volume": 0.6
             }
         ]
     },
@@ -110,6 +102,12 @@
                 "playbackType": "playOverlap",
                 "startTime": 26.14685314685314,
                 "volume": 0.64
+            },
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260228_085116.wav",
+                "name": "pp",
+                "playbackType": "playStop",
+                "volume": 1
             }
         ]
     }

audio-service/src/audio_io.py

@@ -121,7 +121,7 @@ class AudioIO:
         }
         
         meta.add_clip_to_collection("Uncategorized",  clip_metadata )
-
+        self.socket.emit('new_clip', clip_metadata)
         
         return clip_metadata
     

electron-ui/src/main/main.ts

@@ -18,6 +18,8 @@ import { resolveHtmlPath } from './util';
 import registerFileIpcHandlers from '../ipc/audio/main';
 import PythonSubprocessManager from './service';
 
+const pythonManager = new PythonSubprocessManager('src/main.py');
+
 class AppUpdater {
   constructor() {
     log.transports.file.level = 'info';
@@ -124,6 +126,7 @@ const createWindow = async () => {
 app.on('window-all-closed', () => {
   // Respect the OSX convention of having the application in memory even
   // after all windows have been closed
+  pythonManager.stop();
   if (process.platform !== 'darwin') {
     app.quit();
   }
@@ -132,8 +135,7 @@ app.on('window-all-closed', () => {
 app
   .whenReady()
   .then(() => {
-    const pythonManager = new PythonSubprocessManager('src/main.py');
+    // pythonManager.start();
-    pythonManager.start();
     createWindow();
     app.on('activate', () => {
       // On macOS it's common to re-create a window in the app when the

electron-ui/src/redux/main.ts

@@ -67,32 +67,11 @@ const metadataSlice = createSlice({
         targetState.clips.push(clip);
       }
     },
-    addNewClips(state, action) {
+    addNewClip(state, action) {
-      const { collections } = action.payload;
+      const { clip } = action.payload;
-      Object.keys(collections).forEach((collection) => {
+      state.collections.forEach((collection) => {
-        const collectionState = state.collections.find(
+        if (collection.name === 'Uncategorized') {
-          (col) => col.name === collection,
+          collection.clips.push(clip);
-        );
-        if (!collectionState) {
-          state.collections.push({
-            name: collection,
-            id: Date.now(),
-            clips: [],
-          });
-        }
-        const existingFilenames = new Set(
-          state.collections
-            .find((col) => col.name === collection)
-            ?.clips.map((clip) => clip.filename) || [],
-        );
-        const newClips = collections[collection].filter(
-          (clip: ClipMetadata) => !existingFilenames.has(clip.filename),
-        );
-        // const collectionState = state.collections.find(
-        //   (col) => col.name === collection,
-        // );
-        if (collectionState) {
-          collectionState.clips.push(...newClips);
         }
       });
     },
@@ -113,6 +92,6 @@ export type RootState = ReturnType<AppStore['getState']>;
 // Inferred type: {posts: PostsState, comments: CommentsState, users: UsersState}
 export type AppDispatch = AppStore['dispatch'];
 
-export const { setCollections, addNewClips, addCollection } =
+export const { setCollections, addNewClip, addCollection } =
   metadataSlice.actions;
 export default metadataSlice.reducer;

electron-ui/src/renderer/App.tsx

@@ -7,6 +7,7 @@ import { ThemeProvider, createTheme } from '@mui/material/styles';
 import DialogTitle from '@mui/material/DialogTitle';
 import DialogContent from '@mui/material/DialogContent';
 import DialogActions from '@mui/material/DialogActions';
+import io from 'socket.io-client';
 // import 'tailwindcss/tailwind.css';
 import './App.css';
 import ClipList from './components/ClipList';
@@ -14,7 +15,7 @@ import { useAppDispatch, useAppSelector } from './hooks';
 import { store } from '../redux/main';
 import { useNavigate } from 'react-router-dom';
 import SettingsPage from './Settings';
-import apiFetch from './api';
+import { apiFetch, getBaseUrl } from './api';
 
 function MainPage() {
   const dispatch = useAppDispatch();
@@ -27,20 +28,46 @@ function MainPage() {
   const [newCollectionOpen, setNewCollectionOpen] = useState(false);
   const [newCollectionName, setNewCollectionName] = useState<string>('');
   const navigate = useNavigate();
+  const [socket, setSocket] = useState<any>(null);
+
+  useEffect(() => {}, []);
 
   useEffect(() => {
-    const fetchMetadata = async () => {
+    const initializeSocket = async () => {
-      try {
+      const baseUrl = await getBaseUrl();
-        const response = await apiFetch('meta');
+      const newSocket = io(baseUrl);
-        const data = await response.json();
+      setSocket(newSocket);
-        dispatch({ type: 'metadata/setAllData', payload: data });
+      newSocket.on('connect', () => {
-      } catch (error) {
+        console.log('Connected to WebSocket server');
-        console.error('Error fetching metadata:', error);
+      });
-      }
+      newSocket.on('full_data', (data: any) => {
+        console.log('Received full_data from server:', data);
+        dispatch({
+          type: 'metadata/setAllData',
+          payload: { collections: data },
+        });
+      });
+      newSocket.on('new_clip', (data: any) => {
+        console.log('Received new_clips from server:', data);
+        dispatch({
+          type: 'metadata/addNewClip',
+          payload: { clip: data },
+        });
+      });
     };
-    fetchMetadata();
+    initializeSocket();
-    const intervalId = setInterval(fetchMetadata, 5000);
+    // const fetchMetadata = async () => {
-    return () => clearInterval(intervalId);
+    //   try {
+    //     const response = await apiFetch('meta');
+    //     const data = await response.json();
+    //     dispatch({ type: 'metadata/setAllData', payload: data });
+    //   } catch (error) {
+    //     console.error('Error fetching metadata:', error);
+    //   }
+    // };
+    // fetchMetadata();
+    // const intervalId = setInterval(fetchMetadata, 5000);
+    // return () => clearInterval(intervalId);
   }, [dispatch]);
 
   useEffect(() => {

electron-ui/src/renderer/Settings.tsx

@@ -5,7 +5,7 @@ import './App.css';
 import TextField from '@mui/material/TextField';
 import Select from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
-import apiFetch from './api';
+import { apiFetch } from './api';
 
 type AudioDevice = {
   index: number;

electron-ui/src/renderer/api.ts

@@ -1,4 +1,4 @@
-const getBaseUrl = async () => {
+export const getBaseUrl = async () => {
   const port = await window.audio.getPort();
   if (port.error || !port.port) {
     return `http://localhost:5010`;
@@ -7,7 +7,7 @@ const getBaseUrl = async () => {
   return `http://localhost:${port.port}`;
 };
 
-export default async function apiFetch(endpoint: string, options = {}) {
+export async function apiFetch(endpoint: string, options = {}) {
   const url = `${await getBaseUrl()}/${endpoint}`;
   return fetch(url, options);
 }

electron-ui/src/renderer/components/ClipList.tsx

@@ -15,7 +15,7 @@ import { restrictToVerticalAxis } from '@dnd-kit/modifiers';
 import AudioTrimmer from './AudioTrimer';
 import { ClipMetadata } from '../../redux/types';
 import { useAppDispatch, useAppSelector } from '../hooks';
-import apiFetch from '../api';
+import { apiFetch } from '../api';
 
 export interface ClipListProps {
   collection: string;

stream_deck_plugin/ClipTrimDotNet/Client/ClipTrimClient.cs

@@ -53,6 +53,8 @@ namespace ClipTrimDotNet.Client
                     var response = ctx.GetValue<List<CollectionMetaData>>(0);
                     Logger.Instance.LogMessage(TracingLevel.INFO, $"full_data event {JsonConvert.SerializeObject(response)}");
                     Collections = response!;
+                    Player.TickAll();
+                    PageNavigator.TickAll();
                     //Logger.Instance.LogMessage(TracingLevel.INFO, $"Collections {JsonConvert.SerializeObject(Collections)}");
                 }
                 catch (Exception ex)
@@ -71,6 +73,8 @@ namespace ClipTrimDotNet.Client
                     if (index != -1)
                     {
                         Collections[index] = response;
+                        Player.TickAll();
+                        PageNavigator.TickAll();
                     }
                 }
                 catch

stream_deck_plugin/ClipTrimDotNet/ClipTrimDotNet.csproj

@@ -20,6 +20,20 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release\ClipTrimDotNet.sdPlugin\</OutputPath>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Images\app_icon.png" />
+    <None Remove="Images\back.png" />
+    <None Remove="Images\category_icon.png" />
+    <None Remove="Images\collection.png" />
+    <None Remove="Images\collection_icon.png" />
+    <None Remove="Images\page_nav.png" />
+    <None Remove="Images\page_nav_icon.png" />
+    <None Remove="Images\player.png" />
+    <None Remove="Images\player_icon.png" />
+    <None Remove="Images\record.png" />
+    <None Remove="Images\record_icon.png" />
+    <None Remove="manifest.json" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
@@ -54,34 +68,43 @@
     <None Update="DialLayout.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="manifest.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Content Include="!!README!!.txt" />
-    <Content Include="Images\categoryIcon%402x.png">
+    <Content Include="Images\app_icon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Images\categoryIcon.png">
+    <Content Include="Images\back.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Images\icon%402x.png">
+    <Content Include="Images\category_icon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Images\icon.png">
+    <Content Include="Images\collection.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Images\pluginAction%402x.png">
+    <Content Include="Images\collection_icon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Images\pluginAction.png">
+    <Content Include="Images\page_nav.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Images\pluginIcon%402x.png">
+    <Content Include="Images\page_nav_icon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Images\pluginIcon.png">
+    <Content Include="Images\player_icon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Images\record.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+	  <Content Include="Images\player.png">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </Content>
+	  <Content Include="Images\record_icon.png">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </Content>
+    <Content Include="manifest.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="package.json" />

stream_deck_plugin/ClipTrimDotNet/Keys/ProfileSwitcher.cs

@@ -60,7 +60,7 @@ namespace ClipTrimDotNet.Keys
         private async void SetTitle()
         {
 
-            await Connection.SetTitleAsync(settings.ProfileName + " B");
+            await Connection.SetTitleAsync(settings.ProfileName);
         }
 
         private async void Connection_OnSendToPlugin(object? sender, SDEventReceivedEventArgs<BarRaider.SdTools.Events.SendToPlugin> e)

stream_deck_plugin/ClipTrimDotNet/manifest.json

@@ -2,11 +2,11 @@
 
   "Actions": [
     {
-      "Icon": "Images/icon",
+      "Icon": "Images/player_icon",
       "Name": "Player",
       "States": [
         {
-          "Image": "Images/pluginAction",
+          "Image": "Images/player",
           "TitleAlignment": "middle",
           "FontSize": 11
         }
@@ -17,26 +17,26 @@
       "PropertyInspectorPath": "PropertyInspector/file_player.html"
     },
     {
-      "Icon": "Images/icon",
+      "Icon": "Images/collection_icon",
-      "Name": "Profile Switcher",
+      "Name": "Collection Selector",
       "States": [
         {
-          "Image": "Images/pluginAction",
+          "Image": "Images/collection",
           "TitleAlignment": "middle",
           "FontSize": 11
         }
       ],
       "SupportedInMultiActions": false,
-      "Tooltip": "Selects which sub folder to use and opens effect profile",
+      "Tooltip": "Selects which collection to use",
       "UUID": "com.michal-courson.cliptrim.profile-switcher",
       "PropertyInspectorPath": "PropertyInspector/profile_swticher.html"
     },
     {
-      "Icon": "Images/icon",
+      "Icon": "Images/page_nav_icon",
       "Name": "Page Navigator",
       "States": [
         {
-          "Image": "Images/pluginAction",
+          "Image": "Images/page_nav",
           "TitleAlignment": "middle",
           "FontSize": 16
         }
@@ -47,11 +47,11 @@
       "PropertyInspectorPath": "PropertyInspector/file_player.html"
     },
     {
-      "Icon": "Images/icon",
+      "Icon": "Images/record_icon",
       "Name": "Save Clip",
       "States": [
         {
-          "Image": "Images/pluginAction",
+          "Image": "Images/record",
           "TitleAlignment": "middle",
           "FontSize": 16
         }
@@ -65,11 +65,11 @@
   "Author": "Michal Courson",
   "Name": "ClipTrimDotNet",
   "Description": "Pairs with cliptrim for easy voice recording and trimming",
-  "Icon": "Images/pluginIcon",
+  "Icon": "Images/app_icon",
   "Version": "0.1.0.0",
   "CodePath": "ClipTrimDotNet.exe",
-  "Category": "ClipTrimDotNet",
+  "Category": "ClipTrim",
-  "CategoryIcon": "Images/categoryIcon",
+  "CategoryIcon": "Images/category_icon",
   "UUID": "com.michal-courson.cliptrim",
   "OS": [
     {