Skip to content

Commit

Permalink
Fixed configuration to use the current executing assembly (#127)
Browse files Browse the repository at this point in the history
* Refactored to an Proxy interface to address #47

* Added remaining EventsSent to ConfigurationManager

* Attempting to eliminate memory leak

* Adding script to test the Plugin template

* WIP

* Updated to be more cross-platform friendly

* Re-added cheer graffiti

* Cleaning up the inner-loop build-debug-process

* Addressed logger and memory leak issues #73 #114

* Added a default configuration builder #34

 Addressed logger and memory leak issues #73 #114  (#117)

* Refactored to an Proxy interface to address #47

* Added remaining EventsSent to ConfigurationManager

* Attempting to eliminate memory leak

* Adding script to test the Plugin template

* WIP

* Updated to be more cross-platform friendly

* Re-added cheer graffiti

* Cleaning up the inner-loop build-debug-process

* Addressed logger and memory leak issues #73 #114

* Fixed some tests, added UUID constructor for #119

* Added a 'RegisterAllActions' feature to the ConnectionManager

* Updated to properly configure current folder
  • Loading branch information
csharpfritz authored Feb 20, 2019
1 parent c13dc31 commit d90d9bb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/StreamDeckLib.Config/ConfigurationBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private ConfigurationBuilder(string[] args) {

public static ConfigurationBuilder BuildDefaultConfiguration(string[] args) {

var dir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
var dir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
Directory.SetCurrentDirectory(dir);

var configuration = new CONFIG.ConfigurationBuilder()
Expand Down
4 changes: 4 additions & 0 deletions src/StreamDeckLib/ConnectionManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Newtonsoft.Json;
using StreamDeckLib.Messages;
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net.WebSockets;
Expand Down Expand Up @@ -231,6 +232,9 @@ public async Task SetTitleAsync(string context, string newTitle)
public async Task SetImageAsync(string context, string imageLocation)
{

Debug.WriteLine($"Getting Image from {new FileInfo(imageLocation).FullName} on disk");
_Logger.LogDebug($"Getting Image from {new FileInfo(imageLocation).FullName} on disk");

var imgString = Convert.ToBase64String(File.ReadAllBytes(imageLocation), Base64FormattingOptions.None);

var args = new SetImageArgs
Expand Down

0 comments on commit d90d9bb

Please sign in to comment.