Redering fixes (#378)

* start time, standardise on cidre, fix decoder skipping

* more

* ignore start time for now

* cleanup

Author: Brendonovich

Cargo.lock

@@ -10,6 +10,7 @@ use clap::{Args, Parser, Subcommand};
 use record::RecordStart;
 use serde_json::json;
 use tracing::*;
+use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
 #[derive(Parser)]
 struct Cli {
@@ -49,6 +50,21 @@ enum RecordCommands {
 
 #[tokio::main]
 async fn main() -> Result<(), String> {
+    // let (layer, handle) = tracing_subscriber::reload::Layer::new(None::<DynLoggingLayer>);
+
+    let registry = tracing_subscriber::registry().with(tracing_subscriber::filter::filter_fn(
+        (|v| v.target().starts_with("cap_")) as fn(&tracing::Metadata) -> bool,
+    ));
+
+    registry
+        // .with(layer)
+        .with(
+            tracing_subscriber::fmt::layer()
+                .with_ansi(true)
+                .with_target(true),
+        )
+        .init();
+
     let cli = Cli::parse();
 
     match cli.command {
@@ -177,7 +193,7 @@ impl Export {
             recording_meta,
             render_constants,
             &segments,
-            fps,
+            60,
             XY::new(1920, 1080),
         )
         .await

apps/cli/src/main.rs

@@ -41,6 +41,7 @@
     "@tauri-apps/plugin-fs": "2.2.0",
     "@tauri-apps/plugin-http": "^2.0.1",
     "@tauri-apps/plugin-notification": "2.0.0",
+    "@tauri-apps/plugin-opener": "^2.2.6",
     "@tauri-apps/plugin-os": "2.0.0",
     "@tauri-apps/plugin-process": "2.0.0",
     "@tauri-apps/plugin-shell": ">=2.0.1",

apps/desktop/package.json

@@ -89,6 +89,7 @@ relative-path = "1.9.3"
 cap-fail = { version = "0.1.0", path = "../../../crates/fail" }
 tokio-stream = { version = "0.1.17", features = ["sync"] }
 md5 = "0.7.0"
+tauri-plugin-opener = "2.2.6"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-graphics = "0.24.0"

apps/desktop/src-tauri/Cargo.toml

@@ -60,6 +60,7 @@
         { "url": "http://localhost:*" }
       ]
     },
-    "clipboard-manager:allow-write-text"
+    "clipboard-manager:allow-write-text",
+    "opener:allow-reveal-item-in-dir"
   ]
 }

apps/desktop/src-tauri/capabilities/default.json

@@ -1453,12 +1453,13 @@ async fn take_screenshot(app: AppHandle, _state: MutableState<'_, App>) -> Resul
             pretty_name: screenshot_name,
             inner: RecordingMetaInner::Studio(cap_project::StudioRecordingMeta::SingleSegment {
                 segment: cap_project::SingleSegment {
-                    display: Display {
+                    display: VideoMeta {
                         path: RelativePathBuf::from_path(
                             &screenshot_path.strip_prefix(&recording_dir).unwrap(),
                         )
                         .unwrap(),
                         fps: 0,
+                        start_time: None,
                     },
                     camera: None,
                     audio: None,
@@ -2159,6 +2160,7 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
         .plugin(tauri_plugin_deep_link::init())
         .plugin(tauri_plugin_clipboard_manager::init())
         .plugin(tauri_plugin_fs::init())
+        .plugin(tauri_plugin_opener::init())
         .plugin(
             tauri_plugin_window_state::Builder::new()
                 .with_state_flags({

apps/desktop/src-tauri/src/lib.rs

@@ -16,9 +16,10 @@ import {
   ParentProps,
   Show,
 } from "solid-js";
+import { revealItemInDir } from "@tauri-apps/plugin-opener";
 
 import { ask } from "@tauri-apps/plugin-dialog";
-import { open } from "@tauri-apps/plugin-shell";
+import * as shell from "@tauri-apps/plugin-shell";
 import { trackEvent } from "~/utils/analytics";
 import { commands, events, RecordingMetaWithType } from "~/utils/tauri";
 
@@ -117,7 +118,9 @@ export default function Recordings() {
       <Show
         when={recordings.data && recordings.data.length > 0}
         fallback={
-          <p class="text-center text-[--text-tertiary] absolute flex items-center justify-center w-full h-full">No recordings found</p>
+          <p class="text-center text-[--text-tertiary] absolute flex items-center justify-center w-full h-full">
+            No recordings found
+          </p>
         }
       >
         <div class="p-4 border-b border-gray-300 border-dashed">
@@ -176,21 +179,6 @@ function RecordingItem(props: {
 
   const queryClient = useQueryClient();
 
-  const deleteButton = () => (
-    <TooltipIconButton
-      tooltipText="Delete"
-      onClick={async () => {
-        if (!(await ask("Are you sure you want to delete this recording?")))
-          return;
-        await remove(props.recording.path, { recursive: true });
-
-        queryClient.refetchQueries(recordingsQuery);
-      }}
-    >
-      <IconCapTrash class="size-4" />
-    </TooltipIconButton>
-  );
-
   return (
     <li class="flex flex-row justify-between items-center px-4 py-3 w-full rounded-xl transition-colors duration-200 hover:bg-gray-100">
       <div class="flex gap-5 items-center">
@@ -225,7 +213,7 @@ function RecordingItem(props: {
           </div>
         </div>
       </div>
-      <div class="flex items-center">
+      <div class="flex items-center gap-2">
         <Show when={type() === "studio"}>
           <TooltipIconButton
             tooltipText="Edit"
@@ -243,13 +231,12 @@ function RecordingItem(props: {
             {(sharing) => (
               <TooltipIconButton
                 tooltipText="Open link"
-                onClick={() => open(sharing().link)}
+                onClick={() => shell.open(sharing().link)}
               >
                 <IconCapLink class="size-4" />
               </TooltipIconButton>
             )}
           </Show>
-          {deleteButton()}
         </Show>
         <Show when={type() === "instant"}>
           {(_) => {
@@ -260,34 +247,49 @@ function RecordingItem(props: {
             }));
 
             return (
-              <>
-                <Show when={props.recording.meta.sharing}>
-                  {(sharing) => (
-                    <>
-                      <TooltipIconButton
-                        tooltipText="Reupload"
-                        onClick={() => reupload.mutate()}
-                      >
-                        {reupload.isPending ? (
-                          <IconLucideLoaderCircle class="animate-spin" />
-                        ) : (
-                          <IconLucideRotateCcw class="size-4" />
-                        )}
-                      </TooltipIconButton>
-                      <TooltipIconButton
-                        tooltipText="Open link"
-                        onClick={() => open(sharing().link)}
-                      >
-                        <IconCapLink class="size-4" />
-                      </TooltipIconButton>
-                    </>
-                  )}
-                </Show>
-                {deleteButton()}
-              </>
+              <Show when={props.recording.meta.sharing}>
+                {(sharing) => (
+                  <>
+                    <TooltipIconButton
+                      tooltipText="Reupload"
+                      onClick={() => reupload.mutate()}
+                    >
+                      {reupload.isPending ? (
+                        <IconLucideLoaderCircle class="animate-spin" />
+                      ) : (
+                        <IconLucideRotateCcw class="size-4" />
+                      )}
+                    </TooltipIconButton>
+                    <TooltipIconButton
+                      tooltipText="Open link"
+                      onClick={() => shell.open(sharing().link)}
+                    >
+                      <IconCapLink class="size-4" />
+                    </TooltipIconButton>
+                  </>
+                )}
+              </Show>
             );
           }}
         </Show>
+        <TooltipIconButton
+          tooltipText="Open recording bundle"
+          onClick={() => revealItemInDir(`${props.recording.path}/`)}
+        >
+          <IconLucideFolder class="size-4" />
+        </TooltipIconButton>
+        <TooltipIconButton
+          tooltipText="Delete"
+          onClick={async () => {
+            if (!(await ask("Are you sure you want to delete this recording?")))
+              return;
+            await remove(props.recording.path, { recursive: true });
+
+            queryClient.refetchQueries(recordingsQuery);
+          }}
+        >
+          <IconCapTrash class="size-4" />
+        </TooltipIconButton>
       </div>
     </li>
   );
@@ -308,7 +310,7 @@ function TooltipIconButton(
           props.onClick();
         }}
         disabled={props.disabled}
-        class="p-2.5 mr-2 opacity-70 will-change-transform hover:opacity-100 rounded-full transition-all duration-200 hover:bg-gray-200 dark:hover:bg-gray-300"
+        class="p-2.5 opacity-70 will-change-transform hover:opacity-100 rounded-full transition-all duration-200 hover:bg-gray-200 dark:hover:bg-gray-300"
       >
         {props.children}
       </Tooltip.Trigger>