增加移动端接口，推荐使用！！！

hupo376787 · Oct 13, 2024 · 09c7ea9 · 09c7ea9
1 parent 5104157
commit 09c7ea9
Show file tree

Hide file tree

Showing 7 changed files with 887 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ PC打开[weibo.com](https://weibo.com/)，点击某一用户头像，进入主
 
 
 
-按F12进入控制台，网络-全部，在名称栏选择uid，标头-请求标头-Cookie。右键复制后请填入到Seetings.json。
+Cookie可以通过点击上方按钮打开页面扫码获取，或者按F12进入控制台，网络-全部，在名称栏选择uid，标头-请求标头-Cookie。右键复制后请填入到Seetings.json。
 
 
 

diff --git a/WeiboAlbumDownloader/Enums/WeiboDataSource.cs b/WeiboAlbumDownloader/Enums/WeiboDataSource.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WeiboAlbumDownloader.Enums
+namespace WeiboAlbumDownloader.Enums
 {
     public enum WeiboDataSource
     {
         WeiboCn = 0,
-        WeiboCom1 = 1,
-        WeiboCom2 = 2,
+        WeiboCnMobile = 1,
+        WeiboCom1 = 2,
+        WeiboCom2 = 3,
     }
 }
diff --git a/WeiboAlbumDownloader/Helpers/HttpHelper.cs b/WeiboAlbumDownloader/Helpers/HttpHelper.cs
@@ -51,6 +51,7 @@ public static async Task<T> GetAsync<T>(string url, WeiboDataSource dataSource,
                 {
                     var stream = lxResponse.GetResponseStream();
                     StreamReader reader = new StreamReader(stream);
+
                     if (!string.IsNullOrEmpty(fileName))
                     {
                         FileStream lxFS = File.Create(fileName);
@@ -73,5 +74,28 @@ public static async Task<T> GetAsync<T>(string url, WeiboDataSource dataSource,
                 throw;
             }
         }
+
+        public static string GetUniqueFileName(string filePath)
+        {
+            // 获取文件目录和扩展名
+            string directory = Path.GetDirectoryName(filePath)!;
+            string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(filePath);
+            string extension = Path.GetExtension(filePath);
+
+            int count = 1;
+
+            // 初始文件路径
+            string uniqueFilePath = filePath;
+
+            // 检查文件是否存在，如果存在则循环添加编号直到找到一个不存在的文件名
+            while (File.Exists(uniqueFilePath))
+            {
+                string newFileName = $"{fileNameWithoutExtension}({count}){extension}";
+                uniqueFilePath = Path.Combine(directory, newFileName);
+                count++;
+            }
+
+            return uniqueFilePath;
+        }
     }
 }
diff --git a/WeiboAlbumDownloader/MainWindow.xaml.cs b/WeiboAlbumDownloader/MainWindow.xaml.cs
diff --git a/WeiboAlbumDownloader/Models/AlbumDetailModel2.cs b/WeiboAlbumDownloader/Models/AlbumDetailModel2.cs
@@ -1,16 +1,12 @@
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace WeiboAlbumDownloader.Models
 {
     public partial class AlbumDetailModel2
     {
         [JsonProperty("data")]
-        public PhotoListData2 PhotoListData2 { get; set; }
+        public PhotoListData2? PhotoListData2 { get; set; }
 
         [JsonProperty("ok")]
         public long Ok { get; set; }
@@ -19,10 +15,10 @@ public partial class AlbumDetailModel2
     public partial class PhotoListData2
     {
         [JsonProperty("type")]
-        public string Type { get; set; }
+        public string? Type { get; set; }
 
         [JsonProperty("list")]
-        public List<PhotoListItem2> PhotoListItem2 { get; set; }
+        public List<PhotoListItem2>? PhotoListItem2 { get; set; }
 
         [JsonProperty("since_id")]
         public long SinceId { get; set; }
@@ -31,24 +27,24 @@ public partial class PhotoListData2
     public partial class PhotoListItem2
     {
         [JsonProperty("pid")]
-        public string Pid { get; set; }
+        public string? Pid { get; set; }
 
         [JsonProperty("mid")]
-        public string Mid { get; set; }
+        public string? Mid { get; set; }
 
         [JsonProperty("is_paid")]
         public bool IsPaid { get; set; }
 
         [JsonProperty("timeline_month")]
-        public string TimelineMonth { get; set; }
+        public string? TimelineMonth { get; set; }
 
         [JsonProperty("timeline_year")]
-        public string TimelineYear { get; set; }
+        public string? TimelineYear { get; set; }
 
         [JsonProperty("object_id")]
-        public string ObjectId { get; set; }
+        public string? ObjectId { get; set; }
 
         [JsonProperty("type")]
-        public string Type { get; set; }
+        public string? Type { get; set; }
     }
 }
diff --git a/WeiboAlbumDownloader/Models/SettingsModel.cs b/WeiboAlbumDownloader/Models/SettingsModel.cs
@@ -3,15 +3,15 @@
     public class SettingsModel
     {
         //weibo.cn cookie
-        public string WeiboCnCookie { get; set; }
+        public string? WeiboCnCookie { get; set; }
         //weibo.com cookie
-        public string WeiboComCookie { get; set; }
+        public string? WeiboComCookie { get; set; }
         //推送到微信，填了就会发送
-        public string PushPlusToken { get; set; }
+        public string? PushPlusToken { get; set; }
         //是否开启Crontab定时任务
         public bool EnableCrontab { get; set; } = true;
         //Crontab定时任务
-        public string Crontab { get; set; } = "14 2 * * *";
+        public string? Crontab { get; set; } = "14 2 * * *";
         //用来跳过到下一个uid的计数。如果当前uid下载的时候已存在文件超过此计数，则判定下载过了。-1表示不判定
         public int CountDownloadedSkipToNextUser { get; set; } = 20;
     }