lots update

ivandrofly · ivandrofly · commit d410a1f5a6fa · 2019-08-25T00:31:41.000+01:00
diff --git a/DesktopClient/Helpers/EncodingDetector.cs b/DesktopClient/Helpers/EncodingDetector.cs
diff --git a/DesktopClient/Main.Designer.cs b/DesktopClient/Main.Designer.cs
diff --git a/DesktopClient/Main.cs b/DesktopClient/Main.cs
@@ -4,6 +4,7 @@
 using SubDBSharp.Http;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -18,7 +19,7 @@ public partial class Main : Form
         private string _rootDirectory;
 
         // Contains list of movie/tv-show to be downloaded
-        private IList<MediaInfo> _mediaFiles;
+        private readonly IList<MediaInfo> _mediaFiles;
 
         // SubDbSharp api client
         private readonly SubDBClient _client;
@@ -34,12 +35,11 @@ public Main()
 
             IgnoreExtensions = new HashSet<string>()
             {
-                ".srt", ".txt", ".nfo", ".mp3", ".jpg", ".rar", ".zip", ".7zip"
+                ".srt", ".txt", ".nfo", ".mp3", ".jpg", ".rar", ".zip", ".7zip", ".png"
             };
 
             _mediaFiles = new List<MediaInfo>();
 
-
             // initialize encoding combobox
             InitializeEncoding();
 
@@ -50,17 +50,16 @@ public Main()
         private void InitializeLanguageCombobox()
         {
             // .Result can produce a deadlock in certain scenario's 
-            Response languages = _client.GetAvailableLanguagesAsync().Result;
+            Response languages = _client.GetAvailableLanguagesAsync().GetAwaiter().GetResult();
 
             byte[] buffer = (byte[])languages.Body;
             string csvLanguage = Encoding.UTF8.GetString(buffer, 0, buffer.Length);
 
             // e.g: en, pt, fr...
             foreach (string language in csvLanguage.Split(','))
             {
-                var cbi = new LanguageItem(language);
-                // TODO: Review why after .ToString()  return EnglishName (e.g: English) it keeps
-                // showing "en" instead...
+                LanguageItem cbi = new LanguageItem(language);
+                // TODO: Review why after .ToString() return EnglishName (e.g: English) it keeps showing "en" instead...
                 comboBoxLanguage.Items.Add(cbi);
             }
 
@@ -73,7 +72,7 @@ private void InitializeEncoding()
             int utf8Idx = -1;
             foreach (EncodingInfo encoding in Encoding.GetEncodings())
             {
-                var ei = new EncodingItem
+                EncodingItem ei = new EncodingItem
                 {
                     Encoding = encoding.GetEncoding()
                 };
@@ -91,14 +90,12 @@ private void InitializeEncoding()
 
         private void ButtonBrowse_Click(object sender, EventArgs e)
         {
-            using (var fbd = new FolderBrowserDialog())
+            using (FolderBrowserDialog folderDialog = new FolderBrowserDialog { ShowNewFolderButton = true, SelectedPath = _rootDirectory })
             {
-                // Configure folder dialog
-
-                if (fbd.ShowDialog() == DialogResult.OK)
+                if (folderDialog.ShowDialog() == DialogResult.OK)
                 {
-                    textBoxPath.Text = fbd.SelectedPath;
-                    // get all movie files and store them in a list for later access...
+                    _rootDirectory = folderDialog.SelectedPath;
+                    textBoxPath.Text = folderDialog.SelectedPath;
                 }
             }
         }
@@ -108,19 +105,20 @@ private int LoadMedias()
             _mediaFiles.Clear();
             foreach (string file in Directory.GetFiles(_rootDirectory))
             {
-                if (IgnoreExtensions.Contains(Path.GetExtension(file)))
+                // filter extension
+                string lowerExtension = Path.GetExtension(file);
+                if (IgnoreExtensions.Contains(lowerExtension))
                 {
                     continue;
                 }
-                var mf = new MediaInfo(file);
-                _mediaFiles.Add(mf);
+
+                _mediaFiles.Add(MediaInfo.FromFile(file));
             }
             return _mediaFiles.Count;
         }
 
         private async void ButtonDownload_Click(object sender, EventArgs e)
         {
-
             // validation fails
             if (!IsValid())
             {
@@ -134,54 +132,67 @@ private async void ButtonDownload_Click(object sender, EventArgs e)
             //disable all controls
             ChangeControlsState(false);
 
-            await DownloadAsync();
+            await DownloadAsync().ConfigureAwait(true);
 
-            //await Task.Yield(); was an attemp to continue on main thread
+            // force async 
+            //await Task.Yield();
             //ChangeControlsStates(false);
-
         }
 
         private async Task DownloadAsync()
         {
-            var cbi = (LanguageItem)comboBoxLanguage.SelectedItem;
+            LanguageItem cbi = (LanguageItem)comboBoxLanguage.SelectedItem;
 
             // encoding used to write content in file
             Encoding writeEncoding = ((EncodingItem)comboBoxEncoding.SelectedItem).Encoding;
 
-            // REPORT DOWNLOAD PROGRESS
-            var progressHandler = new Progress<int>(value =>
+            // report download progress
+            Progress<string> progressReporter = new Progress<string>(value =>
             {
-                progressBar1.Value += value;
+                //progressBar1.Value += value;
+                progressBar1.Value += 1;
+                if (File.Exists(value))
+                {
+                    Trace.WriteLine("file downloaded!");
+                }
                 if (progressBar1.Value == progressBar1.Maximum)
                 {
                     MessageBox.Show("Download completed!");
                     ChangeControlsState(true);
                 }
             });
 
-            var progress = progressHandler as IProgress<int>;
+            // this need to happen because Progress<T> implement IProgress interface explicitly
+            IProgress<string> reporter = progressReporter;
 
             for (int i = 0; i < _mediaFiles.Count; ++i)
             {
                 MediaInfo mediaInfo = _mediaFiles[i];
-                Response response = await _client.DownloadSubtitleAsync(mediaInfo.Hash, cbi.CultureInfo.TwoLetterISOLanguageName).ConfigureAwait(false);
 
-                // report progress
-                progress?.Report(1);
+                Response response = await _client.DownloadSubtitleAsync(mediaInfo.Hash,
+                    cbi.CultureInfo.TwoLetterISOLanguageName).ConfigureAwait(false);
 
+                // download failed
                 if (response.StatusCode != System.Net.HttpStatusCode.OK)
                 {
+                    Trace.WriteLine($"Failed downloadeding: {_mediaFiles[i].FileInfo.Name}");
                     continue;
                 }
-                string path = Path.Combine(Path.GetDirectoryName(mediaInfo.FileInfo.FullName), Path.GetFileNameWithoutExtension(mediaInfo.FileInfo.Name) + ".srt");
+
+                // generate file output location
+                string path = Path.Combine(Path.GetDirectoryName(mediaInfo.FileInfo.FullName),
+                    Path.GetFileNameWithoutExtension(mediaInfo.FileInfo.Name) + ".srt");
 
                 byte[] buffer = (byte[])response.Body;
 
-                // encoding used to read data
-                Encoding readEncoding = EncodingDetector.DetectAnsiEncoding(buffer);
+                // read content using guessed encoding
+                string content = EncodingDetector.DetectAnsiEncoding(buffer).GetString(buffer, 0, buffer.Length);
 
-                string content = readEncoding.GetString(buffer, 0, buffer.Length);
+                // write downloaded file to disk
                 File.WriteAllText(path, content, writeEncoding);
+
+                // report progress
+                reporter?.Report(path);
             }
         }
 
@@ -197,7 +208,6 @@ private void ChangeControlsState(bool enabled)
 
         private bool IsValid()
         {
-            _rootDirectory = textBoxPath.Text.Trim();
             if (!Path.IsPathRooted(_rootDirectory))
             {
                 MessageBox.Show("Invalid path!");
@@ -217,7 +227,7 @@ private bool IsValid()
             return true;
         }
 
-        private void textBox1_DragEnter(object sender, DragEventArgs e)
+        private void TextBox1_DragEnter(object sender, DragEventArgs e)
         {
             e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None;
         }
@@ -231,4 +241,5 @@ private void textBox1_DragDrop(object sender, DragEventArgs e)
             }
         }
     }
+
 }
diff --git a/DesktopClient/Models/MediaInfo.cs b/DesktopClient/Models/MediaInfo.cs
@@ -4,13 +4,17 @@ namespace DesktopClient.Models
 {
     public class MediaInfo
     {
-        public string Hash { get; }
-        public FileInfo FileInfo { get; }
+        public string Hash { get; private set; }
+        public FileInfo FileInfo { get; private set; }
 
-        public MediaInfo(string file)
+        public static MediaInfo FromFile(string file)
         {
-            Hash = SubDBSharp.Helpers.Utils.GetMovieHash(file);
-            FileInfo = new FileInfo(file);
+            return new MediaInfo
+            {
+                Hash = SubDBSharp.Helpers.Utils.GetMovieHash(file),
+                FileInfo = new FileInfo(file),
+            };
         }
+
     }
 }
diff --git a/UnitTest/SubDBClient.Test.cs b/UnitTest/SubDBClient.Test.cs
@@ -24,7 +24,6 @@ public async Task TestAvailableLanguages()
             Assert.True(availableLanguages.Count > 0);
         }
 
-        /*
         [Fact]
         public async Task TestSearchSubtitle()
         {
@@ -37,7 +36,6 @@ public async Task TestSearchSubtitle()
             var availableLanguages = ReponseParser.ParseGetAvailablesLanguages(body);
             Assert.True(availableLanguages.Count > 0);
         }
-        */
 
         [Fact]
         public async Task TestDownloadSubtitle()
diff --git a/src/Http/Request.cs b/src/Http/Request.cs
@@ -5,15 +5,8 @@ namespace SubDBSharp.Models
 {
     public class Request : IRequest
     {
-        public Request(Uri endpoint, HttpMethod method, HttpContent content)
-        {
-            EndPoint = endpoint;
-            Method = method;
-            Body = content;
-        }
-
-        public Uri EndPoint { get; }
-        public HttpMethod Method { get; }
-        public HttpContent Body { get; }
+        public Uri EndPoint { get; set; }
+        public HttpMethod Method { get; set; }
+        public HttpContent Body { get; set; }
     }
 }
diff --git a/src/Http/SubDBApi.cs b/src/Http/SubDBApi.cs
@@ -67,7 +67,7 @@ public Task<Response> SearchSubtitle(string hash, bool getVersions = false)
             return SendDataAsync(request);
 #else
             // NOTE: THIS CODE IS ONLY FOR TEST. (SUBDB DOESN'T ENCODED QUERY STRING)
-            // ONCE THE QUERY STRING IS ENCODED IT'S PUT INSIDE HTTP BODY ISNTEAD OF URL
+            // ONCE THE QUERY STRING IS ENCODED IT'S PUT INSIDE HTTP BODY INSTEAD OF URL
             Dictionary<string, string> requestParameters = new Dictionary<string, string>
             {
                 ["action"] = "download",
@@ -142,15 +142,20 @@ protected virtual async Task<Response> BuildResponse(HttpResponseMessage respons
             object responseBody;
             using (HttpContent content = responseMessage.Content)
             {
-                // get can be more processing like getting the metia type before reading
+                // get can be more processing like getting the media type before reading
                 // the content information, but subdb always return string
                 responseBody = await content?.ReadAsByteArrayAsync();
             }
             return new Response(responseMessage.StatusCode, responseBody,
                 responseMessage.Headers.ToDictionary(h => h.Key, h => h.Value.First()));
         }
 
-        protected virtual Request BuildRequest(Uri endPoint, HttpMethod method, HttpContent body) => new Request(endPoint, method, body);
+        protected virtual Request BuildRequest(Uri endPoint, HttpMethod method, HttpContent body) => new Request
+        {
+            EndPoint = endPoint,
+            Body = body,
+            Method = method,
+        };
 
         private static HttpContent BuildFormContent(string subtitle, string movie)
         {
@@ -180,10 +185,6 @@ private static HttpContent BuildFormContent(string subtitle, string movie)
             return content;
         }
 
-        public void Dispose()
-        {
-            // calling dispose in _httClient handler will also dispose _httpClientHandler. (set in contructor)
-            _httpClient.Dispose();
-        }
+        public void Dispose() => _httpClient.Dispose(); // calling dispose in _httClient handler will also dispose _httpClientHandler. (set in contructor)
     }
 }
diff --git a/src/SubDBClient.cs b/src/SubDBClient.cs
@@ -11,8 +11,6 @@ public class SubDBClient : IDisposable, ISubDBClient
         private readonly SubDBApi _subDbApi;
         private readonly IResponseParser _responseParser;
 
-        #region Constuctors
-
         public SubDBClient(ProductHeaderValue productInformation)
             : this(productInformation, ApiUrls.SubDBApiUrl)
         {
@@ -25,8 +23,6 @@ public SubDBClient(ProductHeaderValue productInformation, Uri baseAddress)
             _responseParser = new CsvResponseParser();
         }
 
-        #endregion
-
         /// <summary>
         /// Lists the languages of all subtitles currenttly available in database.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using SubDBSharp.Http;`
`5`	`5`	`using System;`
`6`	`6`	`using System.Collections.Generic;`
	`7`	`+using System.Diagnostics;`
`7`	`8`	`using System.IO;`
`8`	`9`	`using System.Linq;`
`9`	`10`	`using System.Text;`
`@@ -18,7 +19,7 @@ public partial class Main : Form`
`18`	`19`	`private string _rootDirectory;`
`19`	`20`
`20`	`21`	`// Contains list of movie/tv-show to be downloaded`
`21`		`- private IList<MediaInfo> _mediaFiles;`
	`22`	`+ private readonly IList<MediaInfo> _mediaFiles;`
`22`	`23`
`23`	`24`	`// SubDbSharp api client`
`24`	`25`	`private readonly SubDBClient _client;`
`@@ -34,12 +35,11 @@ public Main()`
`34`	`35`
`35`	`36`	`IgnoreExtensions = new HashSet<string>()`
`36`	`37`	`{`
`37`		`- ".srt", ".txt", ".nfo", ".mp3", ".jpg", ".rar", ".zip", ".7zip"`
	`38`	`+ ".srt", ".txt", ".nfo", ".mp3", ".jpg", ".rar", ".zip", ".7zip", ".png"`
`38`	`39`	`};`
`39`	`40`
`40`	`41`	`_mediaFiles = new List<MediaInfo>();`
`41`	`42`
`42`		`-`
`43`	`43`	`// initialize encoding combobox`
`44`	`44`	`InitializeEncoding();`
`45`	`45`
`@@ -50,17 +50,16 @@ public Main()`
`50`	`50`	`private void InitializeLanguageCombobox()`
`51`	`51`	`{`
`52`	`52`	`// .Result can produce a deadlock in certain scenario's`
`53`		`- Response languages = _client.GetAvailableLanguagesAsync().Result;`
	`53`	`+ Response languages = _client.GetAvailableLanguagesAsync().GetAwaiter().GetResult();`
`54`	`54`
`55`	`55`	`byte[] buffer = (byte[])languages.Body;`
`56`	`56`	`string csvLanguage = Encoding.UTF8.GetString(buffer, 0, buffer.Length);`
`57`	`57`
`58`	`58`	`// e.g: en, pt, fr...`
`59`	`59`	`foreach (string language in csvLanguage.Split(','))`
`60`	`60`	`{`
`61`		`- var cbi = new LanguageItem(language);`
`62`		`- // TODO: Review why after .ToString() return EnglishName (e.g: English) it keeps`
`63`		`- // showing "en" instead...`
	`61`	`+ LanguageItem cbi = new LanguageItem(language);`
	`62`	`+ // TODO: Review why after .ToString() return EnglishName (e.g: English) it keeps showing "en" instead...`
`64`	`63`	`comboBoxLanguage.Items.Add(cbi);`
`65`	`64`	`}`
`66`	`65`
`@@ -73,7 +72,7 @@ private void InitializeEncoding()`
`73`	`72`	`int utf8Idx = -1;`
`74`	`73`	`foreach (EncodingInfo encoding in Encoding.GetEncodings())`
`75`	`74`	`{`
`76`		`- var ei = new EncodingItem`
	`75`	`+ EncodingItem ei = new EncodingItem`
`77`	`76`	`{`
`78`	`77`	`Encoding = encoding.GetEncoding()`
`79`	`78`	`};`
`@@ -91,14 +90,12 @@ private void InitializeEncoding()`
`91`	`90`
`92`	`91`	`private void ButtonBrowse_Click(object sender, EventArgs e)`
`93`	`92`	`{`
`94`		`- using (var fbd = new FolderBrowserDialog())`
	`93`	`+ using (FolderBrowserDialog folderDialog = new FolderBrowserDialog { ShowNewFolderButton = true, SelectedPath = _rootDirectory })`
`95`	`94`	`{`
`96`		`- // Configure folder dialog`
`97`		`-`
`98`		`- if (fbd.ShowDialog() == DialogResult.OK)`
	`95`	`+ if (folderDialog.ShowDialog() == DialogResult.OK)`
`99`	`96`	`{`
`100`		`- textBoxPath.Text = fbd.SelectedPath;`
`101`		`- // get all movie files and store them in a list for later access...`
	`97`	`+ _rootDirectory = folderDialog.SelectedPath;`
	`98`	`+ textBoxPath.Text = folderDialog.SelectedPath;`
`102`	`99`	`}`
`103`	`100`	`}`
`104`	`101`	`}`
`@@ -108,19 +105,20 @@ private int LoadMedias()`
`108`	`105`	`_mediaFiles.Clear();`
`109`	`106`	`foreach (string file in Directory.GetFiles(_rootDirectory))`
`110`	`107`	`{`
`111`		`- if (IgnoreExtensions.Contains(Path.GetExtension(file)))`
	`108`	`+ // filter extension`
	`109`	`+ string lowerExtension = Path.GetExtension(file);`
	`110`	`+ if (IgnoreExtensions.Contains(lowerExtension))`
`112`	`111`	`{`
`113`	`112`	`continue;`
`114`	`113`	`}`
`115`		`- var mf = new MediaInfo(file);`
`116`		`- _mediaFiles.Add(mf);`
	`114`	`+`
	`115`	`+ _mediaFiles.Add(MediaInfo.FromFile(file));`
`117`	`116`	`}`
`118`	`117`	`return _mediaFiles.Count;`
`119`	`118`	`}`
`120`	`119`
`121`	`120`	`private async void ButtonDownload_Click(object sender, EventArgs e)`
`122`	`121`	`{`
`123`		`-`
`124`	`122`	`// validation fails`
`125`	`123`	`if (!IsValid())`
`126`	`124`	`{`
`@@ -134,54 +132,67 @@ private async void ButtonDownload_Click(object sender, EventArgs e)`
`134`	`132`	`//disable all controls`
`135`	`133`	`ChangeControlsState(false);`
`136`	`134`
`137`		`- await DownloadAsync();`
	`135`	`+ await DownloadAsync().ConfigureAwait(true);`
`138`	`136`
`139`		`- //await Task.Yield(); was an attemp to continue on main thread`
	`137`	`+ // force async`
	`138`	`+ //await Task.Yield();`
`140`	`139`	`//ChangeControlsStates(false);`
`141`		`-`
`142`	`140`	`}`
`143`	`141`
`144`	`142`	`private async Task DownloadAsync()`
`145`	`143`	`{`
`146`		`- var cbi = (LanguageItem)comboBoxLanguage.SelectedItem;`
	`144`	`+ LanguageItem cbi = (LanguageItem)comboBoxLanguage.SelectedItem;`
`147`	`145`
`148`	`146`	`// encoding used to write content in file`
`149`	`147`	`Encoding writeEncoding = ((EncodingItem)comboBoxEncoding.SelectedItem).Encoding;`
`150`	`148`
`151`		`- // REPORT DOWNLOAD PROGRESS`
`152`		`- var progressHandler = new Progress<int>(value =>`
	`149`	`+ // report download progress`
	`150`	`+ Progress<string> progressReporter = new Progress<string>(value =>`
`153`	`151`	`{`
`154`		`- progressBar1.Value += value;`
	`152`	`+ //progressBar1.Value += value;`
	`153`	`+ progressBar1.Value += 1;`
	`154`	`+ if (File.Exists(value))`
	`155`	`+ {`
	`156`	`+ Trace.WriteLine("file downloaded!");`
	`157`	`+ }`
`155`	`158`	`if (progressBar1.Value == progressBar1.Maximum)`
`156`	`159`	`{`
`157`	`160`	`MessageBox.Show("Download completed!");`
`158`	`161`	`ChangeControlsState(true);`
`159`	`162`	`}`
`160`	`163`	`});`
`161`	`164`
`162`		`- var progress = progressHandler as IProgress<int>;`
	`165`	`+ // this need to happen because Progress<T> implement IProgress interface explicitly`
	`166`	`+ IProgress<string> reporter = progressReporter;`
`163`	`167`
`164`	`168`	`for (int i = 0; i < _mediaFiles.Count; ++i)`
`165`	`169`	`{`
`166`	`170`	`MediaInfo mediaInfo = _mediaFiles[i];`
`167`		`- Response response = await _client.DownloadSubtitleAsync(mediaInfo.Hash, cbi.CultureInfo.TwoLetterISOLanguageName).ConfigureAwait(false);`
`168`	`171`
`169`		`- // report progress`
`170`		`- progress?.Report(1);`
	`172`	`+ Response response = await _client.DownloadSubtitleAsync(mediaInfo.Hash,`
	`173`	`+ cbi.CultureInfo.TwoLetterISOLanguageName).ConfigureAwait(false);`
`171`	`174`
	`175`	`+ // download failed`
`172`	`176`	`if (response.StatusCode != System.Net.HttpStatusCode.OK)`
`173`	`177`	`{`
	`178`	`+ Trace.WriteLine($"Failed downloadeding: {_mediaFiles[i].FileInfo.Name}");`
`174`	`179`	`continue;`
`175`	`180`	`}`
`176`		`- string path = Path.Combine(Path.GetDirectoryName(mediaInfo.FileInfo.FullName), Path.GetFileNameWithoutExtension(mediaInfo.FileInfo.Name) + ".srt");`
	`181`	`+`
	`182`	`+ // generate file output location`
	`183`	`+ string path = Path.Combine(Path.GetDirectoryName(mediaInfo.FileInfo.FullName),`
	`184`	`+ Path.GetFileNameWithoutExtension(mediaInfo.FileInfo.Name) + ".srt");`
`177`	`185`
`178`	`186`	`byte[] buffer = (byte[])response.Body;`
`179`	`187`
`180`		`- // encoding used to read data`
`181`		`- Encoding readEncoding = EncodingDetector.DetectAnsiEncoding(buffer);`
	`188`	`+ // read content using guessed encoding`
	`189`	`+ string content = EncodingDetector.DetectAnsiEncoding(buffer).GetString(buffer, 0, buffer.Length);`
`182`	`190`
`183`		`- string content = readEncoding.GetString(buffer, 0, buffer.Length);`
	`191`	`+ // write downloaded file to disk`
`184`	`192`	`File.WriteAllText(path, content, writeEncoding);`
	`193`	`+`
	`194`	`+ // report progress`
	`195`	`+ reporter?.Report(path);`
`185`	`196`	`}`
`186`	`197`	`}`
`187`	`198`
`@@ -197,7 +208,6 @@ private void ChangeControlsState(bool enabled)`
`197`	`208`
`198`	`209`	`private bool IsValid()`
`199`	`210`	`{`
`200`		`- _rootDirectory = textBoxPath.Text.Trim();`
`201`	`211`	`if (!Path.IsPathRooted(_rootDirectory))`
`202`	`212`	`{`
`203`	`213`	`MessageBox.Show("Invalid path!");`
`@@ -217,7 +227,7 @@ private bool IsValid()`
`217`	`227`	`return true;`
`218`	`228`	`}`
`219`	`229`
`220`		`- private void textBox1_DragEnter(object sender, DragEventArgs e)`
	`230`	`+ private void TextBox1_DragEnter(object sender, DragEventArgs e)`
`221`	`231`	`{`
`222`	`232`	`e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None;`
`223`	`233`	`}`
`@@ -231,4 +241,5 @@ private void textBox1_DragDrop(object sender, DragEventArgs e)`
`231`	`241`	`}`
`232`	`242`	`}`
`233`	`243`	`}`
	`244`	`+`
`234`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,17 @@ namespace DesktopClient.Models`
`4`	`4`	`{`
`5`	`5`	`public class MediaInfo`
`6`	`6`	`{`
`7`		`- public string Hash { get; }`
`8`		`- public FileInfo FileInfo { get; }`
	`7`	`+ public string Hash { get; private set; }`
	`8`	`+ public FileInfo FileInfo { get; private set; }`
`9`	`9`
`10`		`- public MediaInfo(string file)`
	`10`	`+ public static MediaInfo FromFile(string file)`
`11`	`11`	`{`
`12`		`- Hash = SubDBSharp.Helpers.Utils.GetMovieHash(file);`
`13`		`- FileInfo = new FileInfo(file);`
	`12`	`+ return new MediaInfo`
	`13`	`+ {`
	`14`	`+ Hash = SubDBSharp.Helpers.Utils.GetMovieHash(file),`
	`15`	`+ FileInfo = new FileInfo(file),`
	`16`	`+ };`
`14`	`17`	`}`
	`18`	`+`
`15`	`19`	`}`
`16`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ public async Task TestAvailableLanguages()`
`24`	`24`	`Assert.True(availableLanguages.Count > 0);`
`25`	`25`	`}`
`26`	`26`
`27`		`- /*`
`28`	`27`	`[Fact]`
`29`	`28`	`public async Task TestSearchSubtitle()`
`30`	`29`	`{`
`@@ -37,7 +36,6 @@ public async Task TestSearchSubtitle()`
`37`	`36`	`var availableLanguages = ReponseParser.ParseGetAvailablesLanguages(body);`
`38`	`37`	`Assert.True(availableLanguages.Count > 0);`
`39`	`38`	`}`
`40`		`- */`
`41`	`39`
`42`	`40`	`[Fact]`
`43`	`41`	`public async Task TestDownloadSubtitle()`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,8 @@ namespace SubDBSharp.Models`
`5`	`5`	`{`
`6`	`6`	`public class Request : IRequest`
`7`	`7`	`{`
`8`		`- public Request(Uri endpoint, HttpMethod method, HttpContent content)`
`9`		`- {`
`10`		`- EndPoint = endpoint;`
`11`		`- Method = method;`
`12`		`- Body = content;`
`13`		`- }`
`14`		`-`
`15`		`- public Uri EndPoint { get; }`
`16`		`- public HttpMethod Method { get; }`
`17`		`- public HttpContent Body { get; }`
	`8`	`+ public Uri EndPoint { get; set; }`
	`9`	`+ public HttpMethod Method { get; set; }`
	`10`	`+ public HttpContent Body { get; set; }`
`18`	`11`	`}`
`19`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public Task<Response> SearchSubtitle(string hash, bool getVersions = false)`
`67`	`67`	`return SendDataAsync(request);`
`68`	`68`	`#else`
`69`	`69`	`// NOTE: THIS CODE IS ONLY FOR TEST. (SUBDB DOESN'T ENCODED QUERY STRING)`
`70`		`- // ONCE THE QUERY STRING IS ENCODED IT'S PUT INSIDE HTTP BODY ISNTEAD OF URL`
	`70`	`+ // ONCE THE QUERY STRING IS ENCODED IT'S PUT INSIDE HTTP BODY INSTEAD OF URL`
`71`	`71`	`Dictionary<string, string> requestParameters = new Dictionary<string, string>`
`72`	`72`	`{`
`73`	`73`	`["action"] = "download",`
`@@ -142,15 +142,20 @@ protected virtual async Task<Response> BuildResponse(HttpResponseMessage respons`
`142`	`142`	`object responseBody;`
`143`	`143`	`using (HttpContent content = responseMessage.Content)`
`144`	`144`	`{`
`145`		`- // get can be more processing like getting the metia type before reading`
	`145`	`+ // get can be more processing like getting the media type before reading`
`146`	`146`	`// the content information, but subdb always return string`
`147`	`147`	`responseBody = await content?.ReadAsByteArrayAsync();`
`148`	`148`	`}`
`149`	`149`	`return new Response(responseMessage.StatusCode, responseBody,`
`150`	`150`	`responseMessage.Headers.ToDictionary(h => h.Key, h => h.Value.First()));`
`151`	`151`	`}`
`152`	`152`
`153`		`- protected virtual Request BuildRequest(Uri endPoint, HttpMethod method, HttpContent body) => new Request(endPoint, method, body);`
	`153`	`+ protected virtual Request BuildRequest(Uri endPoint, HttpMethod method, HttpContent body) => new Request`
	`154`	`+ {`
	`155`	`+ EndPoint = endPoint,`
	`156`	`+ Body = body,`
	`157`	`+ Method = method,`
	`158`	`+ };`
`154`	`159`
`155`	`160`	`private static HttpContent BuildFormContent(string subtitle, string movie)`
`156`	`161`	`{`
`@@ -180,10 +185,6 @@ private static HttpContent BuildFormContent(string subtitle, string movie)`
`180`	`185`	`return content;`
`181`	`186`	`}`
`182`	`187`
`183`		`- public void Dispose()`
`184`		`- {`
`185`		`- // calling dispose in _httClient handler will also dispose _httpClientHandler. (set in contructor)`
`186`		`- _httpClient.Dispose();`
`187`		`- }`
	`188`	`+ public void Dispose() => _httpClient.Dispose(); // calling dispose in _httClient handler will also dispose _httpClientHandler. (set in contructor)`
`188`	`189`	`}`
`189`	`190`	`}`