/// </summary>\r
Dictionary<string, object> appArgs;\r
\r
- string[] restAppArgs;\r
- \r
public Program()\r
{\r
appArgs = new Dictionary<string, object>();\r
appArgs["cmd"] = string.Empty;\r
appArgs["pkgsref"] = string.Empty;\r
appArgs["instsref"] = string.Empty;\r
- \r
- form = new PackageListViewForm();\r
}\r
\r
void RunNormal()\r
{\r
+ form = new PackageListViewForm();\r
form.Load += delegate(object sender, EventArgs e) {\r
hideSplashScreen();\r
form.updateActionInvoke(((bool)appArgs["noupdate"]) != true);\r
try {\r
NaGet.Packages.Install.Installation[] insts = NaGet.Utils.GetDeserializedObject<NaGet.Packages.Install.Installation[]>((string) appArgs["instsref"]);\r
\r
+ form = new PackageListViewForm();\r
+ form.UpdatePackageList();\r
hideSplashScreen();\r
form.installActionInvoke(insts);\r
} catch (UnauthorizedAccessException e) {\r
try {\r
NaGet.Packages.Install.InstalledPackage[] pkgs = NaGet.Utils.GetDeserializedObject<NaGet.Packages.Install.InstalledPackage[]>((string) appArgs["pkgsref"]);\r
\r
+ form = new PackageListViewForm();\r
+ form.UpdatePackageList();\r
hideSplashScreen();\r
form.uninstallActionInvoke(pkgs);\r
} catch (UnauthorizedAccessException e) {\r
\r
void RunUpdateAppliStation()\r
{\r
+ if ( splashScreen == null ) {\r
+ splashScreen = createAndOpenSplashScreen();\r
+ }\r
+ \r
System.Threading.Thread.Sleep(5000); /* 5sec待って呼び出しもとの終了を待つ */\r
\r
string newAppliStationDir = Application.StartupPath;\r
string targetDir = Environment.CurrentDirectory;\r
+ \r
foreach (string file in Directory.GetFiles(newAppliStationDir)) {\r
string ext = Path.GetExtension(file).ToLower();\r
if ((ext == ".exe") || (ext == ".dll") ||\r
(ext == ".pdb") || (ext == ".png")) {\r
- File.Copy(file, Path.Combine(targetDir, Path.GetFileName(file)), true);\r
+ while (true) { /* loop for retry */\r
+ try { \r
+ File.Copy(file, Path.Combine(targetDir, Path.GetFileName(file)), true);\r
+ break;\r
+ } catch (IOException ex) {\r
+ DialogResult result = MessageBox.Show(string.Format("AppliStationの更新に失敗しました。\r\n\r\n{0}", ex.Message),\r
+ "AppliStation", MessageBoxButtons.RetryCancel, MessageBoxIcon.Error);\r
+ if (result == DialogResult.Retry) {\r
+ continue; /* retry */\r
+ } else {\r
+ MessageBox.Show("AppliStationの更新は中断されました。", "AppliStation", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+ hideSplashScreen();\r
+ return;\r
+ }\r
+ }\r
+ }\r
}\r
}\r
-MessageBox.Show("Installation is completed.");\r
System.Threading.Thread.Sleep(10);\r
System.Diagnostics.Process.Start(Path.Combine(targetDir, Path.GetFileName(Application.ExecutablePath)));\r
hideSplashScreen();\r
}\r
\r
/// <summary>\r
- /// AppliStationの自己更新を行う。アーカイブインストーラによってあらかじめインストールされたファイルを、\r
+ /// AppliStationã\81®è\87ªå·±æ\9b´æ\96°ã\82\92è¡\8cã\81\86ã\80\82ã\82¢ã\83¼ã\82«ã\82¤ã\83\96ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83©ã\83¼ã\81«ã\82\88ã\81£ã\81¦ã\81\82ã\82\89ã\81\8bã\81\98ã\82\81ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\95ã\82\8cã\81\9fã\83\95ã\82¡ã\82¤ã\83«ã\82\92ã\80\81\r
/// カレントディレクトリにコピーするよう新しいAppliStation.exeを呼ぶ。\r
/// コピー元がないまたはそれが新しくないならば何もしない。\r
/// </summary>\r
\r
if (Directory.Exists(newAppliStationDir)) {\r
string newAppliStation = Path.Combine(newAppliStationDir, Path.GetFileName(thisAppliStation));\r
- \r
-MessageBox.Show(string.Format("{0}\r\n{1}", newAppliStation, File.Exists(newAppliStation)));\r
-MessageBox.Show(string.Format("{0}\r\n{1}", File.GetLastWriteTime(thisAppliStation), File.GetLastWriteTime(newAppliStation)));\r
-MessageBox.Show(string.Format("{0}", File.GetLastWriteTime(thisAppliStation) < File.GetLastWriteTime(newAppliStation)));\r
- \r
+ \r
if ( File.Exists(newAppliStation) &&\r
- (File.GetLastWriteTime(thisAppliStation) < File.GetLastWriteTime(newAppliStation)) ) {\r
-\r
+ (File.GetLastWriteTime(thisAppliStation) != File.GetLastWriteTime(newAppliStation)) ) {\r
+ \r
System.Diagnostics.Process.Start(newAppliStation, "--cmd=updateAppliStation");\r
return true;\r
}\r
private void parseArgs(string[] args)\r
{\r
NaGet.ArgParser parser = new NaGet.ArgParser(appArgs);\r
- restAppArgs = parser.Parse(args);\r
+ string[] restAppArgs = parser.Parse(args);\r
+ }\r
+ \r
+ private static Form createAndOpenSplashScreen()\r
+ {\r
+ System.Drawing.Bitmap bitmap;\r
+ \r
+ bitmap = new System.Drawing.Bitmap(Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "SplashScreen.png"));\r
+ Form splashScreen = AppliStation.Util.SprashScreenLayered.CreateSprashScreenLayered(bitmap, System.Drawing.Color.Black);\r
+ \r
+ splashScreen.Text = "AppliStation";\r
+ splashScreen.Icon = System.Drawing.Icon.ExtractAssociatedIcon(Application.ExecutablePath);\r
+ splashScreen.Show();\r
+ \r
+ return splashScreen;\r
}\r
\r
[STAThread]\r
\r
try {\r
if (args.Length <= 0) { // HACK 引数パースの時間さえ待てないので引数の有無で表示を判断\r
- splashScreen = new Form();\r
- splashScreen.FormBorderStyle = FormBorderStyle.None;\r
- splashScreen.BackgroundImage = System.Drawing.Bitmap.FromFile(Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), "SplashScreen.png"));\r
- splashScreen.Size = splashScreen.BackgroundImage.Size;\r
- splashScreen.ShowIcon = false;\r
- splashScreen.ShowInTaskbar = false;\r
- splashScreen.StartPosition = FormStartPosition.CenterScreen;\r
- splashScreen.Show();\r
+ splashScreen = createAndOpenSplashScreen();\r
}\r
\r
// アーカイブSYSTEM32をパスに足す\r
ToolStripManager.VisualStylesEnabled = false; // ToolStripがLunaで青くならないように\r
Application.EnableVisualStyles(); // LunaやVistaのデザインを有効に\r
\r
- Application.ThreadException += AppliStation.Util.ExceptionDialogForm.Application_ThrowException;\r
- System.Threading.Thread.GetDomain().UnhandledException += AppliStation.Util.ExceptionDialogForm.Application_ThrowException;\r
+ // デバッガがアタッチしていないなら、Exceptionを自力でハンドルする\r
+ if (! System.Diagnostics.Debugger.IsAttached) {\r
+ Application.ThreadException += AppliStation.Util.ExceptionDialogForm.Application_ThrowException;\r
+ System.Threading.Thread.GetDomain().UnhandledException += AppliStation.Util.ExceptionDialogForm.Application_ThrowException;\r
+ }\r
\r
Program prog = new Program();\r
prog.splashScreen = splashScreen;\r
OSDN Git Service
