From 7807ed0b046391da26049e48f4d12e0fcb06a7e4 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 5 Sep 2023 22:13:45 +0800
Subject: [PATCH] Clean code

---
 app/src/main/java/com/github/catvod/net/OkHttp.java  | 4 ++++
 app/src/main/java/com/github/catvod/spider/Bili.java | 6 +++---
 app/src/main/java/com/github/catvod/utils/Utils.java | 7 ++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/github/catvod/net/OkHttp.java b/app/src/main/java/com/github/catvod/net/OkHttp.java
index 614c70b2..55101765 100644
--- a/app/src/main/java/com/github/catvod/net/OkHttp.java
+++ b/app/src/main/java/com/github/catvod/net/OkHttp.java
@@ -83,6 +83,10 @@ public class OkHttp {
         return string(url, null, header, respHeader);
     }
 
+    public static String get(String url, Map<String, String> params, Map<String, String> header) {
+        return string(url, params, header, null);
+    }
+
     public static String string(String url, Map<String, String> params, Map<String, String> header, Map<String, List<String>> respHeader) {
         return string(url, null, params, header, respHeader);
     }
diff --git a/app/src/main/java/com/github/catvod/spider/Bili.java b/app/src/main/java/com/github/catvod/spider/Bili.java
index 45d49c1d..511e433b 100644
--- a/app/src/main/java/com/github/catvod/spider/Bili.java
+++ b/app/src/main/java/com/github/catvod/spider/Bili.java
@@ -58,7 +58,7 @@ public class Bili extends Spider {
     private JsonObject extend;
     private String cookie;
     private boolean login;
-    private static boolean AskOnlyOnce = false;
+    private boolean ask;
 
     private Map<String, String> getHeader(String cookie) {
         Map<String, String> headers = new HashMap<>();
@@ -146,7 +146,7 @@ public class Bili extends Spider {
 
     @Override
     public String detailContent(List<String> ids) throws Exception {
-        if (!login && !AskOnlyOnce) checkLogin();
+        if (!login && !ask) checkLogin();
 
         String[] split = ids.get(0).split("@");
         String id = split[0];
@@ -264,7 +264,7 @@ public class Bili extends Spider {
 
     private void getQRCode() {
         if (login) return;
-        AskOnlyOnce = true;
+        ask = true;
         String json = OkHttp.string("https://passport.bilibili.com/x/passport-login/web/qrcode/generate?source=main-mini");
         Data data = Resp.objectFrom(json).getData();
         Init.run(() -> openApp(data));
diff --git a/app/src/main/java/com/github/catvod/utils/Utils.java b/app/src/main/java/com/github/catvod/utils/Utils.java
index a1d6310d..8b9f18d5 100644
--- a/app/src/main/java/com/github/catvod/utils/Utils.java
+++ b/app/src/main/java/com/github/catvod/utils/Utils.java
@@ -194,11 +194,12 @@ public class Utils {
 
     public static String getDigit(String text) {
         try {
+            String newText = text;
             Matcher matcher = Pattern.compile(".*(1080|720|2160|4k|4K).*").matcher(text);
-            if (matcher.find()) text = matcher.group(1) + " " + text;
+            if (matcher.find()) newText = matcher.group(1) + " " + text;
             matcher = Pattern.compile("^([0-9]+)").matcher(text);
-            if (matcher.find()) text = matcher.group(1) + " " + text;
-            return text.replaceAll("\\D+", "");
+            if (matcher.find()) newText = matcher.group(1) + " " + newText;
+            return newText.replaceAll("\\D+", "") + " " + newText.replaceAll("\\d+", "");
         } catch (Exception e) {
             return "";
         }