浏览代码

update mime types

Luke Pulverenti 9 年之前
父节点
当前提交
317c6bcd68
共有 2 个文件被更改,包括 5 次插入3 次删除
  1. 1 1
      MediaBrowser.Model/Net/MimeTypes.cs
  2. 4 2
      MediaBrowser.Server.Implementations/Devices/DeviceManager.cs

+ 1 - 1
MediaBrowser.Model/Net/MimeTypes.cs

@@ -318,7 +318,7 @@ namespace MediaBrowser.Model.Net
             {
                 return result;
             }
-            throw new ArgumentNullException("Unable to determine extension for mimeType: " + mimeType);
+            return null;
         }
     }
 }

+ 4 - 2
MediaBrowser.Server.Implementations/Devices/DeviceManager.cs

@@ -8,6 +8,7 @@ using MediaBrowser.Model.Devices;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Session;
 using MediaBrowser.Model.Users;
@@ -151,12 +152,13 @@ namespace MediaBrowser.Server.Implementations.Devices
                 path = Path.Combine(path, _fileSystem.GetValidFilename(file.Album));
             }
 
-            Directory.CreateDirectory(path);
-
             path = Path.Combine(path, file.Name);
+            path = Path.ChangeExtension(path, MimeTypes.ToExtension(file.MimeType) ?? "jpg");
 
             _libraryMonitor.ReportFileSystemChangeBeginning(path);
 
+            Directory.CreateDirectory(Path.GetDirectoryName(path));
+
             try
             {
                 using (var fs = _fileSystem.GetFileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))