v1.9.2

HaddadCSharp · HaddadCSharp · commit b9c2076d7ead · 2022-12-27T23:07:11.000+03:30
diff --git a/IMDbAPI_Client/IMDbAPI_Client.csproj b/IMDbAPI_Client/IMDbAPI_Client.csproj
@@ -51,8 +51,8 @@
     <ApplicationIcon>ProjectIcon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="IMDbApiLib, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\IMDbApiLib.1.9.0\lib\net46\IMDbApiLib.dll</HintPath>
+    <Reference Include="IMDbApiLib, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\IMDbApiLib.1.9.2\lib\net46\IMDbApiLib.dll</HintPath>
     </Reference>
     <Reference Include="MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a, processorArchitecture=MSIL">
       <HintPath>..\packages\MetroModernUI.1.4.0.0\lib\net\MetroFramework.dll</HintPath>
diff --git a/IMDbAPI_Client/MoreInfoForm.cs b/IMDbAPI_Client/MoreInfoForm.cs
@@ -80,30 +80,26 @@ private async void MoreInfoForm_Shown(object sender, EventArgs e)
             lblGenre.Text = string.Join(", ", data.GenreList.Select(cx => cx.Key));
             if (Properties.Settings.Default.ClientOptions.ResizeImagesAndPosters)
             {
-                var imageBytes = await _apiLib.ResizeImageBytesAsync("224x308", data.Image);
+                var imageBytes = await _apiLib.ResizeImageAsync("224x308", data.Image);
                 picPoster.Image = ClientUtils.BytesToImage(imageBytes);
             }
             else
             {
-                using (var webClient = new WebClient())
-                {
-                    picPoster.Image = ClientUtils.BytesToImage(await webClient.DownloadDataTaskAsync(data.Image));
-                }
+                var imageBytes = await ApiUtils.GetBytesAsync(data.Image);
+                picPoster.Image = ClientUtils.BytesToImage(imageBytes);
             }
             foreach (var act in data.ActorList.Take(6))
             {
                 var uc = new CastUserControl();
                 if (Properties.Settings.Default.ClientOptions.ResizeImagesAndPosters)
                 {
-                    var imageBytes = await _apiLib.ResizeImageBytesAsync("96x132", act.Image);
+                    var imageBytes = await _apiLib.ResizeImageAsync("96x132", act.Image);
                     uc.CastImage = ClientUtils.BytesToImage(imageBytes);
                 }
                 else
                 {
-                    using (var webClient = new WebClient())
-                    {
-                        uc.CastImage = ClientUtils.BytesToImage(await webClient.DownloadDataTaskAsync(act.Image));
-                    }
+                    var imageBytes = await ApiUtils.GetBytesAsync(act.Image);
+                    uc.CastImage = ClientUtils.BytesToImage(imageBytes);
                 }
                 uc.CastName = act.Name;
                 uc.CastAsCharacter = act.AsCharacter;
@@ -121,7 +117,7 @@ private void EnableControlls(bool enabled)
 
         private void btnIMDb_Click(object sender, EventArgs e)
         {
-            System.Diagnostics.Process.Start("https://imdb-api.com/title/" + _id);
+            System.Diagnostics.Process.Start($"https://www.imdb.com/title/{_id}");
         }
     }
 }
diff --git a/IMDbAPI_Client/PingForm.cs b/IMDbAPI_Client/PingForm.cs
@@ -49,7 +49,7 @@ private async void PingForm_Shown(object sender, EventArgs e)
             flowLayoutPanel1.Controls.Clear();
             foreach (string server in servers)
             {
-                bool passed = await Utils.PingAsync(server);
+                bool passed = await ApiUtils.PingAsync(server);
 
                 if (passed) passedCount++;
 
diff --git a/IMDbAPI_Client/Properties/AssemblyInfo.cs b/IMDbAPI_Client/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
+[assembly: AssemblyVersion("1.9.2.0")]
+[assembly: AssemblyFileVersion("1.9.2.0")]
diff --git a/IMDbAPI_Client/Properties/Settings.Designer.cs b/IMDbAPI_Client/Properties/Settings.Designer.cs
diff --git a/IMDbAPI_Client/Properties/Settings.settings b/IMDbAPI_Client/Properties/Settings.settings
@@ -27,9 +27,6 @@ DownloadSiteName2</Value>
     <Setting Name="MovieFile" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ClientOptions" Type="IMDbAPI_Client.ClientOptions" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
     <Setting Name="OperationType" Type="IMDbAPI_Client.OperationType" Scope="User">
       <Value Profile="(Default)">Movies</Value>
     </Setting>
@@ -45,5 +42,8 @@ DownloadSiteName2</Value>
     <Setting Name="ProxyPassword" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="ClientOptions" Type="IMDbAPI_Client.ClientOptions" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/IMDbAPI_Client/SearchForm.cs b/IMDbAPI_Client/SearchForm.cs
@@ -7,6 +7,7 @@
 using System.Data;
 using System.Linq;
 using System.Net;
+using System.Security.Cryptography;
 using System.Windows.Forms;
 
 namespace IMDbAPI_Client
@@ -147,7 +148,7 @@ private void btnIMDb_Click(object sender, EventArgs e)
                 return;
             }
 
-            System.Diagnostics.Process.Start("https://imdb-api.com/title/" + Id);
+            System.Diagnostics.Process.Start($"https://www.imdb.com/title/{Id}");
         }
 
         private void txtExpression_Enter(object sender, EventArgs e)
@@ -175,15 +176,13 @@ private async void lbSearchMovie_SelectedIndexChanged(object sender, EventArgs e
             picPoster.Image = null;
             if (Properties.Settings.Default.ClientOptions.ResizeImagesAndPosters)
             {
-                var imageBytes = await _apiLib.ResizeImageBytesAsync("224x308", item.Image);
+                var imageBytes = await _apiLib.ResizeImageAsync("224x308", item.Image);
                 picPoster.Image = ClientUtils.BytesToImage(imageBytes);
             }
             else
             {
-                using (var webClient = new WebClient())
-                {
-                    picPoster.Image = ClientUtils.BytesToImage(await webClient.DownloadDataTaskAsync(item.Image));
-                }
+                var imageBytes = await ApiUtils.GetBytesAsync(item.Image);
+                picPoster.Image = ClientUtils.BytesToImage(imageBytes);
             }
             EnableControlls(true);
         }
diff --git a/IMDbAPI_Client/SettingsForm.cs b/IMDbAPI_Client/SettingsForm.cs
@@ -24,7 +24,7 @@ public SettingsForm()
             ddlStyle.DataSource = Enum.GetValues(typeof(MetroColorStyle));
             ddlStyle.SelectedItem = Properties.Settings.Default.Style;
 
-            _settingsUC = new Step3_SettingsUC();
+            _settingsUC = new Step3_SettingsUC(true);
             _settingsUC.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom;
             tabOptions.Controls.Add(_settingsUC);
         }
diff --git a/IMDbAPI_Client/ShutdownForm.cs b/IMDbAPI_Client/ShutdownForm.cs
@@ -41,7 +41,7 @@ private void timer1_Tick(object sender, EventArgs e)
                 progress.Value = 0;
                 lblShutdownTitle.Text = $"Shutting down...";
                 timer1.Enabled = false;
-                Utils.Shutdown();
+                ApiUtils.Shutdown();
             }
         }
 
diff --git a/IMDbAPI_Client/UserControls/Step1_InitUC.cs b/IMDbAPI_Client/UserControls/Step1_InitUC.cs
@@ -24,12 +24,22 @@ public Step1_InitUC()
 
             string apiKey = Properties.Settings.Default.ApiKey;
             if (Properties.Settings.Default.UseProxy)
+            {
                 _apiLib = new ApiLib(apiKey,
                     Properties.Settings.Default.ProxyAddress,
                     Properties.Settings.Default.ProxyUsername,
                     Properties.Settings.Default.ProxyPassword);
+            }
             else
+            {
                 _apiLib = new ApiLib(apiKey);
+            }
+
+            if (Properties.Settings.Default.ClientOptions is null)
+            {
+                Properties.Settings.Default.ClientOptions = new ClientOptions();
+                Properties.Settings.Default.Save();
+            }
         }
 
         private readonly ApiLib _apiLib;
diff --git a/IMDbAPI_Client/UserControls/Step2_SearchUC.cs b/IMDbAPI_Client/UserControls/Step2_SearchUC.cs
@@ -20,12 +20,16 @@ public Step2_SearchUC()
 
             string apiKey = Properties.Settings.Default.ApiKey;
             if (Properties.Settings.Default.UseProxy)
+            {
                 _apiLib = new ApiLib(apiKey,
                     Properties.Settings.Default.ProxyAddress,
                     Properties.Settings.Default.ProxyUsername,
                     Properties.Settings.Default.ProxyPassword);
+            }
             else
+            {
                 _apiLib = new ApiLib(apiKey);
+            }
         }
 
         private readonly ApiLib _apiLib;
@@ -76,7 +80,7 @@ protected override async void OnLoad(EventArgs e)
                 {
                     // Create Folder
                     string nameOnly = fi.Name.Replace(fi.Extension, "");
-                    nameOnly = Utils.RemoveDlSiteName(nameOnly, Properties.Settings.Default.RemoveSites);
+                    nameOnly = ApiUtils.RemoveDlSiteName(nameOnly, Properties.Settings.Default.RemoveSites);
                     string newFolder = $"{dir}\\{nameOnly}";
                     Directory.CreateDirectory(newFolder);
 
@@ -92,7 +96,7 @@ protected override async void OnLoad(EventArgs e)
                 var fi = new FileInfo(file);
                 // Create Folder
                 string nameOnly = fi.Name.Replace(fi.Extension, "");
-                nameOnly = Utils.RemoveDlSiteName(nameOnly, Properties.Settings.Default.RemoveSites);
+                nameOnly = ApiUtils.RemoveDlSiteName(nameOnly, Properties.Settings.Default.RemoveSites);
                 string newFolder = $"{fi.Directory.FullName}\\{nameOnly}";
                 Directory.CreateDirectory(newFolder);
 
diff --git a/IMDbAPI_Client/UserControls/Step3_SettingsUC.cs b/IMDbAPI_Client/UserControls/Step3_SettingsUC.cs
@@ -10,7 +10,7 @@ namespace IMDbAPI_Client.UserControls
 {
     public partial class Step3_SettingsUC : MetroUserControl
     {
-        public Step3_SettingsUC()
+        public Step3_SettingsUC(bool visibleResizeImageOption = false)
         {
             InitializeComponent();
 
@@ -21,12 +21,13 @@ public Step3_SettingsUC()
             }
 
             #region Languages
-            ddlPlotLanguage.DataSource = new BindingSource(Utils.Languages, null);
+            ddlPlotLanguage.DataSource = new BindingSource(ApiUtils.Languages, null);
             ddlPlotLanguage.DisplayMember = "Key";
             ddlPlotLanguage.ValueMember = "Value";
             #endregion
 
             Options = Properties.Settings.Default.ClientOptions;
+            chkResizeImagesAndPosters.Visible = visibleResizeImageOption;
         }
 
         public ClientOptions Options
diff --git a/IMDbAPI_Client/UserControls/Step4_DownloadUC.cs b/IMDbAPI_Client/UserControls/Step4_DownloadUC.cs
diff --git a/IMDbAPI_Client/packages.config b/IMDbAPI_Client/packages.config

Original file line number	Diff line number	Diff line change
`@@ -80,30 +80,26 @@ private async void MoreInfoForm_Shown(object sender, EventArgs e)`
`80`	`80`	`lblGenre.Text = string.Join(", ", data.GenreList.Select(cx => cx.Key));`
`81`	`81`	`if (Properties.Settings.Default.ClientOptions.ResizeImagesAndPosters)`
`82`	`82`	`{`
`83`		`- var imageBytes = await _apiLib.ResizeImageBytesAsync("224x308", data.Image);`
	`83`	`+ var imageBytes = await _apiLib.ResizeImageAsync("224x308", data.Image);`
`84`	`84`	`picPoster.Image = ClientUtils.BytesToImage(imageBytes);`
`85`	`85`	`}`
`86`	`86`	`else`
`87`	`87`	`{`
`88`		`- using (var webClient = new WebClient())`
`89`		`- {`
`90`		`- picPoster.Image = ClientUtils.BytesToImage(await webClient.DownloadDataTaskAsync(data.Image));`
`91`		`- }`
	`88`	`+ var imageBytes = await ApiUtils.GetBytesAsync(data.Image);`
	`89`	`+ picPoster.Image = ClientUtils.BytesToImage(imageBytes);`
`92`	`90`	`}`
`93`	`91`	`foreach (var act in data.ActorList.Take(6))`
`94`	`92`	`{`
`95`	`93`	`var uc = new CastUserControl();`
`96`	`94`	`if (Properties.Settings.Default.ClientOptions.ResizeImagesAndPosters)`
`97`	`95`	`{`
`98`		`- var imageBytes = await _apiLib.ResizeImageBytesAsync("96x132", act.Image);`
	`96`	`+ var imageBytes = await _apiLib.ResizeImageAsync("96x132", act.Image);`
`99`	`97`	`uc.CastImage = ClientUtils.BytesToImage(imageBytes);`
`100`	`98`	`}`
`101`	`99`	`else`
`102`	`100`	`{`
`103`		`- using (var webClient = new WebClient())`
`104`		`- {`
`105`		`- uc.CastImage = ClientUtils.BytesToImage(await webClient.DownloadDataTaskAsync(act.Image));`
`106`		`- }`
	`101`	`+ var imageBytes = await ApiUtils.GetBytesAsync(act.Image);`
	`102`	`+ uc.CastImage = ClientUtils.BytesToImage(imageBytes);`
`107`	`103`	`}`
`108`	`104`	`uc.CastName = act.Name;`
`109`	`105`	`uc.CastAsCharacter = act.AsCharacter;`
`@@ -121,7 +117,7 @@ private void EnableControlls(bool enabled)`
`121`	`117`
`122`	`118`	`private void btnIMDb_Click(object sender, EventArgs e)`
`123`	`119`	`{`
`124`		`- System.Diagnostics.Process.Start("https://imdb-api.com/title/" + _id);`
	`120`	`+ System.Diagnostics.Process.Start($"https://www.imdb.com/title/{_id}");`
`125`	`121`	`}`
`126`	`122`	`}`
`127`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ private async void PingForm_Shown(object sender, EventArgs e)`
`49`	`49`	`flowLayoutPanel1.Controls.Clear();`
`50`	`50`	`foreach (string server in servers)`
`51`	`51`	`{`
`52`		`- bool passed = await Utils.PingAsync(server);`
	`52`	`+ bool passed = await ApiUtils.PingAsync(server);`
`53`	`53`
`54`	`54`	`if (passed) passedCount++;`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using System.Data;`
`8`	`8`	`using System.Linq;`
`9`	`9`	`using System.Net;`
	`10`	`+using System.Security.Cryptography;`
`10`	`11`	`using System.Windows.Forms;`
`11`	`12`
`12`	`13`	`namespace IMDbAPI_Client`
`@@ -147,7 +148,7 @@ private void btnIMDb_Click(object sender, EventArgs e)`
`147`	`148`	`return;`
`148`	`149`	`}`
`149`	`150`
`150`		`- System.Diagnostics.Process.Start("https://imdb-api.com/title/" + Id);`
	`151`	`+ System.Diagnostics.Process.Start($"https://www.imdb.com/title/{Id}");`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`private void txtExpression_Enter(object sender, EventArgs e)`
`@@ -175,15 +176,13 @@ private async void lbSearchMovie_SelectedIndexChanged(object sender, EventArgs e`
`175`	`176`	`picPoster.Image = null;`
`176`	`177`	`if (Properties.Settings.Default.ClientOptions.ResizeImagesAndPosters)`
`177`	`178`	`{`
`178`		`- var imageBytes = await _apiLib.ResizeImageBytesAsync("224x308", item.Image);`
	`179`	`+ var imageBytes = await _apiLib.ResizeImageAsync("224x308", item.Image);`
`179`	`180`	`picPoster.Image = ClientUtils.BytesToImage(imageBytes);`
`180`	`181`	`}`
`181`	`182`	`else`
`182`	`183`	`{`
`183`		`- using (var webClient = new WebClient())`
`184`		`- {`
`185`		`- picPoster.Image = ClientUtils.BytesToImage(await webClient.DownloadDataTaskAsync(item.Image));`
`186`		`- }`
	`184`	`+ var imageBytes = await ApiUtils.GetBytesAsync(item.Image);`
	`185`	`+ picPoster.Image = ClientUtils.BytesToImage(imageBytes);`
`187`	`186`	`}`
`188`	`187`	`EnableControlls(true);`
`189`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public SettingsForm()`
`24`	`24`	`ddlStyle.DataSource = Enum.GetValues(typeof(MetroColorStyle));`
`25`	`25`	`ddlStyle.SelectedItem = Properties.Settings.Default.Style;`
`26`	`26`
`27`		`- _settingsUC = new Step3_SettingsUC();`
	`27`	`+ _settingsUC = new Step3_SettingsUC(true);`
`28`	`28`	`_settingsUC.Anchor = AnchorStyles.Left \| AnchorStyles.Right \| AnchorStyles.Top \| AnchorStyles.Bottom;`
`29`	`29`	`tabOptions.Controls.Add(_settingsUC);`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ private void timer1_Tick(object sender, EventArgs e)`
`41`	`41`	`progress.Value = 0;`
`42`	`42`	`lblShutdownTitle.Text = $"Shutting down...";`
`43`	`43`	`timer1.Enabled = false;`
`44`		`- Utils.Shutdown();`
	`44`	`+ ApiUtils.Shutdown();`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`