Add new UTF8 fields to dictionary in ToBDictionary

Author: Krusen

BencodeNET.Tests/Torrents/TorrentTests.cs

@@ -418,15 +418,16 @@ public void ToBDictionary_CreationDate_DoesNotAddNull()
 
         [Theory]
         [AutoMockedData]
-        public void ToBDictionary_Info_SingleFile_AddsNameAndLength(long fileSize, string fileName)
+        public void ToBDictionary_Info_SingleFile_AddsNameAndLength(long fileSize, string fileName, string fileNameUtf8)
         {
             // Arrange
             var torrent = new Torrent
             {
                 File = new SingleFileInfo
                 {
                     FileSize = fileSize,
-                    FileName = fileName
+                    FileName = fileName,
+                    FileNameUtf8 = fileNameUtf8
                 }
             };
 
@@ -436,11 +437,12 @@ public void ToBDictionary_Info_SingleFile_AddsNameAndLength(long fileSize, strin
             // Assert
             info.Should().Contain(TorrentInfoFields.Length, (BNumber)fileSize);
             info.Should().Contain(TorrentInfoFields.Name, (BString)fileName);
+            info.Should().Contain(TorrentInfoFields.NameUtf8, (BString)fileNameUtf8);
         }
 
         [Theory]
         [AutoMockedData]
-        public void ToBDictionary_Info_MultiFile_AddsFiles(string directoryName, long fileSize, IList<string> path)
+        public void ToBDictionary_Info_MultiFile_AddsFiles(string directoryName, long fileSize, IList<string> path, IList<string> pathUtf8)
         {
             // Arrange
             var torrent = new Torrent
@@ -450,7 +452,8 @@ public void ToBDictionary_Info_MultiFile_AddsFiles(string directoryName, long fi
                     new MultiFileInfo
                     {
                         FileSize = fileSize,
-                        Path = path
+                        Path = path,
+                        PathUtf8 = pathUtf8
                     }
                 }
             };
@@ -463,10 +466,27 @@ public void ToBDictionary_Info_MultiFile_AddsFiles(string directoryName, long fi
             info.Should().Contain(TorrentInfoFields.Name, (BString) directoryName);
             info.Should().ContainKey(TorrentInfoFields.Files);
             info[TorrentInfoFields.Files].Should().BeOfType<BList<BDictionary>>();
-            files[0].Should().BeOfType<BDictionary>();
-            files[0].Should().Contain(TorrentFilesFields.Length, (BNumber) fileSize);
-            files[0].Should().ContainKey(TorrentFilesFields.Path);
-            files[0].Get<BList>(TorrentFilesFields.Path).Should().HaveCount(path.Count);
+
+            var file = files[0];
+            file.Should().BeOfType<BDictionary>();
+            file.Should().Contain(TorrentFilesFields.Length, (BNumber) fileSize);
+            file.Should().ContainKey(TorrentFilesFields.Path);
+            file.Should().ContainKey(TorrentFilesFields.PathUtf8);
+
+            var list = file.Get<BList>(TorrentFilesFields.Path);
+            var listUtf8 = file.Get<BList>(TorrentFilesFields.PathUtf8);
+            list.Should().HaveCount(path.Count);
+            listUtf8.Should().HaveCount(pathUtf8.Count);
+
+            for (var i = 0; i < list.Count; i++)
+            {
+                list[i].ToString().Should().Be(path[i]);
+            }
+
+            for (var i = 0; i < listUtf8.Count; i++)
+            {
+                listUtf8[i].ToString().Should().Be(pathUtf8[i]);
+            }
         }
 
         [Theory]

BencodeNET/Torrents/Torrent.cs

@@ -295,6 +295,10 @@ protected virtual BDictionary CreateInfoDictionary(Encoding encoding)
             if (FileMode == TorrentFileMode.Single)
             {
                 info[TorrentInfoFields.Name] = new BString(File.FileName, encoding);
+
+                if (File.FileNameUtf8 != null)
+                    info[TorrentInfoFields.NameUtf8] = new BString(File.FileNameUtf8, Encoding.UTF8);
+
                 info[TorrentInfoFields.Length] = (BNumber)File.FileSize;
 
                 if (File.Md5Sum != null)
@@ -305,6 +309,9 @@ protected virtual BDictionary CreateInfoDictionary(Encoding encoding)
             {
                 info[TorrentInfoFields.Name] = new BString(Files.DirectoryName, encoding);
 
+                if (Files.DirectoryNameUtf8 != null)
+                    info[TorrentInfoFields.NameUtf8] = new BString(Files.DirectoryNameUtf8, Encoding.UTF8);
+
                 var files = new BList<BDictionary>();
                 foreach (var file in Files)
                 {
@@ -314,6 +321,9 @@ protected virtual BDictionary CreateInfoDictionary(Encoding encoding)
                         [TorrentFilesFields.Path] = new BList(file.Path)
                     };
 
+                    if (file.PathUtf8 != null && file.PathUtf8.Any())
+                        fileDictionary[TorrentFilesFields.PathUtf8] = new BList(file.PathUtf8, Encoding.UTF8);
+
                     if (file.Md5Sum != null)
                         fileDictionary[TorrentFilesFields.Md5Sum] = new BString(file.Md5Sum, encoding);