From 0809ae9a18f758bb8ec73683522fbaf566a08264 Mon Sep 17 00:00:00 2001 From: pcdd Date: Sat, 23 Mar 2024 19:27:34 +0800 Subject: [PATCH] :tada: Release v1.5.1 --- .github/workflows/release.yml | 9 ++++--- README.md | 16 ++++++++++-- pom.xml | 2 +- src/main/java/META-INF/MANIFEST.MF | 2 +- src/main/java/com/pcdd/sonovel/Main.java | 25 +++++++++++-------- .../java/com/pcdd/sonovel/core/Crawler.java | 4 +-- 6 files changed, 37 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e12ddc7..18c3fed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,11 @@ name: Releases # 触发条件：git tag -on: - push: - tags: - - 'v*' +#on: +# push: +# tags: +# - 'v*' +on: workflow_dispatch jobs: release-windows: diff --git a/README.md b/README.md index b704ee7..941553c 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,22 @@ # so-novel -可根据书名、作者搜索并下载小说，命令行操作 +![logo.ico](assets%2Flogo.ico) + +## 介绍 + +交互式书源下载器（命令行操作） + +可根据书名、作者搜索并下载小说 支持导出格式：epub、txt、html -结合 [koodo-reader](https://www.koodoreader.com/zh)、 IOS 图书 使用更佳 +结合 [koodo-reader](https://www.koodoreader.com/zh)、 IOS 图书等阅读器使用更佳 + +## 使用 + +下载最新版 https://github.com/pcdd-group/so-novel/releases + +Windows 默认安装路径为 C:\Program Files，不建议在此安装，否则首次运行或下载目录不存在时都要以管理员身份运行 ## ✅TODO diff --git a/pom.xml b/pom.xml index 24fc420..abeb6af 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.pcdd so-novel - 1.5.0 + 1.5.1 jar diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF index f5afa64..4898071 100644 --- a/src/main/java/META-INF/MANIFEST.MF +++ b/src/main/java/META-INF/MANIFEST.MF @@ -1,2 +1,2 @@ -Manifest-Version: 1.5.0 +Manifest-Version: 1.5.1 Main-Class: com.pcdd.sonovel.Main diff --git a/src/main/java/com/pcdd/sonovel/Main.java b/src/main/java/com/pcdd/sonovel/Main.java index 70b8329..cc64c76 100644 --- a/src/main/java/com/pcdd/sonovel/Main.java +++ b/src/main/java/com/pcdd/sonovel/Main.java @@ -41,18 +41,8 @@ public static void main(String[] args) { if (results.isEmpty()) { continue; } - // 2. 打印搜索结果 - ConsoleTable consoleTable = ConsoleTable.create().addHeader("序号", "书名", "作者", "最新章节", "最后更新时间"); - for (int i = 0; i < results.size(); i++) { - SearchResult r = results.get(i); - consoleTable.addBody(String.valueOf(i), - r.getBookName(), - r.getAuthor(), - r.getLatestChapter(), - r.getLatestUpdate()); - } - Console.table(consoleTable); + printSearchResult(results); // 3. 选择后下载 Console.log("==> 请输入下载序号（首列的数字）"); @@ -88,4 +78,17 @@ private static void printHint() { ); } + private static void printSearchResult(List results) { + ConsoleTable consoleTable = ConsoleTable.create().addHeader("序号", "书名", "作者", "最新章节", "最后更新时间"); + for (int i = 0; i < results.size(); i++) { + SearchResult r = results.get(i); + consoleTable.addBody(String.valueOf(i), + r.getBookName(), + r.getAuthor(), + r.getLatestChapter(), + r.getLatestUpdate()); + } + Console.table(consoleTable); + } + } diff --git a/src/main/java/com/pcdd/sonovel/core/Crawler.java b/src/main/java/com/pcdd/sonovel/core/Crawler.java index 4720efe..798c249 100644 --- a/src/main/java/com/pcdd/sonovel/core/Crawler.java +++ b/src/main/java/com/pcdd/sonovel/core/Crawler.java @@ -97,10 +97,10 @@ public static double crawl(List list, int num, int start, int end) // 小说目录名格式：书名(作者) bookDir = String.format("%s (%s)", bookName, author); - File dir = FileUtil.mkdir(SAVE_PATH + File.separator + bookDir); + File dir = FileUtil.mkdir(new File(SAVE_PATH + File.separator + bookDir)); if (!dir.exists()) { // C:\Program Files 下创建需要管理员权限 - Console.log(render("@|red 下载目录创建失败，若您将软件安装在 C 盘，请以管理员身份重新运行|@")); + Console.log(render("@|red 创建下载目录失败，安装目录需要管理员权限|@")); return 0; }