Merge pull request #28 from Denifia/develop

fixes and version bump
Denifia · Apr 29, 2017 · e325cba · e325cba
2 parents c3c03f6 + 5daca82
commit e325cba
Show file tree

Hide file tree

Showing 16 changed files with 138 additions and 69 deletions.
diff --git a/SendItems/Domain/BasePerson.cs b/SendItems/Domain/BasePerson.cs
@@ -0,0 +1,43 @@
+using System;
+
+namespace Denifia.Stardew.SendItems.Domain
+{
+    public class BasePerson : IEquatable<BasePerson>
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public string FarmName { get; set; }
+
+        public string DisplayText
+        {
+            get
+            {
+                return $"{Name} ({FarmName} Farm)";
+            }
+        }
+
+        public string ConsoleSafeName
+        {
+            get { return MakeConsoleSave(Name); }
+        }
+
+        public string ConsoleSaveFarmName
+        {
+            get { return MakeConsoleSave(FarmName); }
+        }
+
+        private string MakeConsoleSave(string text)
+        {
+            if (text.Contains(" "))
+            {
+                text = $"\"{text}\"";
+            }
+            return text;
+        }
+
+        public bool Equals(BasePerson other)
+        {
+            return Id == other.Id;
+        }
+    }
+}
diff --git a/SendItems/Domain/Farmer.cs b/SendItems/Domain/Farmer.cs
@@ -2,24 +2,13 @@
 
 namespace Denifia.Stardew.SendItems.Domain
 {
-    public class Farmer
+    public class Farmer : BasePerson
     {
-        public string Id { get; set; }
-        public string Name { get; set; }
-        public string FarmName { get; set; }
         public List<Friend> Friends { get; set; }
 
         public Farmer()
         {
             Friends = new List<Friend>();
         }
-
-        public string DisplayText
-        {
-            get
-            {
-                return $"{Name} ({FarmName} Farm)";
-            }
-        }
     }
 }
diff --git a/SendItems/Domain/Friend.cs b/SendItems/Domain/Friend.cs
@@ -2,23 +2,8 @@
 
 namespace Denifia.Stardew.SendItems.Domain
 {
-    public class Friend : IEquatable<Friend>
+    public class Friend : BasePerson
     {
-        public string Id { get; set; }
-        public string Name { get; set; }
-        public string FarmName { get; set; }
 
-        public string DisplayText
-        {
-            get
-            {
-                return $"{Name} ({FarmName} Farm)";
-            }
-        }
-
-        public bool Equals(Friend other)
-        {
-            return Id == other.Id;
-        }
     }
 }
diff --git a/SendItems/Properties/AssemblyInfo.cs b/SendItems/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.0.0")]
-[assembly: AssemblyFileVersion("0.2.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
diff --git a/SendItems/SendItems.cs b/SendItems/SendItems.cs
@@ -38,28 +38,16 @@ public override void Entry(IModHelper helper)
             Repository.Instance.Init(_container.Resolve<IConfigurationService>());
 
             // Instance classes that do their own thing
+            _container.Resolve<IFarmerService>();
             _container.Resolve<VersionCheckService>();
             _container.Resolve<ICommandService>();
             _container.Resolve<IPostboxService>();
             _container.Resolve<ILetterboxService>();
+            _container.Resolve<IPostboxInteractionDetector>();
+            _container.Resolve<ILetterboxInteractionDetector>();
+            _container.Resolve<IMailDeliveryService>();
+            _container.Resolve<IMailCleanupService>();
             _container.Resolve<IMailScheduleService>();
-
-            // Instance classes to be used later
-            _farmerService = _container.Resolve<IFarmerService>();
-            _postboxInteractionDetector = _container.Resolve<IPostboxInteractionDetector>();
-            _letterboxInteractionDetector = _container.Resolve<ILetterboxInteractionDetector>();
-            _mailDeliveryService = _container.Resolve<IMailDeliveryService>();
-            _mailCleanupService = _container.Resolve<IMailCleanupService>();
-
-            SaveEvents.AfterLoad += AfterSavedGameLoad;
-        }
-
-        private void AfterSavedGameLoad(object sender, EventArgs e)
-        {
-            _postboxInteractionDetector.Init();
-            _letterboxInteractionDetector.Init();
-
-            SaveEvents.AfterLoad -= AfterSavedGameLoad;
         }
     }
 }
diff --git a/SendItems/SendItems.csproj b/SendItems/SendItems.csproj
@@ -56,6 +56,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Domain\BasePerson.cs" />
     <Compile Include="Domain\Farmer.cs" />
     <Compile Include="Domain\Friend.cs" />
     <Compile Include="Domain\GameDateTime.cs" />

diff --git a/SendItems/Services/CommandService.cs b/SendItems/Services/CommandService.cs
@@ -38,7 +38,13 @@ public CommandService(
             RegisterCommands();
 
             SaveEvents.AfterLoad += AfterSavedGameLoad;
-        }        
+            SaveEvents.AfterReturnToTitle += AfterReturnToTitle;
+        }
+
+        private void AfterReturnToTitle(object sender, EventArgs e)
+        {
+            _savedGameLoaded = false;
+        }
 
         private void RegisterCommands()
         {
@@ -91,7 +97,7 @@ private void HandleCommand(string command, string[] args)
         private void ShowMyDetails(string[] args)
         {
             _mod.Monitor.Log("This is your \"friend command\". Get your friends to run this command in the SMAPI console to add you as a friend. Each farmer (saved game) has it's own list of friends.", LogLevel.Info);
-            _mod.Monitor.Log($"{_addFriendCommand} {_farmerService.CurrentFarmer.Id} {_farmerService.CurrentFarmer.Name} {_farmerService.CurrentFarmer.FarmName}", LogLevel.Info);
+            _mod.Monitor.Log($"{_addFriendCommand} {_farmerService.CurrentFarmer.Id} {_farmerService.CurrentFarmer.ConsoleSafeName} {_farmerService.CurrentFarmer.ConsoleSaveFarmName}", LogLevel.Info);
         }
 
         private void ListLocalFarmers(string[] args)
@@ -103,7 +109,7 @@ private void ListLocalFarmers(string[] args)
                 _mod.Monitor.Log("<id> <name> <farm name>", LogLevel.Info);
                 foreach (var farmer in farmers)
                 {
-                    _mod.Monitor.Log($"{farmer.Id} {farmer.Name} {farmer.FarmName}", LogLevel.Info);
+                    _mod.Monitor.Log($"{farmer.Id} {farmer.ConsoleSafeName} {farmer.ConsoleSaveFarmName}", LogLevel.Info);
                 }
             }
             else
@@ -228,7 +234,7 @@ private void AfterSavedGameLoad(object sender, EventArgs e)
         {
             _savedGameLoaded = true;
             _mod.Monitor.Log($"This is your \"friend command\". Get your friends to run this command in the SMAPI console to add you as a friend...", LogLevel.Info);
-            _mod.Monitor.Log($"{_addFriendCommand} {_farmerService.CurrentFarmer.Id} {_farmerService.CurrentFarmer.Name} {_farmerService.CurrentFarmer.FarmName}", LogLevel.Alert);
+            _mod.Monitor.Log($"{_addFriendCommand} {_farmerService.CurrentFarmer.Id} {_farmerService.CurrentFarmer.ConsoleSafeName} {_farmerService.CurrentFarmer.ConsoleSaveFarmName}", LogLevel.Alert);
             _mod.Monitor.Log($"They need to be using the Send Items mod too :)", LogLevel.Info);
         }
 

diff --git a/SendItems/Services/FarmerService.cs b/SendItems/Services/FarmerService.cs
@@ -2,6 +2,8 @@
 using Denifia.Stardew.SendItems.Domain;
 using StardewValley;
 using System.Linq;
+using StardewModdingAPI.Events;
+using System;
 
 namespace Denifia.Stardew.SendItems.Services
 {
@@ -33,13 +35,25 @@ public Domain.Farmer CurrentFarmer {
         public FarmerService(IConfigurationService configService)
         {
             _configService = configService;
+            SaveEvents.AfterReturnToTitle += AfterReturnToTitle;
+        }
+
+        private void AfterReturnToTitle(object sender, EventArgs e)
+        {
+            _currentFarmer = null;
         }
 
         public void LoadCurrentFarmer()
         {
             var saves = _configService.GetSavedGames();
             var save = saves.FirstOrDefault(x => x.Name == Game1.player.Name && x.FarmName == Game1.player.farmName);
-            if (save == null) throw new System.Exception("error loading current farmer");
+            if (save == null)
+            {
+                // Happens during a new game creation
+                return;
+                //throw new System.Exception("error loading current farmer");
+            }
+
 
             var newFarmer = new Domain.Farmer()
             {

diff --git a/SendItems/Services/LetterboxInteractionDetector.cs b/SendItems/Services/LetterboxInteractionDetector.cs
@@ -1,4 +1,5 @@
 using Denifia.Stardew.SendItems.Events;
+using Denifia.Stardew.SendItems.Framework;
 using StardewModdingAPI.Events;
 using StardewValley;
 using System;
@@ -9,7 +10,6 @@ namespace Denifia.Stardew.SendItems.Services
 {
     public interface ILetterboxInteractionDetector
     {
-        void Init();
     }
 
     /// <summary>
@@ -18,9 +18,26 @@ public interface ILetterboxInteractionDetector
     public class LetterboxInteractionDetector : ILetterboxInteractionDetector
     {
         private const string _locationOfLetterbox = "Farm";
-        private const string _playerMailKey = "playerMail";
 
-        public void Init()
+        public LetterboxInteractionDetector()
+        {
+            SaveEvents.AfterLoad += AfterSavedGameLoad;
+            SaveEvents.AfterReturnToTitle += AfterReturnToTitle;
+        }
+
+        private void AfterReturnToTitle(object sender, EventArgs e)
+        {
+            try
+            {
+                ControlEvents.MouseChanged -= MouseChanged;
+                LocationEvents.CurrentLocationChanged -= CurrentLocationChanged;
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        private void AfterSavedGameLoad(object sender, EventArgs e)
         {
             LocationEvents.CurrentLocationChanged += CurrentLocationChanged;
         }
@@ -57,7 +74,7 @@ private void MouseChanged(object sender, EventArgsMouseStateChanged e)
 
         private bool CanUseLetterbox()
         {
-            return Game1.mailbox != null && Game1.mailbox.Any() && Game1.mailbox.Peek() == _playerMailKey;
+            return Game1.mailbox != null && Game1.mailbox.Any() && Game1.mailbox.Peek() == ModConstants.PlayerMailKey;
         }
     }
 }
diff --git a/SendItems/Services/PostboxInteractionDetector.cs b/SendItems/Services/PostboxInteractionDetector.cs
@@ -9,7 +9,7 @@ namespace Denifia.Stardew.SendItems.Services
 {
     public interface IPostboxInteractionDetector
     {
-        void Init();
+
     }
 
     /// <summary>
@@ -19,7 +19,25 @@ public class PostboxInteractionDetector : IPostboxInteractionDetector
     {
         private const string locationOfPostbox = "Farm";
 
-        public void Init()
+        public PostboxInteractionDetector()
+        {
+            SaveEvents.AfterLoad += AfterSavedGameLoad;
+            SaveEvents.AfterReturnToTitle += AfterReturnToTitle;
+        }
+
+        private void AfterReturnToTitle(object sender, EventArgs e)
+        {
+            try
+            {
+                ControlEvents.MouseChanged -= MouseChanged;
+                LocationEvents.CurrentLocationChanged -= CurrentLocationChanged;
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        private void AfterSavedGameLoad(object sender, EventArgs e)
         {
             LocationEvents.CurrentLocationChanged += CurrentLocationChanged;
         }

diff --git a/SendItems/config.json b/SendItems/config.json
@@ -1,4 +1,4 @@
 {
   "ApiUrl": "http://localhost:5000/api",
-  "Debug": true
+  "Debug": false
 }
diff --git a/SendItems/manifest.json b/SendItems/manifest.json
@@ -2,13 +2,13 @@
   "Name": "Send Items",
   "Author": "Denifia",
   "Version": {
-    "MajorVersion": 0,
-    "MinorVersion": 2,
-    "PatchVersion": 0,
-    "Build": null
+    "MajorVersion": 1,
+    "MinorVersion": 0,
+    "PatchVersion": 1,
+    "Build": "beta"
   },
   "MinimumApiVersion": "1.10",
-  "Description": "Send items to your other farms (saved games) and online friends",
+  "Description": "Send items to other farmer (saved games and online friends).",
   "UniqueID": "Denifia.SendItems",
   "EntryDll": "Denifia.Stardew.SendItems.dll"
 }
diff --git a/SendItems/release-notes.md b/SendItems/release-notes.md
@@ -1,7 +1,12 @@
 [← back to readme](readme.md)
 
 # Release notes
-## 0.2.0
+## 1.0.1-Beta
+* Fixed bug with returning to tile screen
+* Fixed bug with friend command extra spaces (issue #27)
+* Bumped version because of bad release
+
+## 1.0-Beta
 * **Renamed project from "SendLetters" to "Send Items" for clarity**
 * Moved local storage into LiteDb (stores data as binary json in the \Mods\SendItems directory)
 * Made all web requests run in the background so they don't interfere with the game

diff --git a/SendItemsApi/SendItemsApi.csproj b/SendItemsApi/SendItemsApi.csproj
@@ -5,7 +5,7 @@
     <PackageTargetFallback>portable-net45+win8</PackageTargetFallback>
     <AssemblyName>Denifia.Stardew.SendItemsApi</AssemblyName>
     <RootNamespace>Denifia.Stardew.SendItemsApi</RootNamespace>
-    <Version>0.2.0</Version>
+    <Version>1.0.1</Version>
     <Description>Web Api for the Send Items mod for Stardew Valley</Description>
     <Authors>Denifia</Authors>
     <Company>Denifia</Company>

diff --git a/SendItemsApi/release-notes.md b/SendItemsApi/release-notes.md
@@ -1,14 +1,17 @@
 [← back to readme](readme.md)
 
 # Release notes
-## 0.2.0
+## 1.0.1
+* Bumped version because of bad release
+
+## 1.0-Beta
 * All code is now async for performance
 * Moved from LiteDb to Azure Table Storage
 * Changed mail endpoint paths, names and parameters to be more clear
 * Creating mail on the server has changed verbs from POST to PUT
 * Added a /api/mail/count endpoint to check how much mail is on the server
 * Added a /api/health endpoint that just returns true
 
-## Prior to 0.2.0
+## Prior to 1.0-Beta
 * Intital cut of api
 * No release notes available
diff --git a/latest-versions.json b/latest-versions.json
@@ -1,5 +1,5 @@
 {
   "schema": 1.0,
-  "Send Items": "0.2.0",
+  "Send Items": "1.0.1",
   "Purchase Recipes": "0.1.0"
 }