Zbiór zmian 597 dla trunk/BazaReklam/FormBadVer.cs

Data:

2009-04-21 17:45:38 (17 years ago)

Autor:

marek

Opis:

re #165

Pliki:

• trunk/BazaReklam/FormBadVer.cs (zmodyfikowane) (4 diffs)

trunk/BazaReklam/FormBadVer.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using System.Net;
 using System.Diagnostics;
+
 using Baza_Reklam.Classes;
 
@@ -14 +11 @@
     public partial class FormBadVer : Form
     {
-        private WebClient webClient;
-        private bool isBusy = false;
-        const string strUrl = "http://www.infocity.pl/baza_reklam/files/Updater.exe";
+        const string UPDATER_URL = "http://www.infocity.pl/baza_reklam/update/updater.exe";
+        const string ZIP_URL = "http://www.infocity.pl/baza_reklam/update/BazaReklam.zip";
+
+        private readonly WebClient webClient;
 
         public FormBadVer()
         {
             InitializeComponent();
-            
+
             webClient = new WebClient();
-            webClient.DownloadFileCompleted += new AsyncCompletedEventHandler(DownloadFileCompleted);
+            webClient.DownloadFileCompleted += DownloadFileCompleted;
         }
 
         private void button1_Click(object sender, EventArgs e)
         {
-            string updater = Environment.CurrentDirectory + "\\Updater.exe";
+            button1.Enabled = false;
+            Cursor = Cursors.WaitCursor;
+            button1.Cursor = Cursors.WaitCursor;
+            webClient.DownloadFileAsync(new Uri(UPDATER_URL), Environment.CurrentDirectory + "\\Updater.exe");
+            return;
 
-            if (System.IO.File.Exists(updater))
-            {
-                StartUpdater();
-            }
-            else
-            {
-                isBusy = true;
-                webClient.DownloadFileAsync(new Uri(strUrl), Environment.CurrentDirectory + "\\Updater.exe");            
-            }
+            //TODO: Uncomment after every user will get updated version of the Updater
+            //string updater = Environment.CurrentDirectory + "\\Updater.exe";
+
+            //if (System.IO.File.Exists(updater))
+            //    StartUpdater();
+            //else
+            //    webClient.DownloadFileAsync(new Uri(UPDATER_URL), Environment.CurrentDirectory + "\\Updater.exe");
         }
 
         private void DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
         {
-            isBusy = false;
-                     
             if (e.Error == null)
             {
@@ -52 +50 @@
             {
                 MessageBox.Show("B³¹d aktualizacji oprogramowania: " + e.Error.Message, "Aktualizacja oprogramowania", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                Logger.LogException(e.Error, "[aktualizacja]", DateTime.Now);
                 Close();
             }
@@ -59 +58 @@
         {
             string updater = Environment.CurrentDirectory + "\\Updater.exe";
-
+            Cursor = Cursors.Default;
+            button1.Cursor = Cursors.Default;
             Close();
-            ProcessStartInfo startInfo = new ProcessStartInfo();
-            startInfo.Arguments = "1";
-            startInfo.FileName = updater;
-            Process.Start(startInfo);
+            Process.Start(updater, string.Format(" \"{0}\" {1}", "Baza Reklam", ZIP_URL));
         }
-
-        private void Extract(string zipFileName, string destinationPath)
-        {
-            Shell32.ShellClass sc = new Shell32.ShellClass();
-            Shell32.Folder SrcFlder = sc.NameSpace(zipFileName);
-            Shell32.Folder DestFlder = sc.NameSpace(destinationPath);
-            Shell32.FolderItems items = SrcFlder.Items();
-            DestFlder.CopyHere(items, 20);        
-        }
-
-
     }
 }