Skip to content

Usenet streaming with a WebDAV server and a SABnzbd-compatible API

C#

Added LastModifiedTime to webdav items (#51)

nzbdav-dev2a167e1f261e
diff --git a/backend/WebDav/Base/BaseStoreCollection.cs b/backend/WebDav/Base/BaseStoreCollection.cs
index c81e6142..ea91fb9e 100644
--- a/backend/WebDav/Base/BaseStoreCollection.cs
+++ b/backend/WebDav/Base/BaseStoreCollection.cs
@@ -11,6 +11,7 @@ public abstract class BaseStoreCollection : IStoreCollection
// abstract members
public abstract string Name { get; }
public abstract string UniqueKey { get; }
+ public abstract DateTime CreatedAt { get; }
protected abstract Task<StoreItemResult> CopyAsync(CopyRequest request);
protected abstract Task<IStoreItem?> GetItemAsync(GetItemRequest request);
diff --git a/backend/WebDav/Base/BaseStoreCollectionPropertyManager.cs b/backend/WebDav/Base/BaseStoreCollectionPropertyManager.cs
index c2d0ac03..320c9c39 100644
--- a/backend/WebDav/Base/BaseStoreCollectionPropertyManager.cs
+++ b/backend/WebDav/Base/BaseStoreCollectionPropertyManager.cs
@@ -20,7 +20,7 @@ public class BaseStoreCollectionPropertyManager() : PropertyManager<BaseStoreCol
},
new DavGetLastModified<BaseStoreCollection>
{
- Getter = _ => default
+ Getter = x => x.CreatedAt
},
new Win32FileAttributes<BaseStoreCollection>
{
diff --git a/backend/WebDav/Base/BaseStoreEmptyFile.cs b/backend/WebDav/Base/BaseStoreEmptyFile.cs
index 5a0d13cb..26ba4505 100644
--- a/backend/WebDav/Base/BaseStoreEmptyFile.cs
+++ b/backend/WebDav/Base/BaseStoreEmptyFile.cs
@@ -9,6 +9,7 @@ public class BaseStoreEmptyFile(string name) : BaseStoreItem
public override string Name => name;
public override string UniqueKey { get; } = Guid.NewGuid().ToString();
public override long FileSize => 0;
+ public override DateTime CreatedAt { get; } = DateTime.Now;
public override Task<Stream> GetReadableStreamAsync(CancellationToken cancellationToken)
{
diff --git a/backend/WebDav/Base/BaseStoreItem.cs b/backend/WebDav/Base/BaseStoreItem.cs
index ff20c5be..7f53d973 100644
--- a/backend/WebDav/Base/BaseStoreItem.cs
+++ b/backend/WebDav/Base/BaseStoreItem.cs
@@ -11,6 +11,7 @@ public abstract class BaseStoreItem : IStoreItem
public abstract string Name { get; }
public abstract string UniqueKey { get; }
public abstract long FileSize { get; }
+ public abstract DateTime CreatedAt { get; }
public abstract Task<Stream> GetReadableStreamAsync(CancellationToken cancellationToken);
protected abstract Task<DavStatusCode> UploadFromStreamAsync(UploadFromStreamRequest request);
protected abstract Task<StoreItemResult> CopyAsync(CopyRequest request);
diff --git a/backend/WebDav/Base/BaseStoreItemPropertyManager.cs b/backend/WebDav/Base/BaseStoreItemPropertyManager.cs
index 69b7da26..c4d60461 100644
--- a/backend/WebDav/Base/BaseStoreItemPropertyManager.cs
+++ b/backend/WebDav/Base/BaseStoreItemPropertyManager.cs
@@ -25,7 +25,7 @@ public class BaseStoreItemPropertyManager() : PropertyManager<BaseStoreItem>(Dav
},
new DavGetLastModified<BaseStoreItem>
{
- Getter = _ => default
+ Getter = x => x.CreatedAt
},
new Win32FileAttributes<BaseStoreItem>
{
diff --git a/backend/WebDav/Base/GetAndHeadHandlerPatch.cs b/backend/WebDav/Base/GetAndHeadHandlerPatch.cs
index 54a25fb8..8113372b 100644
--- a/backend/WebDav/Base/GetAndHeadHandlerPatch.cs
+++ b/backend/WebDav/Base/GetAndHeadHandlerPatch.cs
@@ -108,15 +108,6 @@ public class GetAndHeadHandlerPatch : IRequestHandler
// Determine the total length
var length = stream.Length;
- // Check if an 'If-Range' was specified
- if (range?.If != null && range?.If != default(DateTime) && propertyManager != null)
- {
- var lastModifiedText = (string?)await propertyManager.GetPropertyAsync(entry, DavGetLastModified<IStoreItem>.PropertyName, true, httpContext.RequestAborted).ConfigureAwait(false);
- var lastModified = DateTime.Parse(lastModifiedText, CultureInfo.InvariantCulture);
- if (lastModified != range.If)
- range = null;
- }
-
// Check if a range was specified
if (range != null)
{
diff --git a/backend/WebDav/DatabaseStoreCollection.cs b/backend/WebDav/DatabaseStoreCollection.cs
index 069152d4..e78997de 100644
--- a/backend/WebDav/DatabaseStoreCollection.cs
+++ b/backend/WebDav/DatabaseStoreCollection.cs
@@ -21,6 +21,7 @@ public class DatabaseStoreCollection(
{
public override string Name => davDirectory.Name;
public override string UniqueKey => davDirectory.Id.ToString();
+ public override DateTime CreatedAt => davDirectory.CreatedAt;
protected override Task<StoreItemResult> CopyAsync(CopyRequest request)
{
diff --git a/backend/WebDav/DatabaseStoreNzbFile.cs b/backend/WebDav/DatabaseStoreNzbFile.cs
index 53645c66..08cc9731 100644
--- a/backend/WebDav/DatabaseStoreNzbFile.cs
+++ b/backend/WebDav/DatabaseStoreNzbFile.cs
@@ -20,6 +20,7 @@ public class DatabaseStoreNzbFile(
public override string Name => davNzbFile.Name;
public override string UniqueKey => davNzbFile.Id.ToString();
public override long FileSize => davNzbFile.FileSize!.Value;
+ public override DateTime CreatedAt => davNzbFile.CreatedAt;
public override async Task<Stream> GetReadableStreamAsync(CancellationToken cancellationToken)
{
diff --git a/backend/WebDav/DatabaseStoreQueueItem.cs b/backend/WebDav/DatabaseStoreQueueItem.cs
index a7b8cc49..11658673 100644
--- a/backend/WebDav/DatabaseStoreQueueItem.cs
+++ b/backend/WebDav/DatabaseStoreQueueItem.cs
@@ -19,6 +19,7 @@ public class DatabaseStoreQueueItem(
public override string Name => queueItem.FileName;
public override string UniqueKey => queueItem.Id.ToString();
public override long FileSize => queueItem.NzbFileSize;
+ public override DateTime CreatedAt => queueItem.CreatedAt;
public override async Task<Stream> GetReadableStreamAsync(CancellationToken ct)
{
diff --git a/backend/WebDav/DatabaseStoreRarFile.cs b/backend/WebDav/DatabaseStoreRarFile.cs
index ecf82d0b..ea3d136d 100644
--- a/backend/WebDav/DatabaseStoreRarFile.cs
+++ b/backend/WebDav/DatabaseStoreRarFile.cs
@@ -22,6 +22,7 @@ public class DatabaseStoreRarFile(
public override string Name => davRarFile.Name;
public override string UniqueKey => davRarFile.Id.ToString();
public override long FileSize => davRarFile.FileSize!.Value;
+ public override DateTime CreatedAt => davRarFile.CreatedAt;
public override async Task<Stream> GetReadableStreamAsync(CancellationToken ct)
{
diff --git a/backend/WebDav/DatabaseStoreSymlinkCollection.cs b/backend/WebDav/DatabaseStoreSymlinkCollection.cs
index d9b1e305..72ce26f0 100644
--- a/backend/WebDav/DatabaseStoreSymlinkCollection.cs
+++ b/backend/WebDav/DatabaseStoreSymlinkCollection.cs
@@ -19,6 +19,7 @@ public class DatabaseStoreSymlinkCollection(
{
public override string Name => davDirectory.Name;
public override string UniqueKey => davDirectory.Id.ToString();
+ public override DateTime CreatedAt => davDirectory.CreatedAt;
private string RelativePath => davDirectory.Id == DavItem.SymlinkFolder.Id ? "" : Path.Join(parentPath, Name);
private Guid TargetId => davDirectory.Id == DavItem.SymlinkFolder.Id ? DavItem.ContentFolder.Id : davDirectory.Id;
diff --git a/backend/WebDav/DatabaseStoreSymlinkFile.cs b/backend/WebDav/DatabaseStoreSymlinkFile.cs
index 4d3d6638..0b25f313 100644
--- a/backend/WebDav/DatabaseStoreSymlinkFile.cs
+++ b/backend/WebDav/DatabaseStoreSymlinkFile.cs
@@ -15,6 +15,7 @@ public class DatabaseStoreSymlinkFile(DavItem davFile, string parentPath, Config
public override string Name => davFile.Name + ".rclonelink";
public override string UniqueKey => davFile.Id + ".rclonelink";
public override long FileSize => ContentBytes.Length;
+ public override DateTime CreatedAt => davFile.CreatedAt;
private string TargetPath =>
Path.Combine(configManager.GetRcloneMountDir(), DavItem.ContentFolder.Name, parentPath, davFile.Name);