From 45e1307c7c2bedc8b441eb0ea1fb861aabbb74bd Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Mon, 14 Dec 2015 11:26:17 +0800
Subject: [PATCH] use FileExtension for local file name

---
 Yep/Extensions/NSFileManager+Yep.swift | 17 ++++++++++++-----
 Yep/Realm/Models.swift                 |  6 ------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Yep/Extensions/NSFileManager+Yep.swift b/Yep/Extensions/NSFileManager+Yep.swift
index ac94169f..c0c41b35 100644
--- a/Yep/Extensions/NSFileManager+Yep.swift
+++ b/Yep/Extensions/NSFileManager+Yep.swift
@@ -8,7 +8,14 @@
 
 import UIKit
 
+enum FileExtension: String {
+    case JPEG = "jpg"
+    case MP4 = "mp4"
+    case M4A = "m4a"
+}
+
 extension NSFileManager {
+
     class func yepCachesURL() -> NSURL {
         return try! NSFileManager.defaultManager().URLForDirectory(.CachesDirectory, inDomain: .UserDomainMask, appropriateForURL: nil, create: false)
     }
@@ -33,7 +40,7 @@ extension NSFileManager {
     class func yepAvatarURLWithName(name: String) -> NSURL? {
 
         if let avatarCachesURL = yepAvatarCachesURL() {
-            return avatarCachesURL.URLByAppendingPathComponent("\(name).jpg")
+            return avatarCachesURL.URLByAppendingPathComponent("\(name).\(FileExtension.JPEG.rawValue)")
         }
 
         return nil
@@ -82,7 +89,7 @@ extension NSFileManager {
     class func yepMessageImageURLWithName(name: String) -> NSURL? {
 
         if let messageCachesURL = yepMessageCachesURL() {
-            return messageCachesURL.URLByAppendingPathComponent("\(name).jpg")
+            return messageCachesURL.URLByAppendingPathComponent("\(name).\(FileExtension.JPEG.rawValue)")
         }
 
         return nil
@@ -118,7 +125,7 @@ extension NSFileManager {
     class func yepMessageAudioURLWithName(name: String) -> NSURL? {
 
         if let messageCachesURL = yepMessageCachesURL() {
-            return messageCachesURL.URLByAppendingPathComponent("\(name).m4a")
+            return messageCachesURL.URLByAppendingPathComponent("\(name).\(FileExtension.M4A.rawValue)")
         }
 
         return nil
@@ -154,7 +161,7 @@ extension NSFileManager {
     class func yepMessageVideoURLWithName(name: String) -> NSURL? {
 
         if let messageCachesURL = yepMessageCachesURL() {
-            return messageCachesURL.URLByAppendingPathComponent("\(name).mp4")
+            return messageCachesURL.URLByAppendingPathComponent("\(name).\(FileExtension.MP4.rawValue)")
         }
 
         return nil
@@ -218,5 +225,5 @@ extension NSFileManager {
             cleanCachesDirectoryAtURL(messageCachesURL)
         }
     }
-
 }
+
diff --git a/Yep/Realm/Models.swift b/Yep/Realm/Models.swift
index a990c5a8..c4cea132 100644
--- a/Yep/Realm/Models.swift
+++ b/Yep/Realm/Models.swift
@@ -292,12 +292,6 @@ enum MessageDownloadState: Int {
     case Downloaded     = 2 // 已下载
 }
 
-enum FileExtension: String {
-    case JPEG = "jpg"
-    case MP4 = "mp4"
-    case M4A = "m4a"
-}
-
 enum MessageMediaType: Int, CustomStringConvertible {
     case Text           = 0
     case Image          = 1