bugfixes

Author: computing-den

src/extension/codemic.ts

@@ -166,13 +166,15 @@ class CodeMic {
 
       // Open session.
       const session = await Session.Core.readLocal(this.context, workspace, { mustScan: recorder?.mustScan });
-      assert(session, 'Failed to read sesion after setting workspace folder');
+      assert(session, 'Failed to read session after setting workspace folder');
 
       // Open screen. This will also load the session.
       if (screen === t.Screen.Player) {
         await this.openScreen({ screen, session, load: true });
       } else if (screen === t.Screen.Recorder) {
         await this.openScreen({ screen, session, clock: recorder!.clock });
+      } else if (screen === t.Screen.Welcome) {
+        await this.openScreen({ screen });
       }
 
       return true;
@@ -388,6 +390,8 @@ class CodeMic {
         const workspace = uris?.[0]?.fsPath;
         if (!workspace) return ok;
 
+        // if (Session.Core.sessionExists(workspace))
+
         await VscWorkspace.setUpWorkspace_MAY_RESTART_VSCODE(this.context, {
           screen: t.Screen.Welcome,
           workspace,
@@ -1032,6 +1036,8 @@ class CodeMic {
 
     if (!(await this.closeCurrentScreen())) return;
 
+    this.setScreen(t.Screen.Loading);
+
     switch (params.screen) {
       case t.Screen.Loading: {
         this.setScreen(t.Screen.Loading);
@@ -1143,7 +1149,7 @@ class CodeMic {
         lib.unreachable(this.screen);
     }
 
-    this.setScreen(t.Screen.Loading);
+    // this.setScreen(t.Screen.Loading);
     return true;
   }
 

src/lib/lib.ts

@@ -721,9 +721,11 @@ export function searchSessions(
 
   let pairs = sessions.map(listing => {
     const matchScore = searchQueryNorm ? getTokensMatchScore(getFields(listing.head)) : 1;
-    const statsScore = (listing.publication ? listing.publication.likes * 20 + listing.publication.views : 1) / 10;
-    const clipScore = listing.head.isClip ? 1 : 2;
-    const score = matchScore * statsScore * clipScore;
+    const likes = listing.publication?.likes ?? 0;
+    const views = listing.publication?.views ?? 0;
+    const statsScore = Math.sqrt(likes * 20 + views + 1) / 10;
+    const clipMult = listing.head.isClip ? 1 : 2;
+    const score = matchScore * statsScore * clipMult;
     return { listing, score };
   });
 
@@ -735,7 +737,13 @@ export function searchSessions(
   remotePairs = _.filter(remotePairs, 'score');
   remotePairs = _.reject(remotePairs, p => recentPairs.some(recent => recent.listing.head.id === p.listing.head.id));
   remotePairs = _.orderBy(remotePairs, 'score', 'desc');
-  recentPairs = _.take(_.filter(recentPairs, 'score'), recentLimit);
+  recentPairs = _.filter(recentPairs, 'score');
+  recentPairs = _.orderBy(
+    recentPairs,
+    p => p.listing.history && getSessionHistoryItemLastOpenTimestamp(p.listing.history),
+    'desc',
+  );
+  recentPairs = _.take(recentPairs, recentLimit);
 
   return _.map([...recentPairs, ...currentPairs, ...remotePairs], 'listing');
 

src/view/recorder_toolbar.tsx

@@ -574,12 +574,29 @@ function CropPopover(props: PopoverProps & { onConfirm: (adjustMediaTracks: bool
 function ForkSessionPopover(
   props: PopoverProps & { onConfirm: (handle: string, workspace: string) => any; handle: string; workspace: string },
 ) {
+  const [handle, setHandle_] = useState(`${props.handle}_fork`);
   const [workspace, setWorkspace] = useState(`${props.workspace}_fork`);
-  const [handle, setHandle] = useState(`${props.handle}_fork`);
+
+  function handleChanged(e: any) {
+    const value = (e.target as HTMLInputElement).value.replace(/[^A-Za-z0-9_-]/g, '');
+    setHandle_(value);
+    if (workspace) {
+      setWorkspace(path.join(path.dirname(workspace), value));
+    }
+  }
+
   return (
     <Popover {...props}>
       <form className="recorder-popover-form">
         <label className="label">Fork session</label>
+        <VSCodeTextField
+          className="subsection"
+          placeholder="A-Z a-z 0-9 - _ (e.g. my_project)"
+          value={handle}
+          onInput={handleChanged}
+        >
+          Handle
+        </VSCodeTextField>
         <PathField
           className="subsection"
           placeholder="Workspace directory"
@@ -589,16 +606,6 @@ function ForkSessionPopover(
         >
           Workspace
         </PathField>
-        <VSCodeTextField
-          className="subsection"
-          placeholder="A-Z a-z 0-9 - _ (e.g. my_project)"
-          value={handle}
-          onInput={e => {
-            setHandle((e.target as HTMLInputElement).value.replace(/[^A-Za-z0-9_-]/g, ''));
-          }}
-        >
-          Handle
-        </VSCodeTextField>
         <VSCodeButton
           appearance="primary"
           onClick={e => {