Removed twitch extension code

Author: Zemill

Heroesprofile.Uploader.Common/ILiveProcessor.cs

@@ -6,17 +6,6 @@ namespace Heroesprofile.Uploader.Common
     public interface ILiveProcessor
     {
         bool PreMatchPage { get; set; }
-        bool TwitchExtension { get; set; }
-
-        string hpTwitchAPIKey { get; set; }
-        string hpAPIEmail { get; set; }
-        string twitchNickname { get; set; }
-        int hpAPIUserID { get; set; }
-
-
         Task StartProcessing(string battleLobbyPath);
-        Task UpdateData(string stormSavePath);
-
-        Task saveMissingTalentData(string stormReplayPath);
     }
 }

Heroesprofile.Uploader.Common/LiveProcessor.cs

@@ -39,14 +39,9 @@ public class Manager : INotifyPropertyChanged
         public event PropertyChangedEventHandler PropertyChanged;
 
 
-        public string hpTwitchAPIKey { get; set; }
-        public string hpAPIEmail { get; set; }
-        public string twitchNickname { get; set; }
-        public int hpAPIUserID { get; set; }
-
         public bool PreMatchPage { get; set; }
         public bool PostMatchPage { get; set; }
-        public bool TwitchExtension { get; set; }
+
 
         private string _status = "";
 
@@ -109,24 +104,11 @@ public async void Start(IMonitor monitor, ILiveMonitor live_monitor, IAnalyzer a
 
             _monitor.ReplayAdded += async (_, e) => {
                 await EnsureFileAvailable(e.Data);
-                if (PreMatchPage || TwitchExtension) {
-
-                 
-                    if (TwitchExtension) {
-                        await EnsureFileAvailable(e.Data);
-                        var tmpPath = Path.GetTempFileName();
-                        await SafeCopy(e.Data, tmpPath, true);
-                        await _liveProcessor.saveMissingTalentData(tmpPath);
-                    }
+                if (PreMatchPage) {
 
                     _live_monitor.StopBattleLobbyWatcher();
                     _live_monitor.StopStormSaveWatcher();
-
                     _live_monitor = new LiveMonitor();
-
-                    if (PreMatchPage || TwitchExtension) {
-                        StartBattleLobbyWatcherEvent();
-                    }
                 }
 
                 var replay = new ReplayFile(e.Data);
@@ -146,42 +128,25 @@ public async void Start(IMonitor monitor, ILiveMonitor live_monitor, IAnalyzer a
         }
         private void StartBattleLobbyWatcherEvent()
         {
-            if (PreMatchPage || TwitchExtension) {
+            if (PreMatchPage) {
                 _live_monitor.TempBattleLobbyCreated += async (_, e) => {
 
                     _live_monitor.StopBattleLobbyWatcher();
-                    _liveProcessor = new LiveProcessor(PreMatchPage, TwitchExtension, hpTwitchAPIKey, hpAPIEmail, twitchNickname, hpAPIUserID);
+                    _liveProcessor = new LiveProcessor(PreMatchPage);
 
                     await EnsureFileAvailable(e.Data);
                     var tmpPath = Path.GetTempFileName();
                     await SafeCopy(e.Data, tmpPath, true);
                     await _liveProcessor.StartProcessing(tmpPath);
 
 
-                    if (TwitchExtension) {
-                        StartStormSaveWatcherEvent();
-                    }
 
                 };
 
                 _live_monitor.StartBattleLobby();
             }
         }
 
-        private void StartStormSaveWatcherEvent()
-        {
-            if (TwitchExtension) {
-                _live_monitor.StormSaveCreated += async (_, e) => {
-                    Thread.Sleep(1000);
-                    await EnsureFileAvailable(e.Data);
-                    var tmpPath = Path.GetTempFileName();
-                    await SafeCopy(e.Data, tmpPath, true);
-                    await _liveProcessor.UpdateData(tmpPath);
-                };
-                _live_monitor.StartStormSave();
-            }
-        }
-
         public void Stop()
         {
             _monitor.Stop();

Heroesprofile.Uploader.Common/Manager.cs

@@ -114,11 +114,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
 
             Manager.PreMatchPage = Settings.PreMatchPage;
             Manager.PostMatchPage = Settings.PostMatchPage;
-            Manager.TwitchExtension = Settings.HPTwitchExtension;
-            Manager.hpTwitchAPIKey = Settings.HPKey;
-            Manager.hpAPIEmail = Settings.HPAPIEmail;
-            Manager.twitchNickname = Settings.TwitchNickname;
-            Manager.hpAPIUserID = Settings.HPAPIUserID;
+    
             Manager.DeleteAfterUpload = Settings.DeleteAfterUpload;
 
             ApplyTheme(Settings.Theme);
@@ -140,7 +136,6 @@ private void Application_Startup(object sender, StartupEventArgs e)
                 }
 
                 if (ev.PropertyName == nameof(Settings.HPTwitchExtension)) {
-                    Manager.TwitchExtension = Settings.HPTwitchExtension;
                 }
             };
 
@@ -152,7 +147,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
                 mainWindow = new MainWindow();
                 mainWindow.Show();
             }
-            Manager.Start(new Monitor(), new LiveMonitor(), new Analyzer(), new Common.Uploader(), new LiveProcessor(Manager.PreMatchPage, Manager.TwitchExtension, Manager.hpTwitchAPIKey, Manager.hpAPIEmail, Manager.twitchNickname, Manager.hpAPIUserID));
+            Manager.Start(new Monitor(), new LiveMonitor(), new Analyzer(), new Common.Uploader(), new LiveProcessor(Manager.PreMatchPage));
 
 #pragma warning disable 162
             if (!NoSquirrel) {

Heroesprofile.Uploader.Windows/App.xaml.cs

@@ -22,12 +22,10 @@ public MainWindow()
 
         private void Twitch_Extension_Checkbox_Checked(object sender, RoutedEventArgs e)
         {
-            App.Manager.TwitchExtension = true;
         }
 
         private void Twitch_Extension_Checkbox_Unchecked(object sender, RoutedEventArgs e)
         {
-            App.Manager.TwitchExtension = false;
         }
 
         private void Window_StateChanged(object sender, EventArgs e)

Heroesprofile.Uploader.Windows/MainWindow.xaml.cs

@@ -35,13 +35,6 @@ public static void Main(string[] args)
                 Directory.CreateDirectory(App.SettingsDir);
             }
 
-            // Move files from old locations
-            if (File.Exists($@"{App.AppDir}\..\replays_v4.xml") && !File.Exists($@"{App.SettingsDir}\replays_v4.xml")) {
-                File.Move($@"{App.AppDir}\..\replays.replays_v4", $@"{App.SettingsDir}\replays_v4.xml");
-            }
-            if (File.Exists($@"{App.AppDir}\..\last.config") && !File.Exists($@"{App.SettingsDir}\last.config")) {
-                File.Move($@"{App.AppDir}\..\last.config", $@"{App.SettingsDir}\last.config");
-            }
 
             SingleInstanceManager manager = new SingleInstanceManager();
             manager.Run(args);

Heroesprofile.Uploader.Windows/Program.cs

@@ -52,6 +52,6 @@
 // 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("2.0.9")]
-[assembly: AssemblyFileVersion("2.0.9")]
+[assembly: AssemblyVersion("2.1.0")]
+[assembly: AssemblyFileVersion("2.1.0")]
 [assembly: AssemblyInformationalVersion("1.0.0")]

Heroesprofile.Uploader.Windows/Properties/AssemblyInfo.cs

@@ -19,7 +19,6 @@ namespace Heroesprofile.Uploader.Windows
     /// </summary>
     public partial class SettingsWindow : Window
     {
-        private bool showHideButton = true;
         public SettingsWindow()
         {
             InitializeComponent();