Updates

harana · Feb 16, 2024 · 5c91e65 · 5c91e65
1 parent ce0e1fe
commit 5c91e65
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/publish-search-app.yml b/.github/workflows/publish-search-app.yml
@@ -128,12 +128,9 @@ jobs:
           FFMPEG_PROJECT=`conan cache path --folder build ffmpeg/6.1:$(conan list "ffmpeg/6.1:*" | sed -n '7p' | tr -d ' ')`
           export FFMPEG_DIR="${FFMPEG_PROJECT%?}p"
           source /etc/profile
-          cd search
-          mkdir -p dist
-          pnpm run css
-          cd src-tauri
-          cargo update
-          pnpm tauri build --ci -v --target ${{ matrix.settings.target }} --bundles ${{ matrix.settings.bundles }},updater
+          cd search && pnpm run css
+          cd src-tauri && cargo update
+          cd .. && pnpm tauri build --ci -v --target ${{ matrix.settings.target }} --bundles ${{ matrix.settings.bundles }},updater
         env:      
           APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
           APPLE_API_KEY: ${{ secrets.APPLE_API_KEY_ID }}

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -4,7 +4,7 @@
     "beforeBuildCommand": "pnpm run build",
     "beforeDevCommand": "pnpm run dev",
     "devPath": "http://localhost:1420",
-    "distDir": "../dist",
+    "distDir": "../target/dist",
     "withGlobalTauri": true
   },
   "package": {

diff --git a/src/main/scala/com/harana/search/client/cards/CardHandler.scala b/src/main/scala/com/harana/search/client/cards/CardHandler.scala
@@ -47,7 +47,7 @@ class CardHandler extends ActionHandler(zoomTo(_.cardState)) {
         middleCard = Some(value.cards(index).head),
         middleHorizontalIndex = index,
         verticalTopCard = None,
-        verticalBottomCard = if (value.cards(index).size > 1) Some(value.cards(index)(1)) else None
+        verticalBottomCard = value.cards(index).lift(1)
       ))
 
     case UpdateMiddleVerticalIndex(index: Int) =>

diff --git a/src/main/scala/com/harana/search/client/search/SearchKeyHandler.scala b/src/main/scala/com/harana/search/client/search/SearchKeyHandler.scala
@@ -183,7 +183,7 @@ class SearchKeyHandler extends ActionHandler(zoomTo(_.searchState)) {
                 action(SelectHorizontalLeftCard) + action(if (cardState.middleHorizontalIndex == 1) UpdateFocusedPanel(Panel.Document) else NoChange)
 
               case Keys.Right =>
-                action(if (cardState.middleHorizontalIndex < cardState.cards.size - 1) SelectHorizontalRightCard else NoChange)
+                action(SelectHorizontalRightCard)
 
               case Keys.Backspace | Keys.Delete =>
                 action(Backspace)