[READ-ONLY] Mirror of https://github.com/jackmawer/BlueRoseClassic.
Minor fixes to the unpacker
Zack Casey
(Jan 25, 2016, 7:59 AM EST)
3a2bca7a
eeebd802
+42
-18
+28
BlueRoseWinForms/BlueRoseWinForms.csproj
+28
BlueRoseWinForms/BlueRoseWinForms.csproj
···
12
12
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13
13
<FileAlignment>512</FileAlignment>
14
14
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15
+
<PublishUrl>publish\</PublishUrl>
16
+
<Install>true</Install>
17
+
<InstallFrom>Disk</InstallFrom>
18
+
<UpdateEnabled>false</UpdateEnabled>
19
+
<UpdateMode>Foreground</UpdateMode>
20
+
<UpdateInterval>7</UpdateInterval>
21
+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
22
+
<UpdatePeriodically>false</UpdatePeriodically>
23
+
<UpdateRequired>false</UpdateRequired>
24
+
<MapFileExtensions>true</MapFileExtensions>
25
+
<ApplicationRevision>0</ApplicationRevision>
26
+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
27
+
<IsWebBootstrapper>false</IsWebBootstrapper>
28
+
<UseApplicationTrust>false</UseApplicationTrust>
29
+
<BootstrapperEnabled>true</BootstrapperEnabled>
15
30
</PropertyGroup>
16
31
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17
32
<PlatformTarget>AnyCPU</PlatformTarget>
···
31
46
<DefineConstants>TRACE</DefineConstants>
32
47
<ErrorReport>prompt</ErrorReport>
33
48
<WarningLevel>4</WarningLevel>
49
+
<Prefer32Bit>true</Prefer32Bit>
34
50
</PropertyGroup>
35
51
<PropertyGroup>
36
52
<ApplicationIcon>FreeSO.ico</ApplicationIcon>
···
101
117
<ItemGroup>
102
118
<Content Include="FreeSO.ico" />
103
119
<Content Include="Generic.ico" />
120
+
</ItemGroup>
121
+
<ItemGroup>
122
+
<BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
123
+
<Visible>False</Visible>
124
+
<ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
125
+
<Install>true</Install>
126
+
</BootstrapperPackage>
127
+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
128
+
<Visible>False</Visible>
129
+
<ProductName>.NET Framework 3.5 SP1</ProductName>
130
+
<Install>false</Install>
131
+
</BootstrapperPackage>
104
132
</ItemGroup>
105
133
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
106
134
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+12
-16
BlueRoseWinForms/Form1.cs
+12
-16
BlueRoseWinForms/Form1.cs
···
4
4
using System.Windows.Forms;
5
5
using Ionic.Zip;
6
6
using System.Text.RegularExpressions;
7
+
using System.Threading;
7
8
8
9
namespace BlueRoseWinForms
9
10
{
···
95
96
void clientDownFileCompleted(object sender, AsyncCompletedEventArgs e)
96
97
{
97
98
98
-
btnUpdate.Text = "Update";
99
-
btnUpdate.Enabled = true;
100
-
101
99
// http://www.codeproject.com/Articles/11556/Converting-Wildcards-to-Regexes
102
100
// ---------------------------------------------------
103
101
···
107
105
// Get a list of files in the My Documents folder
108
106
string[] files = System.IO.Directory.GetFiles(Environment.CurrentDirectory);
109
107
110
-
foreach(string file in files)
108
+
foreach (string file in files)
111
109
{
112
110
if (wildZip.IsMatch(file))
113
111
{
···
117
115
{
118
116
foreach (ZipEntry ex in zip)
119
117
{
120
-
121
118
btnUpdate.Text = "Unpacking";
122
119
ex.Extract(Environment.CurrentDirectory, ExtractExistingFileAction.OverwriteSilently);
120
+
}
123
121
124
-
foreach(var allFiles in files)
125
-
{
126
-
if(wildCard.IsMatch(allFiles))
127
-
{
128
-
devBtn.Enabled = true;
129
-
playBtn.Enabled = true;
130
-
btnUpdate.Text = "Update";
131
-
btnUpdate.Enabled = true;
132
-
}
133
-
}
134
-
}
122
+
devBtn.Enabled = true;
123
+
playBtn.Enabled = true;
124
+
btnUpdate.Text = "Update";
125
+
btnUpdate.Enabled = true;
135
126
}
136
127
}
137
128
catch (Exception ex)
···
142
133
}
143
134
144
135
// ---------------------------------------------------
136
+
137
+
devBtn.Enabled = true;
138
+
playBtn.Enabled = true;
139
+
btnUpdate.Text = "Update";
140
+
btnUpdate.Enabled = true;
145
141
146
142
BlueRose.garbageCollection();
147
143
+2
-2
Installer.nsi
+2
-2
Installer.nsi
···
16
16
File "BlueRoseWinForms\bin\Release\BlueRoseLauncher.exe"
17
17
File "BlueRoseWinForms\bin\Release\BlueRoseLauncher.exe.config"
18
18
File "BlueRoseWinForms\bin\Release\BlueRoseLauncher.pdb"
19
-
File "BlueRoseWinForms\bin\Debug\Ionic.Zip.dll"
20
-
File "BlueRoseWinForms\bin\Debug\Ionic.Zip.xml"
19
+
File "BlueRoseWinForms\bin\Release\Ionic.Zip.dll"
20
+
File "BlueRoseWinForms\bin\Release\Ionic.Zip.xml"
21
21
22
22
# create the uninstaller
23
23
WriteUninstaller "$INSTDIR\Uninstall BlueRoseLauncher.exe"