Version 1.4.0.0

TheDuffman85 · Apr 12, 2015 · 7836a7b · 7836a7b
1 parent d373996
commit 7836a7b
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 48 deletions.
diff --git a/Synology Download Station Adapter/Adapter.cs b/Synology Download Station Adapter/Adapter.cs
@@ -486,10 +486,15 @@ public static bool AddLinksToDownloadStation(DecrypterBase decrypter)
         public static bool AddLinksToDownloadStation(List<string> links)
         {
             DownloadStation ds = null;
-
+                                    
             try
             {
-                ds = new DownloadStation(new Uri("http://" + Properties.Settings.Default.Address), Properties.Settings.Default.Username, Encoding.UTF8.GetString(Convert.FromBase64String(Properties.Settings.Default.Password)));
+                UriBuilder uriBuilder = new UriBuilder(Properties.Settings.Default.Address)
+                {
+                    Scheme = Uri.UriSchemeHttp
+                };
+
+                ds = new DownloadStation(uriBuilder.Uri, Properties.Settings.Default.Username, Encoding.UTF8.GetString(Convert.FromBase64String(Properties.Settings.Default.Password)));
 
                 // Login to Download Station
                 if (ds.Login())
@@ -622,7 +627,12 @@ public static bool AddFileToDownloadStation(string path)
 
             try
             {
-                ds = new DownloadStation(new Uri("http://" + Properties.Settings.Default.Address), Properties.Settings.Default.Username, Encoding.UTF8.GetString(Convert.FromBase64String(Properties.Settings.Default.Password)));
+                UriBuilder uriBuilder = new UriBuilder(Properties.Settings.Default.Address)
+                {
+                    Scheme = Uri.UriSchemeHttp
+                };
+
+                ds = new DownloadStation(uriBuilder.Uri, Properties.Settings.Default.Username, Encoding.UTF8.GetString(Convert.FromBase64String(Properties.Settings.Default.Password)));
 
                 if (File.Exists(path))
                 {
@@ -745,8 +755,16 @@ public static void OpenDownloadStation()
             else
             #endif
             {
-
-                Process.Start("http://" + Properties.Settings.Default.Address);
+                UriBuilder uriBuilder = new UriBuilder(Properties.Settings.Default.Address);
+
+                // ToDo
+
+                if (string.IsNullOrEmpty(uriBuilder.Scheme))
+                {
+                    uriBuilder.Scheme = Uri.UriSchemeHttp;
+                }
+
+                Process.Start(uriBuilder.Uri.ToString());
             }
         }
 

diff --git a/Synology Download Station Adapter/Properties/AssemblyInfo.cs b/Synology Download Station Adapter/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.1")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
diff --git a/Synology Download Station Adapter/Properties/Settings.Designer.cs b/Synology Download Station Adapter/Properties/Settings.Designer.cs
diff --git a/Synology Download Station Adapter/Properties/Settings.settings b/Synology Download Station Adapter/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="Address" Type="System.String" Scope="User">
-      <Value Profile="(Default)">diskstation:5000</Value>
+      <Value Profile="(Default)">http://diskstation:5000</Value>
     </Setting>
     <Setting Name="Username" Type="System.String" Scope="User">
       <Value Profile="(Default)">admin</Value>
@@ -20,7 +20,7 @@
     <Setting Name="ApplicationEnabled" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ApplicationUrl" Type="System.String" Scope="User">
+    <Setting Name="ApplicationPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="SizeX" Type="System.Int32" Scope="User">

diff --git a/Synology Download Station Adapter/app.config b/Synology Download Station Adapter/app.config
@@ -12,7 +12,7 @@
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup><userSettings>
         <TheDuffman85.SynologyDownloadStationAdapter.Properties.Settings>
             <setting name="Address" serializeAs="String">
-                <value>diskstation:5000</value>
+                <value>http://diskstation:5000</value>
             </setting>
             <setting name="Username" serializeAs="String">
                 <value>admin</value>
@@ -26,7 +26,7 @@
             <setting name="ApplicationEnabled" serializeAs="String">
                 <value>False</value>
             </setting>
-            <setting name="ApplicationUrl" serializeAs="String">
+            <setting name="ApplicationPath" serializeAs="String">
                 <value />
             </setting>
             <setting name="SizeX" serializeAs="String">

diff --git a/Synology Download Station Adapter/frmAddLinks.cs b/Synology Download Station Adapter/frmAddLinks.cs
@@ -112,15 +112,13 @@ private void btnAdd_Click(object sender, EventArgs e)
         {            
             this.Visible = false;
             Clipboard.Clear();
-
-            frmSettings.Instance.Invoke((MethodInvoker)(() =>
+            
+            new Task(() => 
             {
-                // Run on UI thread
-                new Task(() => { Adapter.AddLinksToDownloadStation(txtLinks.Lines.ToList()); }).Start();
-            }
-            ));            
-
-            this.Close();
+                Adapter.AddLinksToDownloadStation(txtLinks.Lines.ToList());
+                this.Invoke((MethodInvoker)(() => { this.Close(); }));
+                
+            }).Start();      
         }
 
         private void btnCancel_Click(object sender, EventArgs e)

diff --git a/Synology Download Station Adapter/frmDownloadStation.cs b/Synology Download Station Adapter/frmDownloadStation.cs
@@ -111,7 +111,7 @@ protected void NewIntance()
         private void frmDownloadStation_Load(object sender, EventArgs e)
         {                        
             webControl.DocumentReady += webControl_DocumentReady;
-            webControl.Source = new Uri(Properties.Settings.Default.ApplicationUrl);
+            webControl.Source = new Uri(new Uri(Properties.Settings.Default.Address), Properties.Settings.Default.ApplicationPath);
         }
 
         private void frmDownloadStation_ResizeEnd(object sender, EventArgs e)

diff --git a/Synology Download Station Adapter/frmSettings.Designer.cs b/Synology Download Station Adapter/frmSettings.Designer.cs
diff --git a/Synology Download Station Adapter/frmSettings.cs b/Synology Download Station Adapter/frmSettings.cs
@@ -107,7 +107,7 @@ private frmSettings()
             cbAutostart.Visible = false;
             lblApplicationUrl.Visible = false;
             cbApplicationEnabled.Visible = false;
-            txtApplicationUrl.Visible = false;
+            txtApplicationPath.Visible = false;
 
             cbShowDecryptedLinks.Top = cbShowDecryptedLinks.Top - 23;
             cbIgnoreHoster.Top = cbIgnoreHoster.Top - 46;
@@ -116,7 +116,31 @@ private frmSettings()
             lblVersion.Text = lblVersion.Text + " (Mono)";
             #endif
 
-
+            #region Upgrade Settings
+
+            bool upgraded = false;
+            Uri address;
+
+            if (!Uri.TryCreate(Properties.Settings.Default.Address, UriKind.Absolute, out address) ||
+                (address != null && address.Scheme != Uri.UriSchemeHttp && address.Scheme != Uri.UriSchemeHttps))
+            {
+                Properties.Settings.Default.Address = "http://" + Properties.Settings.Default.Address;
+                upgraded = true;
+            }            
+
+            if (Properties.Settings.Default.ApplicationEnabled &&
+                string.IsNullOrEmpty(Properties.Settings.Default.ApplicationPath))
+            {
+                Properties.Settings.Default.ApplicationPath = "/download/index.cgi";
+                upgraded = true;
+            }
+
+            if (upgraded)
+            {
+                Properties.Settings.Default.Save();
+            }
+
+            #endregion
 
             InitBookmarks();
         }
@@ -227,7 +251,7 @@ private void btnSave_Click(object sender, EventArgs e)
             Properties.Settings.Default.Password = Convert.ToBase64String(Encoding.UTF8.GetBytes(txtPassword.Text));
             #if !__MonoCS__
             Properties.Settings.Default.ApplicationEnabled = cbApplicationEnabled.Checked;
-            Properties.Settings.Default.ApplicationUrl = txtApplicationUrl.Text;
+            Properties.Settings.Default.ApplicationPath = txtApplicationPath.Text;
             #endif
             Properties.Settings.Default.ShowDecryptedLinks = cbShowDecryptedLinks.Checked;
             Properties.Settings.Default.IgnoreHoster = cbIgnoreHoster.Checked;
@@ -258,7 +282,7 @@ private void frmSettings_VisibleChanged(object sender, EventArgs e)
                 txtPassword.Text = Encoding.UTF8.GetString(Convert.FromBase64String(Properties.Settings.Default.Password));
                 #if !__MonoCS__
                 cbApplicationEnabled.Checked = Properties.Settings.Default.ApplicationEnabled;
-                txtApplicationUrl.Text = Properties.Settings.Default.ApplicationUrl;
+                txtApplicationPath.Text = Properties.Settings.Default.ApplicationPath;
                 #endif
                 cbShowDecryptedLinks.Checked = Properties.Settings.Default.ShowDecryptedLinks;
                 cbIgnoreHoster.Checked = Properties.Settings.Default.IgnoreHoster;
@@ -278,24 +302,72 @@ private void btnFileAssociation_Click(object sender, EventArgs e)
         }    
 
 
-        private void cbApplicationUrl_CheckedChanged(object sender, EventArgs e)
+        private void cbApplicationPath_CheckedChanged(object sender, EventArgs e)
         {
             #if !__MonoCS__
             if (!cbApplicationEnabled.Checked)
             {
-                txtApplicationUrl.Enabled = false;
-                txtApplicationUrl.Text = string.Empty;
+                txtApplicationPath.Enabled = false;
+                txtApplicationPath.Text = string.Empty;
             }
             else
             {
-                txtApplicationUrl.Enabled = true;                
-                if (string.IsNullOrEmpty(txtApplicationUrl.Text))
+                txtApplicationPath.Enabled = true;                
+                if (string.IsNullOrEmpty(txtApplicationPath.Text))
                 {
-                    txtApplicationUrl.Text = "http://" + txtAddress.Text + "/download/index.cgi";
+                    txtApplicationPath.Text = "/download/index.cgi";
                 }
             }
             #endif
-        }        
+        }
+
+        private void txtAddress_Validating(object sender, CancelEventArgs e)
+        {
+            Uri address;
+            DialogResult result = System.Windows.Forms.DialogResult.None;
+
+            if (!Uri.TryCreate(txtAddress.Text, UriKind.Absolute, out address))
+            {
+                result = MessageBox.Show("Please enter a valid uri. eg.: http://diskstation:5000", "Settings", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
+            }
+            else
+            {
+                if (address.Scheme != Uri.UriSchemeHttp &&
+                    address.Scheme != Uri.UriSchemeHttps)
+                {
+                    result = MessageBox.Show("The protocol has to be http or https.", "Settings", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
+                }
+            }
+
+            if (result == System.Windows.Forms.DialogResult.OK)
+            {
+                e.Cancel = true;
+            }
+            else if (result == System.Windows.Forms.DialogResult.Cancel)
+            {
+                txtAddress.Text = Properties.Settings.Default.Address;
+            }
+        }
+
+        private void txtApplicationPath_Validating(object sender, CancelEventArgs e)
+        {
+            Uri path;
+            DialogResult result = System.Windows.Forms.DialogResult.None;
+
+            if (!Uri.TryCreate(txtApplicationPath.Text, UriKind.Relative, out path))
+            {
+                result = MessageBox.Show("Please enter a relative uri. eg.: /download/index.cgi", "Settings", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
+            }
+
+            if (result == System.Windows.Forms.DialogResult.OK)
+            {
+                e.Cancel = true;
+            }
+            else if (result == System.Windows.Forms.DialogResult.Cancel)
+            {
+                txtApplicationPath.Text = Properties.Settings.Default.ApplicationPath;
+            }
+        }
 
         private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e)
         {
@@ -417,8 +489,8 @@ private void bookmarkToolStripMenuItem_Click(object sender, EventArgs e)
         }
 
         #endregion
-
-        #endregion 
+                        
+        #endregion         
 
     }
 }