fix(list):调整文件夹树布局。

.github/workflows/alpha-release.yml

@@ -3,39 +3,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  create-release:
-    permissions:
-      contents: write
-    runs-on: ubuntu-20.04
-    outputs:
-      release_id: ${{ steps.create-release.outputs.result }}
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-      - name: get version
-        run: echo "PACKAGE_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
-      - name: create release
-        id: create-release
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const { data } = await github.rest.repos.createRelease({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              tag_name: `app-v${process.env.PACKAGE_VERSION}-alpha`,
-              name: `漫画阅读器 v${process.env.PACKAGE_VERSION}`,
-              body: '从附件中下载对应平台的安装包以及应用。',
-              draft: true,
-              prerelease: true
-            })
-            return data.id
-
   build-tauri:
-    needs: create-release
     permissions:
       contents: write
     strategy:
@@ -45,48 +13,44 @@ jobs:
 
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Install dependencies (ubuntu only)
+        if: matrix.platform == 'ubuntu-20.04'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
+
       - name: setup node
         uses: actions/setup-node@v3
         with:
           node-version: 16
-      - name: install Rust stable
+
+      - name: install Rust nightly
         uses: dtolnay/rust-toolchain@nightly
+
       - name: install dependencies (ubuntu only)
         if: matrix.platform == 'ubuntu-20.04'
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+
       - uses: pnpm/action-setup@v2
         with:
           version: latest-7
+
       - name: install frontend dependencies
         run: pnpm install # change this to npm or pnpm depending on which one you use
-      - uses: tauri-apps/tauri-action@v0
+
+      - name: build app
+        uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tauriScript: pnpm tauri
-          releaseId: ${{ needs.create-release.outputs.release_id }}
-
-  publish-release:
-    permissions:
-      contents: write
-    runs-on: ubuntu-20.04
-    needs: [create-release, build-tauri]
-
-    steps:
-      - name: publish release
-        id: publish-release
-        uses: actions/github-script@v6
-        env:
-          release_id: ${{ needs.create-release.outputs.release_id }}
-        with:
-          script: |
-            github.rest.repos.updateRelease({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              release_id: process.env.release_id,
-              draft: true,
-              prerelease: true
-            })
+          tagName: ${{ github.ref_name }} # This only works if your workflow triggers on new tags.
+          releaseName: '漫画阅读器  v__VERSION__' # tauri-action replaces \_\_VERSION\_\_ with the app version.
+          releaseBody: '从附件中下载对应平台的安装包以及应用。'
+          releaseDraft: true
+          prerelease: false

.github/workflows/release.yml

@@ -5,39 +5,7 @@ on:
       - 'v*'
 
 jobs:
-  create-release:
-    permissions:
-      contents: write
-    runs-on: ubuntu-20.04
-    outputs:
-      release_id: ${{ steps.create-release.outputs.result }}
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-      - name: get version
-        run: echo "PACKAGE_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
-      - name: create release
-        id: create-release
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const { data } = await github.rest.repos.createRelease({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              tag_name: `app-v${process.env.PACKAGE_VERSION}`,
-              name: `漫画阅读器 v${process.env.PACKAGE_VERSION}`,
-              body: '从附件中下载对应平台的安装包以及应用。',
-              draft: true,
-              prerelease: false
-            })
-            return data.id
-
   build-tauri:
-    needs: create-release
     permissions:
       contents: write
     strategy:
@@ -47,48 +15,44 @@ jobs:
 
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Install dependencies (ubuntu only)
+        if: matrix.platform == 'ubuntu-20.04'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
+
       - name: setup node
         uses: actions/setup-node@v3
         with:
           node-version: 16
-      - name: install Rust stable
-        uses: dtolnay/rust-toolchain@stable
+
+      - name: install Rust nightly
+        uses: dtolnay/rust-toolchain@nightly
+
       - name: install dependencies (ubuntu only)
         if: matrix.platform == 'ubuntu-20.04'
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+
       - uses: pnpm/action-setup@v2
         with:
           version: latest-7
+
       - name: install frontend dependencies
         run: pnpm install # change this to npm or pnpm depending on which one you use
-      - uses: tauri-apps/tauri-action@v0
+
+      - name: build app
+        uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tauriScript: pnpm tauri
-          releaseId: ${{ needs.create-release.outputs.release_id }}
-
-  publish-release:
-    permissions:
-      contents: write
-    runs-on: ubuntu-20.04
-    needs: [create-release, build-tauri]
-
-    steps:
-      - name: publish release
-        id: publish-release
-        uses: actions/github-script@v6
-        env:
-          release_id: ${{ needs.create-release.outputs.release_id }}
-        with:
-          script: |
-            github.rest.repos.updateRelease({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              release_id: process.env.release_id,
-              draft: false,
+          tagName: ${{ github.ref_name }} # This only works if your workflow triggers on new tags.
+          releaseName: '漫画阅读器  v__VERSION__' # tauri-action replaces \_\_VERSION\_\_ with the app version.
+          releaseBody: '从附件中下载对应平台的安装包以及应用。'
+          releaseDraft: true
           prerelease: false
-            })

package.json

@@ -1,7 +1,7 @@
 {
   "name": "comic_viewer",
   "private": true,
-  "version": "0.2.0",
+  "version": "0.2.7",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.lock

@@ -326,7 +326,7 @@ dependencies = [
 
 [[package]]
 name = "comic_viewer"
-version = "0.2.0"
+version = "0.2.7"
 dependencies = [
  "anyhow",
  "chrono",
@@ -335,6 +335,7 @@ dependencies = [
  "mime_guess",
  "mountpoints",
  "once_cell",
+ "regex",
  "serde",
  "serde_json",
  "serde_repr",
@@ -2285,9 +2286,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.7.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "cce168fea28d3e05f158bda4576cf0c844d5045bc2cc3620fa0292ed5bb5814c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2305,9 +2306,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "rfd"

src-tauri/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "comic_viewer"
-version = "0.2.0"
-description = "A Tauri App"
-authors = ["you"]
-license = ""
-repository = ""
+version = "0.2.7"
+description = "漫画、条漫简易阅读器"
+authors = ["Khadgar"]
+license = "MIT"
+repository = "https://github.com/vixalie/comic_viewer"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -28,6 +28,7 @@ mountpoints = "0.2.1"
 md-5 = "0.10.5"
 urlencoding = "2.1.2"
 mime_guess = "2.0.4"
+regex = "1.7.2"
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem

src-tauri/src/commands/files.rs

@@ -1,12 +1,24 @@
-use std::{fs::DirEntry, path::Path};
+use std::{
+    fs::{self, DirEntry},
+    path::{Path, PathBuf},
+};
 
 use mountpoints::mountinfos;
+use regex::Regex;
 use serde::Serialize;
 use tauri::Runtime;
 
 use crate::utils;
 
-#[derive(Debug, Clone, Serialize)]
+fn compute_all_digits(text: &str) -> usize {
+    let re = Regex::new(r#"\d+"#).unwrap();
+    re.find_iter(&["a", text, "0"].join(" "))
+        .map(|b| b.as_str())
+        .map(|b| usize::from_str_radix(b, 10).unwrap_or(0))
+        .sum::<usize>()
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize)]
 pub struct FileItem {
     pub id: String,
     pub filename: String,
@@ -15,7 +27,19 @@ pub struct FileItem {
     pub width: u32,
 }
 
-#[derive(Debug, Clone, Serialize)]
+impl PartialOrd for FileItem {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        let this_digit = compute_all_digits(&self.filename);
+        let other_digit = compute_all_digits(&other.filename);
+        if this_digit == other_digit {
+            self.filename.partial_cmp(&other.filename)
+        } else {
+            this_digit.partial_cmp(&other_digit)
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize)]
 pub struct DirItem {
     pub id: String,
     pub dirname: String,
@@ -23,6 +47,18 @@ pub struct DirItem {
     pub root: bool,
 }
 
+impl PartialOrd for DirItem {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        let this_digit = compute_all_digits(&self.dirname);
+        let other_digit = compute_all_digits(&other.dirname);
+        if this_digit == other_digit {
+            self.dirname.partial_cmp(&other.dirname)
+        } else {
+            this_digit.partial_cmp(&other_digit)
+        }
+    }
+}
+
 fn is_hidden(entry: &DirEntry) -> bool {
     entry
         .file_name()
@@ -89,7 +125,7 @@ pub async fn scan_directory(target: String) -> Result<Vec<FileItem>, String> {
             width,
         });
     }
-    file_items.sort_by(|a, b| a.filename.partial_cmp(&b.filename).unwrap());
+    file_items.sort_by(|a, b| a.partial_cmp(&b).unwrap());
 
     Ok(file_items)
 }
@@ -190,6 +226,20 @@ pub async fn scan_for_child_dirs<R: Runtime>(
             root: false,
         });
     }
-    child_dirs.sort_by(|a, b| a.dirname.partial_cmp(&b.dirname).unwrap());
+    child_dirs.sort_by(|a, b| a.partial_cmp(&b).unwrap());
     Ok(child_dirs)
 }
+
+#[tauri::command]
+pub async fn rename_file<R: Runtime>(
+    _app: tauri::AppHandle<R>,
+    _window: tauri::Window<R>,
+    store_path: String,
+    origin_name: String,
+    new_name: String,
+) -> Result<(), String> {
+    let origin_file = PathBuf::from(store_path.clone()).join(origin_name);
+    let new_file = PathBuf::from(store_path).join(new_name);
+    fs::rename(origin_file, new_file).map_err(|e| format!("重命名问文件失败，{}", e))?;
+    Ok(())
+}

src-tauri/src/commands/mod.rs

@@ -20,8 +20,8 @@ pub fn update_window_title_with_app<R: Runtime>(
     ext: Option<String>,
 ) -> anyhow::Result<()> {
     let app_name = match app {
-        AppHold::Instance(app) => app.package_info().name.clone(),
-        AppHold::Handle(app) => app.package_info().name.clone(),
+        AppHold::Instance(app) => app.config().tauri.windows[0].title.clone(),
+        AppHold::Handle(app) => app.config().tauri.windows[0].title.clone(),
     };
     if let Some(ext) = ext {
         window.set_title(&format!("{} - {}", app_name, ext))?;

src-tauri/src/main.rs

@@ -15,7 +15,8 @@ fn main() {
         .invoke_handler(tauri::generate_handler![
             commands::prelude::scan_directory,
             commands::prelude::show_drives,
-            commands::prelude::scan_for_child_dirs
+            commands::prelude::scan_for_child_dirs,
+            commands::prelude::rename_file
         ])
         .setup(|app| {
             let main_window = app.get_window("main").unwrap();

src-tauri/tauri.conf.json

@@ -7,8 +7,8 @@
     "withGlobalTauri": false
   },
   "package": {
-    "productName": "漫画阅读器",
-    "version": "0.2.0"
+    "productName": "comic_viewer",
+    "version": "../package.json"
   },
   "tauri": {
     "allowlist": {

src/components/ContinuationView.tsx

@@ -25,7 +25,7 @@ export const ContinuationView: FC = () => {
   useEffect(() => {
     ebus?.addListener('navigate_offset', ({ filename }) => {
       let index = indexOf(filename, pluck('filename', files));
-      virtualListRef.current?.scrollToIndex({ index, align: 'start', behavior: 'smooth' });
+      virtualListRef.current?.scrollToIndex({ index, align: 'start' });
     });
     ebus?.addListener('reset_views', () => {
       virtualListRef.current?.scrollTo({ top: 0 });

src/components/DirTree.tsx

@@ -4,16 +4,17 @@ import { ActionIcon, Box, Flex, Stack, Text, Tooltip } from '@mantine/core';
 import { notifications } from '@mantine/notifications';
 import { IconEye, IconSquareMinus, IconSquarePlus } from '@tabler/icons-react';
 import { invoke } from '@tauri-apps/api';
+import EventEmitter from 'events';
 import { equals, isEmpty, isNil, map, not } from 'ramda';
-import { FC, PropsWithChildren, useCallback, useContext, useState } from 'react';
-import { useMeasure, useMount } from 'react-use';
+import { FC, PropsWithChildren, useCallback, useContext } from 'react';
+import { useLifecycles, useMeasure } from 'react-use';
 import { EventBusContext } from '../EventBus';
 import { DirItem } from '../models';
 import { loadSubDirectories } from '../queries/directories';
 import {
   currentRootsSelector,
   isExpandedSelector,
-  selectDirectories,
+  subDirectoriesSelector,
   useDirTreeStore
 } from '../states/dirs';
 import { useFileListStore } from '../states/files';
@@ -30,12 +31,9 @@ const Tree = styled.ul`
   }
 `;
 
-const Branch: FC<PropsWithChildren<{ current: DirItem; expanded: boolean }>> = ({
-  children,
-  current
-}) => {
+const Branch: FC<PropsWithChildren<{ current: DirItem }>> = ({ children, current }) => {
   const { directories: allSubDirs } = useDirTreeStore();
-  const [subDirs, setSubDirs] = useState<DirItem[]>([]);
+  const subDirs = useDirTreeStore(subDirectoriesSelector(current.id));
   const isCurrentExpanded = useDirTreeStore(isExpandedSelector(current.id));
   const expend = useDirTreeStore.use.expandDir();
   const fold = useDirTreeStore.use.foldDir();
@@ -44,18 +42,24 @@ const Branch: FC<PropsWithChildren<{ current: DirItem; expanded: boolean }>> = (
   const storeFiles = useFileListStore.use.updateFiles();
   const ebus = useContext<EventEmitter>(EventBusContext);
 
-  useMount(() => {
-    if (isCurrentExpanded) {
-      setSubDirs(selectDirectories(current.id)(useDirTreeStore.getState().directories));
-    }
+  useLifecycles(
+    () => {
+      ebus.addListener(`expand:${current.id}`, () => {
+        expend(current.id);
+        loadSubDirectories(current);
       });
+    },
+    () => {
+      ebus.removeAllListeners(`expand:${current.id}`);
+    }
+  );
+
   const handleExpandAction = useCallback(async () => {
     try {
       if (isCurrentExpanded) {
         fold(current.id);
       } else {
         await loadSubDirectories(current);
-        setSubDirs(selectDirectories(current.id)(useDirTreeStore.getState().directories));
         expend(current.id);
       }
     } catch (e) {
@@ -117,13 +121,17 @@ const Branch: FC<PropsWithChildren<{ current: DirItem; expanded: boolean }>> = (
 
 export const DirTree: FC = () => {
   const roots = useDirTreeStore(currentRootsSelector());
-  const { focused, focus, unfocus, selected } = useDirTreeStore();
+  const { focused, focus, unfocus, selected, foldDir } = useDirTreeStore();
   const [viewRef, { width }] = useMeasure();
+  const storeFiles = useFileListStore.use.updateFiles();
+  const ebus = useContext<EventEmitter>(EventBusContext);
 
   const handleFocusAction = useCallback(() => {
     if (isNil(focused) && not(isNil(selected))) {
+      ebus.emit(`expand:${selected}`);
       focus(selected);
     } else {
+      foldDir(focused.id);
       unfocus();
     }
   }, [focused, selected]);
@@ -134,7 +142,8 @@ export const DirTree: FC = () => {
       h="100%"
       spacing={8}
       px={4}
-      py={4}
+      pt={4}
+      pb={40}
       pos="relative"
       sx={{ overflow: 'auto' }}
       ref={viewRef}

src/components/FileList.tsx

@@ -1,18 +1,34 @@
 //@ts-nocheck
-import { Box, Center, Text, Tooltip } from '@mantine/core';
+import { Box, Center, Group, Text, TextInput, Tooltip } from '@mantine/core';
+import { notifications } from '@mantine/notifications';
+import { invoke } from '@tauri-apps/api';
 import EventEmitter from 'events';
-import { head, includes, indexOf, isEmpty, length, not, pluck } from 'ramda';
-import { FC, useCallback, useContext, useLayoutEffect, useMemo, useRef } from 'react';
+import { equals, find, head, includes, indexOf, isEmpty, length, not, pluck, propEq } from 'ramda';
+import {
+  FC,
+  KeyboardEvent,
+  useCallback,
+  useContext,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState
+} from 'react';
 import { useMeasure } from 'react-use';
 import { Virtuoso, VirtuosoHandle } from 'react-virtuoso';
 import { EventBusContext } from '../EventBus';
+import { useDirTreeStore } from '../states/dirs';
 import { sortedFilesSelector, useFileListStore } from '../states/files';
 
 export const FileList: FC = () => {
   const files = useFileListStore(sortedFilesSelector());
+  const storeFiles = useFileListStore.use.updateFiles();
   const activeFiles = useFileListStore.use.actives();
+  const cwd = useDirTreeStore.use.selected();
+  const directories = useDirTreeStore.use.directories();
   const ebus = useContext<EventEmitter>(EventBusContext);
   const filesCount = useMemo(() => length(files), [files]);
+  const [editingFile, setEditing] = useState<string | null>(null);
   const [parentRef, { height: parentHeight }] = useMeasure();
   const listRef = useRef<VirtuosoHandle | null>(null);
   const handleFileSelectAction = useCallback(
@@ -21,28 +37,50 @@ export const FileList: FC = () => {
     },
     [ebus]
   );
+  const handleFileRenameAction = useCallback(
+    async (fileId: string, event: KeyboardEvent<HTMLInputElement>) => {
+      if (equals(event.key, 'Enter')) {
+        const newFileName = event.target.value;
+        const originalFile = find(propEq('id', fileId), files);
+        const storeDirectory = find(propEq('id', cwd), directories);
+        try {
+          await invoke('rename_file', {
+            storePath: storeDirectory?.path,
+            originName: originalFile?.filename,
+            newName: newFileName
+          });
+          const refreshedFiles = await invoke('scan_directory', { target: storeDirectory?.path });
+          storeFiles(refreshedFiles);
+          ebus.emit('reset_views');
+        } catch (e) {
+          console.error('[debug]重命名文件：', e);
+          notifications.show({ message: `重命名文件失败，${e}`, color: 'red' });
+        }
+        setEditing(null);
+      }
+    },
+    [files, cwd, directories]
+  );
 
   useLayoutEffect(() => {
     let firstActived = head(activeFiles);
     let firstActivedIndex = indexOf(firstActived, pluck('filename', files));
     listRef.current?.scrollToIndex({
       index: firstActivedIndex,
-      align: 'center',
-      behavior: 'auto'
+      align: 'center'
     });
   }, [activeFiles]);
 
   return (
     <Box
       w="100%"
-      h="100%"
       pl={4}
       sx={{ flexGrow: 1, overflowY: 'auto', contain: 'strict', overflowX: 'hidden' }}
       ref={parentRef}
     >
       {!isEmpty(files) && (
         <Virtuoso
-          style={{ height: parentHeight }}
+          style={{ height: parentHeight - 36 }}
           totalCount={filesCount}
           ref={listRef}
           itemContent={index => (
@@ -52,6 +90,7 @@ export const FileList: FC = () => {
               px={4}
               py={2}
               onClick={() => handleFileSelectAction(files[index].filename)}
+              onDoubleClick={() => setEditing(files[index].id)}
               sx={theme => ({
                 cursor: 'pointer',
                 '&:hover': {
@@ -60,7 +99,18 @@ export const FileList: FC = () => {
               })}
             >
               <Tooltip label={files[index].filename} zIndex={999}>
+                {propEq('id', editingFile)(files[index]) ? (
+                  <Group>
+                    <TextInput
+                      defaultValue={files[index].filename}
+                      size="xs"
+                      variant="unstyled"
+                      onKeyDown={event => handleFileRenameAction(files[index].id, event)}
+                    />
+                  </Group>
+                ) : (
                   <Text truncate>{files[index].filename}</Text>
+                )}
               </Tooltip>
             </Box>
           )}

src/states/dirs.ts

@@ -92,7 +92,6 @@ export const useDirTreeStore = createStoreHook<DirsStates & DirsActions>((set, g
   },
   focus(specifiedDirId) {
     const requestedDir = find(propEq('id', specifiedDirId), get().directories);
-    console.log('[debug]focus search: ', specifiedDirId, requestedDir);
     if (not(isNil(requestedDir))) {
       set(df => {
         df.focused = requestedDir;