From c6c7f7b6906f16945aa40e5b81d8fe2f679d8e5f Mon Sep 17 00:00:00 2001 From: Vadym Markov Date: Mon, 13 Aug 2018 10:10:59 +0200 Subject: [PATCH] Add filePath to Entry --- Source/Shared/Library/Entry.swift | 8 ++++---- Source/Shared/Storage/DiskStorage.swift | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Source/Shared/Library/Entry.swift b/Source/Shared/Library/Entry.swift index 6ccb7c07..d39166a6 100644 --- a/Source/Shared/Library/Entry.swift +++ b/Source/Shared/Library/Entry.swift @@ -6,12 +6,12 @@ public struct Entry { public let object: T /// Expiry date public let expiry: Expiry - /// Associated meta data, if any - public let meta: [String: Any] + /// File path to the cached object + public let filePath: String? - init(object: T, expiry: Expiry, meta: [String: Any] = [:]) { + init(object: T, expiry: Expiry, filePath: String? = nil) { self.object = object self.expiry = expiry - self.meta = meta + self.filePath = filePath } } diff --git a/Source/Shared/Storage/DiskStorage.swift b/Source/Shared/Storage/DiskStorage.swift index 42e4f0d5..d211158d 100644 --- a/Source/Shared/Storage/DiskStorage.swift +++ b/Source/Shared/Storage/DiskStorage.swift @@ -68,14 +68,10 @@ extension DiskStorage: StorageAware { throw StorageError.malformedFileAttributes } - let meta: [String: Any] = [ - "filePath": filePath - ] - return Entry( object: object, expiry: Expiry.date(date), - meta: meta + filePath: filePath ) }