合并

hzhilong · Nov 14, 2024 · a13643e · a13643e
2 parents 020c5d1 + 8fe4935
commit a13643e
Showing 24 changed files with 434 additions and 290 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,4 +35,5 @@ build/
 .DS_Store
 
 backup-data/
-bin/
+bin/
+qr/
diff --git a/bat/双击启动.bat b/bat/双击启动.bat
@@ -0,0 +1,16 @@
+@echo off
+color 3F
+title=哔哩哔哩自动化工具
+
+if "%1" equ "" (
+start /max call %0 1
+exit
+)
+
+set bin=%cd%\bin
+
+"%bin%\jre\bin\java" -jar "%bin%\bilibili-backup.jar"
+
+echo 按任意键退出
+pause>nul
+exit
diff --git a/bat/备份.bat b/bat/备份.bat
diff --git a/bat/已读所有消息.bat b/bat/已读所有消息.bat
diff --git a/bat/还原.bat b/bat/还原.bat
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>top.ybgnb</groupId>
     <artifactId>bilibili-backup</artifactId>
     <description>哔哩哔哩账号备份</description>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/src/main/java/top/ybgnb/bilibili/backup/CLIApp.java b/src/main/java/top/ybgnb/bilibili/backup/CLIApp.java
@@ -1,39 +1,13 @@
 package top.ybgnb.bilibili.backup;
 
 import lombok.extern.slf4j.Slf4j;
-import okhttp3.OkHttpClient;
-import org.jetbrains.annotations.NotNull;
-import top.ybgnb.bilibili.backup.app.BilibiliBackup;
-import top.ybgnb.bilibili.backup.app.BilibiliReadAllMsg;
-import top.ybgnb.bilibili.backup.app.BilibiliRestore;
-import top.ybgnb.bilibili.backup.bean.QRCode;
-import top.ybgnb.bilibili.backup.bean.Upper;
-import top.ybgnb.bilibili.backup.business.BuType;
-import top.ybgnb.bilibili.backup.error.BusinessException;
-import top.ybgnb.bilibili.backup.request.ThrottlingInterceptor;
-import top.ybgnb.bilibili.backup.service.BangumiService;
-import top.ybgnb.bilibili.backup.service.BlackService;
-import top.ybgnb.bilibili.backup.service.FavCollectedService;
-import top.ybgnb.bilibili.backup.service.FavOpusesService;
-import top.ybgnb.bilibili.backup.service.FavoritesService;
-import top.ybgnb.bilibili.backup.service.FollowingService;
-import top.ybgnb.bilibili.backup.service.LoginService;
-import top.ybgnb.bilibili.backup.service.ServiceBuilder;
-import top.ybgnb.bilibili.backup.service.ToViewService;
-import top.ybgnb.bilibili.backup.service.UserInfoCallback;
-import top.ybgnb.bilibili.backup.user.User;
-import top.ybgnb.bilibili.backup.utils.CookieUtil;
-import top.ybgnb.bilibili.backup.utils.QRUtil;
-import top.ybgnb.bilibili.backup.utils.StringUtils;
+import top.ybgnb.bilibili.backup.constant.BuType;
+import top.ybgnb.bilibili.backup.selector.BusinessSelector;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
 import java.util.Scanner;
 
+import static top.ybgnb.bilibili.backup.utils.CommonUtil.*;
+
 /**
  * @ClassName CliApp
  * @Description
@@ -45,180 +19,43 @@
 public class CLIApp {
 
     public static void main(String[] args) {
-        String type;
-        if (args != null && args.length == 1) {
-            type = args[0];
-        } else {
-            type = "backup";
-            log.info("参数错误，重置为默认");
-        }
-        try {
-            startBusiness(BuType.parse(type));
-        } catch (BusinessException e) {
-            log.error(e.getMessage());
-        }
+        menuForBusinessChoice();
     }
 
-    public static void startBusiness(BuType buType) throws BusinessException {
-        log.info("================【" + buType._getLogName() + "工具】================");
-        String readJsonDir = null;
-        Scanner sc = null;
-        try {
-            sc = new Scanner(System.in);
-            if (BuType.RESTORE.equals(buType)) {
-                File backupDir = new File(BilibiliBackup.PATH_PREFIX);
-                if (backupDir.exists() && backupDir.isDirectory()) {
-                    File[] userFiles = backupDir.listFiles();
-                    if (userFiles != null && userFiles.length > 0) {
-                        Arrays.sort(userFiles, Comparator.comparingLong(File::lastModified));
-                        log.info(String.format("总共有%s个备份文件，请输入前面的数字选择对应的备份", userFiles.length));
-                        for (int i = 0; i < userFiles.length; i++) {
-                            log.info(String.format("[%s]-[%s]", i, userFiles[i].getName()));
-                        }
-                        int pos;
-                        while (true) {
-                            pos = Integer.parseInt(sc.nextLine());
-                            if (pos < 0 || pos > userFiles.length - 1) {
-                                log.info("输入错误，请重新输入");
-                            } else {
-                                break;
-                            }
-                        }
-                        readJsonDir = BilibiliBackup.PATH_PREFIX + userFiles[pos].getName() + File.separator;
-                    }
-                }
-                if (StringUtils.isEmpty(readJsonDir)) {
-                    throw new BusinessException("备份文件为空");
-                }
-            }
-            String cookie = getCookie(buType, sc);
-            // 开始处理
-            if (BuType.BACKUP.equals(buType) || BuType.RESTORE.equals(buType)) {
-                List<ServiceBuilder> services = getServices(buType, sc);
-                while (services.isEmpty()) {
-                    log.info("未选择任何项目，请重新选择");
-                    services = getServices(buType, sc);
-                }
-                startBusiness(buType, cookie, readJsonDir, services);
-            } else {
-                startBusiness(buType, cookie, null, null);
-            }
-        } finally {
-            if (sc != null) {
-                sc.close();
+    private static void menuForBusinessChoice() {
+        Scanner sc = new Scanner(System.in);
+        scannerThreadLocal.set(sc);
+        do {
+            log.info("请选择对应功能的序号:");
+            BuType[] buTypes = BuType.values();
+            for (int i = 0; i < buTypes.length; i++) {
+                log.info("{}: {}", i, buTypes[i].getCnName());
             }
-        }
-    }
 
-    private static List<ServiceBuilder> getServices(BuType buType, Scanner sc) {
-        List<ServiceBuilder> builders = new ArrayList<>();
-        if (BuType.BACKUP.equals(buType) || BuType.RESTORE.equals(buType)) {
-            chooseService(sc, builders, "关注", FollowingService::new);
-            chooseService(sc, builders, "我的追番/追剧", BangumiService::new);
-            chooseService(sc, builders, "收藏的专栏", FavOpusesService::new);
-            chooseService(sc, builders, "收藏的视频合集", FavCollectedService::new);
-            chooseService(sc, builders, "稍后再看", ToViewService::new);
-            chooseService(sc, builders, "收藏夹", FavoritesService::new);
-            chooseService(sc, builders, "黑名单", BlackService::new);
-        }
-        return builders;
-    }
+            String inputedData = sc.nextLine();
+            if (inputDataIsInvalid(buTypes, inputedData)) continue;
+            BuType buType = buTypes[Integer.parseInt(inputedData)];
+            if (BuType.EXIT.equals(buType)) return;
 
-    private static void chooseService(Scanner sc, List<ServiceBuilder> builders, String name, ServiceBuilder builder) {
-        log.info("是否包括[{}]？", name);
-        log.info("输入 y:是\t其他:否");
-        String nextLine = sc.nextLine();
-        if ("Y".equals(nextLine) || "y".equals(nextLine)) {
-            builders.add(builder);
-        }
-    }
+            buTypeThreadLocal.set(buType);
+            BusinessSelector.processBusiness(buType, null);
 
-    private static String getCookie(BuType type, Scanner sc) throws BusinessException {
-        try {
-            CookieUtil.Cookie cookie = CookieUtil.read(type);
-            log.info("是否使用上次登录的用户：" + cookie.getUser().getName());
-            log.info("输入Y：使用该用户；  输入其他：不使用");
-            String nextLine = sc.nextLine();
-            if ("Y".equals(nextLine) || "y".equals(nextLine)) {
-                return cookie.getCookie();
-            }
-        } catch (BusinessException e) {
-        }
-        return loginNewUser();
+        } while (true);
     }
 
-    private static String loginNewUser() throws BusinessException {
-        OkHttpClient client = new OkHttpClient.Builder().addInterceptor(
-                new ThrottlingInterceptor(1000)).build();
-        LoginService loginService = new LoginService(client);
-        log.info("正在获取登录二维码...");
-//        log.info("正在获取登录二维码（长时间不显示的话，可按一下方向键下刷新屏幕）...");
-//        log.info("可尝试按住【Ctrl+鼠标滚轮键】调整字体为较小状态（方便展示二维码）");
-        QRCode qrCode = loginService.generateQRCode();
-        log.info("请使用手机哔哩哔哩扫码登录：");
-//        QRUtil.printQR(qrCode.getUrl());
-//        log.info("请使用手机哔哩哔哩扫码登录：");
-        File dir = new File("qr");
-        if (!dir.exists()) {
-            dir.mkdir();
-        }
-        String filePath = "qr/" + System.currentTimeMillis() + ".png";
-        File file = QRUtil.writeQRFile(qrCode.getUrl(), filePath);
+    private static boolean inputDataIsInvalid(BuType[] buTypes, String inputedData) {
         try {
-            Runtime runtime = Runtime.getRuntime();
-            try {
-                runtime.exec("cmd /c \"" + file.getAbsolutePath() + "\"");
-            } catch (IOException e) {
-                throw new BusinessException("打开二维码失败");
-            }
-            long startTime = System.currentTimeMillis();
-            String cookie = null;
-            while (System.currentTimeMillis() - startTime < 180000 && StringUtils.isEmpty(cookie)) {
-                cookie = loginService.login(qrCode);
-                try {
-                    Thread.sleep(2000);
-                } catch (InterruptedException e) {
-                }
-            }
-            if (StringUtils.isEmpty(cookie)) {
-                throw new BusinessException("扫码超时");
-            }
-            log.info("登录成功");
-            return cookie;
-        } finally {
-            file.deleteOnExit();
-        }
-    }
-
-    @NotNull
-    private static void startBusiness(BuType buType, String cookie, String readJsonDir, List<ServiceBuilder> builders) throws BusinessException {
-        String buName = buType._getLogName();
-        log.info(String.format("开始%s", buName));
-        Upper upper = null;
-
-        UserInfoCallback userInfoCallback = new UserInfoCallback() {
-            @Override
-            public void success(Upper currUser) throws BusinessException {
-                CookieUtil.save(new CookieUtil.Cookie(buType, currUser, cookie));
-            }
-
-            @Override
-            public void fail(User user) {
-                CookieUtil.delete(buType);
-            }
-        };
-        if (BuType.BACKUP.equals(buType)) {
-            upper = new BilibiliBackup(builders, new User(cookie), userInfoCallback).start();
-        } else if (BuType.RESTORE.equals(buType)) {
-            if (StringUtils.isEmpty(readJsonDir)) {
-                throw new BusinessException("备份文件为空");
+            int integer = Integer.parseInt(inputedData);
+            if (integer > -1 && integer <= buTypes.length) {
+                return false;
+            } else {
+                log.info("输入错误，请重新选择");
+                return true;
             }
-            upper = new BilibiliRestore(builders, readJsonDir, new User(cookie), userInfoCallback).start();
-        } else if (BuType.READ_ALL_MSG.equals(buType)) {
-            upper = new BilibiliReadAllMsg(new User(cookie), userInfoCallback).start();
+        } catch (Exception e) {
+            log.info("输入错误，请重新选择");
+            return true;
         }
-        log.info(String.format("成功%s[%s]", buName, upper.getName()));
     }
 
-
 }
diff --git a/src/main/java/top/ybgnb/bilibili/backup/app/BaseApp.java b/src/main/java/top/ybgnb/bilibili/backup/app/BaseApp.java
@@ -8,7 +8,7 @@
 import top.ybgnb.bilibili.backup.request.BaseApi;
 import top.ybgnb.bilibili.backup.request.ThrottlingInterceptor;
 import top.ybgnb.bilibili.backup.service.ServiceBuilder;
-import top.ybgnb.bilibili.backup.service.UserInfoCallback;
+import top.ybgnb.bilibili.backup.userInfoCallback.UserInfoCallback;
 import top.ybgnb.bilibili.backup.user.User;
 
 import java.util.List;

diff --git a/src/main/java/top/ybgnb/bilibili/backup/app/BilibiliBackup.java b/src/main/java/top/ybgnb/bilibili/backup/app/BilibiliBackup.java
@@ -6,7 +6,7 @@
 import top.ybgnb.bilibili.backup.error.BusinessException;
 import top.ybgnb.bilibili.backup.service.BackupRestoreService;
 import top.ybgnb.bilibili.backup.service.ServiceBuilder;
-import top.ybgnb.bilibili.backup.service.UserInfoCallback;
+import top.ybgnb.bilibili.backup.userInfoCallback.UserInfoCallback;
 import top.ybgnb.bilibili.backup.user.User;
 
 import java.text.SimpleDateFormat;

diff --git a/src/main/java/top/ybgnb/bilibili/backup/app/BilibiliReadAllMsg.java b/src/main/java/top/ybgnb/bilibili/backup/app/BilibiliReadAllMsg.java
@@ -4,7 +4,7 @@
 import top.ybgnb.bilibili.backup.bean.Upper;
 import top.ybgnb.bilibili.backup.error.BusinessException;
 import top.ybgnb.bilibili.backup.service.MessageService;
-import top.ybgnb.bilibili.backup.service.UserInfoCallback;
+import top.ybgnb.bilibili.backup.userInfoCallback.UserInfoCallback;
 import top.ybgnb.bilibili.backup.user.User;
 
 /**

diff --git a/src/main/java/top/ybgnb/bilibili/backup/app/BilibiliRestore.java b/src/main/java/top/ybgnb/bilibili/backup/app/BilibiliRestore.java
@@ -6,7 +6,7 @@
 import top.ybgnb.bilibili.backup.error.BusinessException;
 import top.ybgnb.bilibili.backup.service.BackupRestoreService;
 import top.ybgnb.bilibili.backup.service.ServiceBuilder;
-import top.ybgnb.bilibili.backup.service.UserInfoCallback;
+import top.ybgnb.bilibili.backup.userInfoCallback.UserInfoCallback;
 import top.ybgnb.bilibili.backup.user.User;
 
 import java.util.List;
-Original file line number
+Diff line change
@@ @@ -35,4 +35,5 @@ build/ @@
     .DS_Store
     backup-data/
-    bin/
+    bin/
+    qr/