Merge branch 'release/v0.15.0'

gee1k · Dec 6, 2019 · 4cabacf · 4cabacf
2 parents bcd5e92 + bc29db3
commit 4cabacf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/uPic/General/Managers/ConfigManager.swift b/uPic/General/Managers/ConfigManager.swift
@@ -43,9 +43,7 @@ public class ConfigManager {
 
     //MARK: 临时处理 folder、filename 的数据到新版的 saveKey 中。后续版本需要移除
     private func _upgradeHostData() {
-        if Defaults.bool(forKey: "_upgradedHostData") {
-            return
-        }
+        var changed = false
         let hostItems = self.getHostItems()
         for host in hostItems {
             if (host.data == nil || !host.data!.containsKey(key: "saveKeyPath")) {
@@ -56,6 +54,8 @@ public class ConfigManager {
                 continue
             }
 
+            changed = true
+
             var saveKeyPath = ""
 
             if data.containsKey(key: "folder") {
@@ -75,8 +75,9 @@ public class ConfigManager {
             host.data?.setValue(saveKeyPath, forKey: "saveKeyPath")
         }
 
-        self.setHostItems(items: hostItems)
-        Defaults.set(true, forKey: "_upgradedHostData")
+        if changed {
+            self.setHostItems(items: hostItems)
+        }
     }
 
     public func removeAllUserDefaults() {

diff --git a/uPic/Models/HostSaveKey.swift b/uPic/Models/HostSaveKey.swift
@@ -49,19 +49,19 @@ public enum HostSaveKey: String, CaseIterable, Codable {
         case .dateFilename:
             return "{year}-{mon}-{day}-{filename}{.suffix}"
         case .datetimeFilename:
-            return "{year}{mon}{day}{hours}{minutes}{seconds}-{filename}{.suffix}"
+            return "{year}{mon}{day}{hour}{minute}{second}-{filename}{.suffix}"
         case .secondFilename:
-            return "{since_seconds}-{filename}{.suffix}"
+            return "{since_second}-{filename}{.suffix}"
         case .millisecondFilename:
-            return "{since_milliseconds}-{filename}{.suffix}"
+            return "{since_millisecond}-{filename}{.suffix}"
         case .dateRandom:
             return "{year}-{mon}-{day}-{random}{.suffix}"
         case .datetimeRandom:
-            return "{year}{mon}{day}{hours}{minutes}{seconds}-{random}{.suffix}"
+            return "{year}{mon}{day}{hour}{minute}{second}-{random}{.suffix}"
         case .secondRandom:
-            return "{since_seconds}-{random}{.suffix}"
+            return "{since_second}-{random}{.suffix}"
         case .millisecondRandom:
-            return "{since_milliseconds}-{random}{.suffix}"
+            return "{since_millisecond}-{random}{.suffix}"
         }
     }