整个仓库下面，直接跳转到目标Url，本地不做缓存

NewLifeX · Aug 6, 2024 · 60baa53 · 60baa53
1 parent 67db990
commit 60baa53
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1 deletion.
diff --git a/EasyWeb/Controllers/HomeController.cs b/EasyWeb/Controllers/HomeController.cs
@@ -126,7 +126,11 @@ public async Task<ActionResult> DownloadFile(String pathInfo)
         if (!System.IO.File.Exists(path))
         {
             // 直接跳转到原始地址
-            if (!entry.RawUrl.IsNullOrEmpty() && (entry.RawRedirect || entry.Parent != null && entry.Parent.RawRedirect))
+            if (!entry.RawUrl.IsNullOrEmpty() && (
+                entry.RawRedirect ||
+                entry.Parent != null && entry.Parent.RawRedirect ||
+                entry.Storage != null && entry.Storage.RawRedirect)
+                )
             {
                 return Redirect(entry.RawUrl);
             }

diff --git a/EasyWeb/Entity/EasyFile.htm b/EasyWeb/Entity/EasyFile.htm
@@ -148,6 +148,17 @@ <h3>文件仓库（FileStorage）</h3>
             <td>仅搜索匹配的文件，支持*，多个规则逗号隔开</td>
         </tr>
 
+        <tr>
+            <td>RawRedirect</td>
+            <td>原始跳转</td>
+            <td>Boolean</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td>N</td>
+            <td>跳转到原始地址</td>
+        </tr>
+
         <tr>
             <td>LastScan</td>
             <td>最后扫描</td>

diff --git a/EasyWeb/Entity/Model.xml b/EasyWeb/Entity/Model.xml
@@ -50,6 +50,7 @@
         <Column Name="Level" DataType="Int32" Description="深度。最大搜索目录深度" />
         <Column Name="Period" DataType="Int32" Description="同步周期。默认60秒" />
         <Column Name="Pattern" DataType="String" Description="匹配规则。仅搜索匹配的文件，支持*，多个规则逗号隔开" />
+        <Column Name="RawRedirect" DataType="Boolean" Description="原始跳转。跳转到原始地址" />
         <Column Name="LastScan" DataType="DateTime" Description="最后扫描。记录最后一次扫描时间" />
         <Column Name="CreateUserId" DataType="Int32" Description="创建者" Category="扩展" />
         <Column Name="CreateTime" DataType="DateTime" Description="创建时间" Category="扩展" />

diff --git a/EasyWeb/Entity/文件仓库.cs b/EasyWeb/Entity/文件仓库.cs
@@ -94,6 +94,14 @@ public partial class FileStorage
     [BindColumn("Pattern", "匹配规则。仅搜索匹配的文件，支持*，多个规则逗号隔开", "")]
     public String Pattern { get => _Pattern; set { if (OnPropertyChanging("Pattern", value)) { _Pattern = value; OnPropertyChanged("Pattern"); } } }
 
+    private Boolean _RawRedirect;
+    /// <summary>原始跳转。跳转到原始地址</summary>
+    [DisplayName("原始跳转")]
+    [Description("原始跳转。跳转到原始地址")]
+    [DataObjectField(false, false, false, 0)]
+    [BindColumn("RawRedirect", "原始跳转。跳转到原始地址", "")]
+    public Boolean RawRedirect { get => _RawRedirect; set { if (OnPropertyChanging("RawRedirect", value)) { _RawRedirect = value; OnPropertyChanged("RawRedirect"); } } }
+
     private DateTime _LastScan;
     /// <summary>最后扫描。记录最后一次扫描时间</summary>
     [DisplayName("最后扫描")]
@@ -183,6 +191,7 @@ public override Object this[String name]
             "Level" => _Level,
             "Period" => _Period,
             "Pattern" => _Pattern,
+            "RawRedirect" => _RawRedirect,
             "LastScan" => _LastScan,
             "CreateUserId" => _CreateUserId,
             "CreateTime" => _CreateTime,
@@ -206,6 +215,7 @@ public override Object this[String name]
                 case "Level": _Level = value.ToInt(); break;
                 case "Period": _Period = value.ToInt(); break;
                 case "Pattern": _Pattern = Convert.ToString(value); break;
+                case "RawRedirect": _RawRedirect = value.ToBoolean(); break;
                 case "LastScan": _LastScan = value.ToDateTime(); break;
                 case "CreateUserId": _CreateUserId = value.ToInt(); break;
                 case "CreateTime": _CreateTime = value.ToDateTime(); break;
@@ -254,6 +264,9 @@ public partial class _
         /// <summary>匹配规则。仅搜索匹配的文件，支持*，多个规则逗号隔开</summary>
         public static readonly Field Pattern = FindByName("Pattern");
 
+        /// <summary>原始跳转。跳转到原始地址</summary>
+        public static readonly Field RawRedirect = FindByName("RawRedirect");
+
         /// <summary>最后扫描。记录最后一次扫描时间</summary>
         public static readonly Field LastScan = FindByName("LastScan");
 
@@ -311,6 +324,9 @@ public partial class __
         /// <summary>匹配规则。仅搜索匹配的文件，支持*，多个规则逗号隔开</summary>
         public const String Pattern = "Pattern";
 
+        /// <summary>原始跳转。跳转到原始地址</summary>
+        public const String RawRedirect = "RawRedirect";
+
         /// <summary>最后扫描。记录最后一次扫描时间</summary>
         public const String LastScan = "LastScan";
 

diff --git a/EasyWeb/Services/EntryService.cs b/EasyWeb/Services/EntryService.cs
@@ -113,6 +113,8 @@ public async Task<Boolean> DownloadAsync(FileEntry entry, String path)
         var url = entry.RawUrl;
         if (url.IsNullOrEmpty()) return false;
 
+        using var span = _tracer?.NewSpan("DownloadFile", new { entry.Name, path, url });
+
         XTrace.WriteLine("文件不存在，准备下载 {0} => {1}", url, path);
 
         var client = new HttpClient();