diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index c87a98b..0c360f3 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -586,8 +586,8 @@
PreserveNewest
-
-
+
+
diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs
index 395dec4..2dfb3b9 100644
--- a/Filtration/Properties/AssemblyInfo.cs
+++ b/Filtration/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersion("1.0.0-beta2")]
[assembly: InternalsVisibleTo("Filtration.Tests")]
[assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")]
diff --git a/Filtration/Properties/Resources.Designer.cs b/Filtration/Properties/Resources.Designer.cs
index e581ae9..94cfe04 100644
--- a/Filtration/Properties/Resources.Designer.cs
+++ b/Filtration/Properties/Resources.Designer.cs
@@ -224,6 +224,93 @@ namespace Filtration.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to A Mother's Parting Gift
+ ///Abandoned Wealth
+ ///Aberrant Fossil
+ ///Abyssal Axe
+ ///Abyssal Cry
+ ///Abyssal Sceptre
+ ///Academy Map
+ ///Acid Lakes Map
+ ///Added Chaos Damage Support
+ ///Added Cold Damage Support
+ ///Added Fire Damage Support
+ ///Added Lightning Damage Support
+ ///Additional Accuracy Support
+ ///Aetheric Fossil
+ ///Agate Amulet
+ ///Albino Rhoa Feather
+ ///Alchemy Shard
+ ///Alder Spiked Shield
+ ///Alira's Amulet
+ ///Alleyways Map
+ ///Allflame
+ ///Alloyed Spiked Shield
+ ///Alteration Shard
+ ///Amber Amulet
+ ///Ambush Boots
+ ///Ambush Leaguestone
+ ///Ambush Mitts
+ ///Ambus [rest of string was truncated]";.
+ ///
+ internal static string ItemBaseTypes {
+ get {
+ return ResourceManager.GetString("ItemBaseTypes", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Abyss Jewel
+ ///Active Skill Gems
+ ///Amulets
+ ///Axe
+ ///Belts
+ ///Body Armours
+ ///Boots
+ ///Bows
+ ///Claws
+ ///Currency
+ ///Daggers
+ ///Delve Socketable Currency
+ ///Divination Card
+ ///Fishing Rods
+ ///Flasks
+ ///Gems
+ ///Gloves
+ ///Helmets
+ ///Hybrid Flasks
+ ///Incursion Item
+ ///Jewel
+ ///Labyrinth Item
+ ///Labyrinth Map Item
+ ///Labyrinth Trinket
+ ///Large Relics
+ ///Leaguestone
+ ///Life Flasks
+ ///Mace
+ ///Mana Flasks
+ ///Map Fragments
+ ///Maps
+ ///Misc Map Items
+ ///One Hand Axes
+ ///One Hand Maces
+ ///One Hand Swords
+ ///Pantheon Soul
+ ///Piece
+ ///Quest Items
+ ///Quivers
+ ///Rings
+ ///Sceptres
+ ///Shields
+ ///Stackable [rest of string was truncated]";.
+ ///
+ internal static string ItemClasses {
+ get {
+ return ResourceManager.GetString("ItemClasses", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
///
diff --git a/Filtration/Properties/Resources.resx b/Filtration/Properties/Resources.resx
index 3d15941..801da09 100644
--- a/Filtration/Properties/Resources.resx
+++ b/Filtration/Properties/Resources.resx
@@ -202,4 +202,10 @@
..\Resources\AlertSounds\SH22Vaal.mp3;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ..\Resources\ItemBaseTypes.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
+
+
+ ..\Resources\ItemClasses.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
\ No newline at end of file
diff --git a/Filtration/Services/StaticDataService.cs b/Filtration/Services/StaticDataService.cs
index 0d9467d..8beb406 100644
--- a/Filtration/Services/StaticDataService.cs
+++ b/Filtration/Services/StaticDataService.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.IO;
using System.Linq;
-using Filtration.Common.Services;
using Filtration.Common.Utilities;
+using Filtration.Properties;
namespace Filtration.Services
{
@@ -15,11 +14,8 @@ namespace Filtration.Services
internal class StaticDataService : IStaticDataService
{
- private readonly IFileSystemService _fileSystemService;
-
- public StaticDataService(IFileSystemService fileSystemService)
+ public StaticDataService()
{
- _fileSystemService = fileSystemService;
PopulateStaticData();
}
@@ -29,32 +25,8 @@ namespace Filtration.Services
private void PopulateStaticData()
{
- var itemBaseTypesPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\Filtration\ItemBaseTypes.txt";
- var itemClassesPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\Filtration\ItemClasses.txt";
-
- string itemBaseTypes;
- try
- {
- itemBaseTypes = _fileSystemService.ReadFileAsString(itemBaseTypesPath);
- }
- catch (Exception)
- {
- itemBaseTypes = string.Empty;
- }
-
- ItemBaseTypes = new LineReader(() => new StringReader(itemBaseTypes)).ToList();
-
- string itemClasses;
- try
- {
- itemClasses = _fileSystemService.ReadFileAsString(itemClassesPath);
- }
- catch (Exception)
- {
- itemClasses = string.Empty;
- }
-
- ItemClasses = new LineReader(() => new StringReader(itemClasses)).ToList();
+ ItemBaseTypes = new LineReader(() => new StringReader(Resources.ItemBaseTypes)).ToList();
+ ItemClasses = new LineReader(() => new StringReader(Resources.ItemClasses)).ToList();
}
}
}