Skip to content

Commit 2a4683b

Browse files
committed
Spore ModAPI Easy Installer: simplify EasyInstaller.GetFileType()
1 parent 26edee1 commit 2a4683b

File tree

1 file changed

+7
-23
lines changed

1 file changed

+7
-23
lines changed

Spore ModAPI Easy Installer/EasyInstaller.cs

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -184,38 +184,22 @@ static string[] ShowFileChooser(FileChooserType type, string title, string filte
184184

185185
static FileType GetFileType(string fileName)
186186
{
187-
if (fileName == null) return FileType.None;
188-
189-
if (fileName.ToLowerInvariant().EndsWith(".package"))
187+
if (String.IsNullOrEmpty(fileName))
190188
{
191-
// check if it's Spore or GA
192-
string[] splits;
193-
if (fileName.Contains('\\'))
194-
{
195-
splits = fileName.Split('\\');
196-
}
197-
else
198-
{
199-
splits = fileName.Split('/');
200-
}
189+
return FileType.None;
190+
}
201191

202-
if (splits.Length > 1)
203-
{
204-
// check the folder that contains the file
205-
if (splits[splits.Length - 2].ToUpper() == "SPORE")
206-
{
207-
return FileType.Spore_Package;
208-
}
209-
}
192+
fileName = fileName.ToLowerInvariant();
210193

211-
// default to GA Data
194+
if (fileName.EndsWith(".package"))
195+
{
212196
return FileType.Package;
213197
}
214198
else if (fileName.EndsWith(".dll"))
215199
{
216200
return FileType.DLL;
217201
}
218-
else if (fileName.ToLowerInvariant().EndsWith(".sporemod"))
202+
else if (fileName.EndsWith(".sporemod"))
219203
{
220204
return FileType.SporeMod;
221205
}

0 commit comments

Comments
 (0)