Release 1.5

Closes #75

.gitignore

@@ -21,6 +21,7 @@ x86/
 [Oo]bj/
 bld/*
 !bld/gen_full.iss
+!bld/gen_port.iss
 !bld/gen_upd.iss
 !bld/Resources
 

Configuration/LockManager.cs

@@ -58,7 +58,7 @@ namespace TweetDck.Configuration{
                     Process foundProcess = Process.GetProcessById(pid);
 
                     using(Process currentProcess = Process.GetCurrentProcess()){
-                        if (foundProcess.ProcessName == currentProcess.ProcessName){
+                        if (foundProcess.ProcessName == currentProcess.ProcessName || foundProcess.MainWindowTitle == Program.BrandName){
                             LockingProcess = foundProcess;
                         }
                     }

Core/Controls/ControlExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using TweetDck.Core.Utils;
 
 namespace TweetDck.Core.Controls{
     static class ControlExtensions{
@@ -35,6 +36,12 @@ namespace TweetDck.Core.Controls{
             }
         }
 
+        public static void SetElevated(this Button button){
+            button.Text = " "+button.Text;
+            button.FlatStyle = FlatStyle.System;
+            NativeMethods.SendMessage(button.Handle, NativeMethods.BCM_SETSHIELD, 0, new IntPtr(1));
+        }
+
         public static void EnableMultilineShortcuts(this TextBox textBox){
             textBox.KeyDown += (sender, args) => {
                 if (args.Control && args.KeyCode == Keys.A){

Core/FormBrowser.cs

@@ -8,8 +8,10 @@ using TweetDck.Core.Other;
 using TweetDck.Resources;
 using TweetDck.Core.Controls;
 using System.Drawing;
+using TweetDck.Core.Utils;
 using TweetDck.Updates;
 using TweetDck.Plugins;
+using TweetDck.Plugins.Enums;
 using TweetDck.Plugins.Events;
 
 namespace TweetDck.Core{
@@ -52,6 +54,10 @@ namespace TweetDck.Core{
                 LifeSpanHandler = new LifeSpanHandler()
             };
 
+            #if DEBUG
+            this.browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
+            #endif
+
             this.browser.LoadingStateChanged += Browser_LoadingStateChanged;
             this.browser.FrameLoadEnd += Browser_FrameLoadEnd;
             this.browser.RegisterJsObject("$TD", new TweetDeckBridge(this, notification));
@@ -113,7 +119,7 @@ namespace TweetDck.Core{
         }
 
         private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            if (e.Frame.IsMain){
+            if (e.Frame.IsMain && BrowserUtils.IsTweetDeckWebsite(e.Frame)){
                 ScriptLoader.ExecuteFile(e.Frame, "code.js");
 
                 if (plugins.HasAnyPlugin(PluginEnvironment.Browser)){

Core/FormNotification.cs

@@ -9,6 +9,7 @@ using TweetDck.Core.Handling;
 using TweetDck.Resources;
 using TweetDck.Core.Utils;
 using TweetDck.Plugins;
+using TweetDck.Plugins.Enums;
 
 namespace TweetDck.Core{
     sealed partial class FormNotification : Form{
@@ -62,6 +63,7 @@ namespace TweetDck.Core{
         public bool FreezeTimer { get; set; }
         public bool ContextMenuOpen { get; set; }
         public string CurrentUrl { get; private set; }
+        public string CurrentQuotedTweetUrl { get; set; }
 
         public EventHandler Initialized;
         private bool isInitialized;
@@ -99,6 +101,10 @@ namespace TweetDck.Core{
                 LifeSpanHandler = new LifeSpanHandler()
             };
 
+            #if DEBUG
+            browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
+            #endif
+
             browser.IsBrowserInitializedChanged += Browser_IsBrowserInitializedChanged;
             browser.FrameLoadEnd += Browser_FrameLoadEnd;
             browser.RegisterJsObject("$TD", new TweetDeckBridge(owner, this));
@@ -277,6 +283,7 @@ namespace TweetDck.Core{
 
         private void LoadTweet(TweetNotification tweet){
             CurrentUrl = tweet.Url;
+            CurrentQuotedTweetUrl = string.Empty; // load from JS
             
             timerProgress.Stop();
             totalTime = timeLeft = tweet.GetDisplayDuration(Program.UserConfig.NotificationDurationValue);

Core/Handling/ContextMenuBrowser.cs

@@ -37,6 +37,11 @@ namespace TweetDck.Core.Handling{
             lastHighlightedTweet = TweetDeckBridge.LastHighlightedTweet;
             lastHighlightedQuotedTweet = TweetDeckBridge.LastHighlightedQuotedTweet;
 
+            if (!BrowserUtils.IsTweetDeckWebsite(frame)){
+                lastHighlightedTweet = string.Empty;
+                lastHighlightedQuotedTweet = string.Empty;
+            }
+
             if (!string.IsNullOrEmpty(lastHighlightedTweet) && (parameters.TypeFlags & (ContextMenuType.Editable | ContextMenuType.Selection)) == 0){
                 model.AddItem((CefMenuCommand)MenuOpenTweetUrl, "Open tweet in browser");
                 model.AddItem((CefMenuCommand)MenuCopyTweetUrl, "Copy tweet address");

Core/Handling/ContextMenuNotification.cs

@@ -7,7 +7,7 @@ namespace TweetDck.Core.Handling{
         private const int MenuSkipTweet = 26600;
         private const int MenuFreeze = 26601;
         private const int MenuCopyTweetUrl = 26602;
-        private const int MenuCopyTweetEmbeddedUrl = 26603;
+        private const int MenuCopyQuotedTweetUrl = 26603;
 
         private readonly FormNotification form;
         private readonly bool enableCustomMenu;
@@ -29,8 +29,8 @@ namespace TweetDck.Core.Handling{
                 if (!string.IsNullOrEmpty(form.CurrentUrl)){
                     model.AddItem((CefMenuCommand)MenuCopyTweetUrl, "Copy tweet address");
 
-                    if (!string.IsNullOrEmpty(TweetDeckBridge.NotificationTweetEmbedded)){
+                    if (!string.IsNullOrEmpty(form.CurrentQuotedTweetUrl)){
-                        model.AddItem((CefMenuCommand)MenuCopyTweetEmbeddedUrl, "Copy quoted tweet address");
+                        model.AddItem((CefMenuCommand)MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
                     }
 
                     model.AddSeparator();
@@ -61,8 +61,8 @@ namespace TweetDck.Core.Handling{
                     Clipboard.SetText(form.CurrentUrl, TextDataFormat.UnicodeText);
                     return true;
 
-                case MenuCopyTweetEmbeddedUrl:
+                case MenuCopyQuotedTweetUrl:
-                    Clipboard.SetText(TweetDeckBridge.NotificationTweetEmbedded, TextDataFormat.UnicodeText);
+                    Clipboard.SetText(form.CurrentQuotedTweetUrl, TextDataFormat.UnicodeText);
                     return true;
             }
 

Core/Handling/TweetDeckBridge.cs

@@ -11,7 +11,6 @@ namespace TweetDck.Core.Handling{
         public static string LastRightClickedLink = string.Empty;
         public static string LastHighlightedTweet = string.Empty;
         public static string LastHighlightedQuotedTweet = string.Empty;
-        public static string NotificationTweetEmbedded = string.Empty;
         public static string ClipboardImagePath = string.Empty;
 
         private readonly FormBrowser form;
@@ -81,8 +80,8 @@ namespace TweetDck.Core.Handling{
             });
         }
 
-        public void SetNotificationTweetEmbedded(string link){
+        public void SetNotificationQuotedTweet(string link){
-            form.InvokeSafe(() => NotificationTweetEmbedded = link);
+            notification.InvokeSafe(() => notification.CurrentQuotedTweetUrl = link);
         }
 
         public void OpenSettingsMenu(){

Core/Other/FormPlugins.cs

@@ -6,6 +6,7 @@ using System.Windows.Forms;
 using TweetDck.Core.Controls;
 using TweetDck.Plugins;
 using TweetDck.Plugins.Controls;
+using TweetDck.Plugins.Enums;
 using TweetDck.Plugins.Events;
 
 namespace TweetDck.Core.Other{

Core/Other/Settings/Export/CombinedFileStream.cs

@@ -4,7 +4,7 @@ using System.Text;
 
 namespace TweetDck.Core.Other.Settings.Export{
     class CombinedFileStream : IDisposable{
-        public const char KeySeparator = '/';
+        public const char KeySeparator = '|';
 
         private readonly Stream stream;
 
@@ -12,6 +12,10 @@ namespace TweetDck.Core.Other.Settings.Export{
             this.stream = stream;
         }
 
+        public void WriteFile(string[] identifier, string path){
+            WriteFile(string.Join(KeySeparator.ToString(), identifier), path);
+        }
+
         public void WriteFile(string identifier, string path){
             byte[] name = Encoding.UTF8.GetBytes(identifier);
 
@@ -77,6 +81,13 @@ namespace TweetDck.Core.Other.Settings.Export{
                 }
             }
 
+            public string[] KeyValue{
+                get{
+                    int index = Identifier.IndexOf(KeySeparator);
+                    return index == -1 ? new string[0] : Identifier.Substring(index+1).Split(KeySeparator);
+                }
+            }
+
             private readonly byte[] contents;
 
             public Entry(string identifier, byte[] contents){

Core/Other/Settings/Export/ExportManager.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Windows.Forms;
 using TweetDck.Plugins;
+using TweetDck.Plugins.Enums;
 
 namespace TweetDck.Core.Other.Settings.Export{
     sealed class ExportManager{
@@ -26,33 +27,14 @@ namespace TweetDck.Core.Other.Settings.Export{
                 using(CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None))){
                     stream.WriteFile("config", Program.ConfigFilePath);
 
-                    foreach(PathInfo path in EnumerateFilesRelative(plugins.PathOfficialPlugins)){
+                    foreach(Plugin plugin in plugins.Plugins){
-                        string[] split = path.Relative.Split(CombinedFileStream.KeySeparator);
+                        foreach(PathInfo path in EnumerateFilesRelative(plugin.GetPluginFolder(PluginFolder.Data))){
-
+                            try{
-                        if (split.Length < 3){
+                                stream.WriteFile(new string[]{ "plugin.data", plugin.Identifier, path.Relative }, path.Full);
-                            continue;
+                            }catch(ArgumentOutOfRangeException e){
-                        }
+                                MessageBox.Show("Could not include a plugin file in the export. "+e.Message, "Export Profile", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                        else if (split.Length == 3){
-                            if (split[2].Equals(".meta", StringComparison.OrdinalIgnoreCase) ||
-                                split[2].Equals("browser.js", StringComparison.OrdinalIgnoreCase) ||
-                                split[2].Equals("notification.js", StringComparison.OrdinalIgnoreCase)){
-                                continue;
                             }
                         }
-
-                        try{
-                            stream.WriteFile("plugin.off"+path.Relative, path.Full);
-                        }catch(ArgumentOutOfRangeException e){
-                            MessageBox.Show("Could not include a file in the export. "+e.Message, "Export Profile", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                        }
-                    }
-
-                    foreach(PathInfo path in EnumerateFilesRelative(plugins.PathCustomPlugins)){
-                        try{
-                            stream.WriteFile("plugin.usr"+path.Relative, path.Full);
-                        }catch(ArgumentOutOfRangeException e){
-                            MessageBox.Show("Could not include a file in the export. "+e.Message, "Export Profile", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                        }
                     }
 
                     if (includeSession){
@@ -72,6 +54,7 @@ namespace TweetDck.Core.Other.Settings.Export{
         public bool Import(){
             try{
                 bool updatedPlugins = false;
+                HashSet<string> missingPlugins = new HashSet<string>();
 
                 using(CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.None))){
                     CombinedFileStream.Entry entry;
@@ -83,28 +66,24 @@ namespace TweetDck.Core.Other.Settings.Export{
                                 Program.ReloadConfig();
                                 break;
 
-                            case "plugin.off":
+                            case "plugin.data":
-                                string root = Path.Combine(plugins.PathOfficialPlugins, entry.Identifier.Split(CombinedFileStream.KeySeparator)[1]);
+                                string[] value = entry.KeyValue;
 
-                                if (Directory.Exists(root)){
+                                entry.WriteToFile(Path.Combine(Program.PluginDataPath, value[0], value[1]), true);
-                                    entry.WriteToFile(Path.Combine(plugins.PathOfficialPlugins, entry.Identifier.Substring(entry.KeyName.Length+1)), true);
+
+                                if (plugins.IsPluginInstalled(value[0])){
                                     updatedPlugins = true;
                                 }
+                                else{
+                                    missingPlugins.Add(value[0]);
+                                }
 
                                 break;
 
-                            case "plugin.usr":
-                                entry.WriteToFile(Path.Combine(plugins.PathCustomPlugins, entry.Identifier.Substring(entry.KeyName.Length+1)), true);
-                                updatedPlugins = true;
-                                break;
-
                             case "cookies":
-                                if (MessageBox.Show("Do you want to import the login session? This will restart "+Program.BrandName+".", "Importing "+Program.BrandName+" Settings", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
+                                if (MessageBox.Show("Do you want to import the login session? This will restart "+Program.BrandName+".", "Importing "+Program.BrandName+" Profile", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
                                     entry.WriteToFile(Path.Combine(Program.StoragePath, TempCookiesPath));
-
-                                    // okay to and restart, 'cookies' is always the last entry
                                     IsRestarting = true;
-                                    Program.Restart(new string[]{ "-importcookies" });
                                 }
 
                                 break;
@@ -112,7 +91,14 @@ namespace TweetDck.Core.Other.Settings.Export{
                     }
                 }
 
-                if (updatedPlugins){
+                if (missingPlugins.Count > 0){
+                    MessageBox.Show("Detected missing plugins when importing plugin data:"+Environment.NewLine+string.Join(Environment.NewLine, missingPlugins), "Importing "+Program.BrandName+" Profile", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+
+                if (IsRestarting){
+                    Program.Restart(new string[]{ "-importcookies" });
+                }
+                else if (updatedPlugins){
                     plugins.Reload();
                 }
 
@@ -138,10 +124,10 @@ namespace TweetDck.Core.Other.Settings.Export{
         }
 
         private static IEnumerable<PathInfo> EnumerateFilesRelative(string root){
-            return Directory.EnumerateFiles(root, "*.*", SearchOption.AllDirectories).Select(fullPath => new PathInfo{
+            return Directory.Exists(root) ? Directory.EnumerateFiles(root, "*.*", SearchOption.AllDirectories).Select(fullPath => new PathInfo{
                 Full = fullPath,
-                Relative = fullPath.Substring(root.Length).Replace(Path.DirectorySeparatorChar, CombinedFileStream.KeySeparator) // includes leading separator character
+                Relative = fullPath.Substring(root.Length).TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar) // strip leading separator character
-            });
+            }) : Enumerable.Empty<PathInfo>();
         }
 
         private class PathInfo{

Core/Utils/BrowserUtils.cs

@@ -4,6 +4,7 @@ using System.Globalization;
 using System.IO;
 using System.Net;
 using System.Windows.Forms;
+using CefSharp;
 
 namespace TweetDck.Core.Utils{
     static class BrowserUtils{
@@ -27,7 +28,7 @@ namespace TweetDck.Core.Utils{
         }
 
         public static void OpenExternalBrowser(string url){ // TODO implement mailto
-            Process.Start(url);
+            using(Process.Start(url)){}
         }
 
         public static string GetFileNameFromUrl(string url){
@@ -47,5 +48,15 @@ namespace TweetDck.Core.Utils{
 
             client.DownloadFileAsync(new Uri(url), target);
         }
+
+        public static bool IsTweetDeckWebsite(IFrame frame){
+            return frame.Url.Contains("//tweetdeck.twitter.com/");
+        }
+
+        #if DEBUG
+        public static void HandleConsoleMessage(object sender, ConsoleMessageEventArgs e){
+            Debug.WriteLine("[Console] {0} ({1}:{2})", e.Message, e.Source, e.Line);
+        }
+        #endif
     }
 }

Core/Utils/NativeMethods.cs

@@ -15,6 +15,7 @@ namespace TweetDck.Core.Utils{
         public const int MOUSEEVENTF_RIGHTUP = 0x10;
 
         public const int SB_HORZ = 0;
+        public const int BCM_SETSHIELD = 0x160C;
 
         public const int WH_MOUSE_LL = 14;
         public const int WH_MOUSEWHEEL = 0x020A;

Core/Utils/WindowsUtils.cs

@@ -1,5 +1,5 @@
-using System.IO;
+using System.Diagnostics;
-using System.Linq;
+using System.IO;
 using System.Security.AccessControl;
 using System.Security.Principal;
 
@@ -7,27 +7,32 @@ namespace TweetDck.Core.Utils{
     static class WindowsUtils{
         public static bool CheckFolderPermission(string path, FileSystemRights right){
             try{
-                AuthorizationRuleCollection rules = Directory.GetAccessControl(path).GetAccessRules(true, true, typeof(SecurityIdentifier));
+                AuthorizationRuleCollection collection = Directory.GetAccessControl(path).GetAccessRules(true, true, typeof(NTAccount));
-                WindowsIdentity identity = WindowsIdentity.GetCurrent();
 
-                if (identity == null || identity.Groups == null){
+                foreach(FileSystemAccessRule rule in collection){
-                    return false;
+                    if ((rule.FileSystemRights & right) == right){
-                }
+                        return true;
-
-                bool accessAllow = false, accessDeny = false;
-
-                foreach(FileSystemAccessRule rule in rules.Cast<FileSystemAccessRule>().Where(rule => identity.Groups.Contains(rule.IdentityReference) && (right & rule.FileSystemRights) == right)){
-                    switch(rule.AccessControlType){
-                        case AccessControlType.Allow: accessAllow = true; break;
-                        case AccessControlType.Deny: accessDeny = true; break;
                     }
                 }
 
-                return accessAllow && !accessDeny;
+                return false;
             }
             catch{
                 return false;
             }
         }
+
+        public static Process StartProcess(string file, string arguments, bool runElevated){
+            ProcessStartInfo processInfo = new ProcessStartInfo{
+                FileName = file,
+                Arguments = arguments
+            };
+
+            if (runElevated){
+                processInfo.Verb = "runas";
+            }
+
+            return Process.Start(processInfo);
+        }
     }
 }

Migration/MigrationManager.cs

@@ -8,6 +8,7 @@ using System.Windows.Forms;
 using Microsoft.Win32;
 using TweetDck.Core.Other;
 using System.Drawing;
+using TweetDck.Core.Controls;
 
 namespace TweetDck.Migration{
     static class MigrationManager{
@@ -41,8 +42,9 @@ namespace TweetDck.Migration{
                     Button btnMigrate = formQuestion.AddButton("Migrate");
                     Button btnMigrateAndPurge = formQuestion.AddButton("Migrate && Purge");
 
-                    btnMigrateAndPurge.Location = new Point(btnMigrateAndPurge.Location.X-18, btnMigrateAndPurge.Location.Y);
+                    btnMigrateAndPurge.Location = new Point(btnMigrateAndPurge.Location.X-20, btnMigrateAndPurge.Location.Y);
-                    btnMigrateAndPurge.Width += 18;
+                    btnMigrateAndPurge.Width += 20;
+                    btnMigrateAndPurge.SetElevated();
 
                     if (formQuestion.ShowDialog() == DialogResult.OK){
                         decision = formQuestion.ClickedButton == btnMigrateAndPurge ? MigrationDecision.MigratePurge :
@@ -85,10 +87,20 @@ namespace TweetDck.Migration{
             }
             else if (!Program.UserConfig.IgnoreUninstallCheck){
                 string guid = MigrationUtils.FindProgramGuidByDisplayName("TweetDeck");
+                
+                if (guid != null){
+                    const string prompt = "TweetDeck is still installed on your computer, do you want to uninstall it?";
 
-                if (guid != null && MessageBox.Show("TweetDeck is still installed on your computer, do you want to uninstall it?", "Uninstall TweetDeck", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
+                    using(FormMessage formQuestion = new FormMessage("Uninstall TweetDeck", prompt, MessageBoxIcon.Question)){
-                    MigrationUtils.RunUninstaller(guid, 0);
+                        formQuestion.AddButton("No");
-                    CleanupTweetDeck();
+
+                        Button btnYes = formQuestion.AddButton("Yes");
+                        btnYes.SetElevated();
+
+                        if (formQuestion.ShowDialog() == DialogResult.OK && formQuestion.ClickedButton == btnYes && MigrationUtils.RunUninstaller(guid, 0)){
+                            CleanupTweetDeck();
+                        }
+                    }
                 }
 
                 Program.UserConfig.IgnoreUninstallCheck = true;
@@ -155,8 +167,8 @@ namespace TweetDck.Migration{
                     // uninstall in the background
                     string guid = MigrationUtils.FindProgramGuidByDisplayName("TweetDeck");
 
-                    if (guid != null){
+                    if (guid != null && !MigrationUtils.RunUninstaller(guid, 5000)){
-                        MigrationUtils.RunUninstaller(guid, 5000);
+                        return;
                     }
 
                     // registry cleanup

Migration/MigrationUtils.cs

@@ -2,18 +2,25 @@
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.Win32;
+using TweetDck.Core.Utils;
 
 namespace TweetDck.Migration{
     static class MigrationUtils{
-        public static void RunUninstaller(string guid, int timeout){
+        public static bool RunUninstaller(string guid, int timeout){
-            Process uninstaller = Process.Start("msiexec.exe", "/x "+guid+" /quiet /qn");
+            try{
+                Process uninstaller = WindowsUtils.StartProcess("msiexec.exe", "/x "+guid+" /quiet /qn", true);
 
-            if (uninstaller != null){
+                if (uninstaller != null){
-                if (timeout > 0){
+                    if (timeout > 0){
-                    uninstaller.WaitForExit(timeout); // it appears that the process is restarted or something that triggers this, but it shouldn't be a problem
+                        uninstaller.WaitForExit(timeout); // it appears that the process is restarted or something that triggers this, but it shouldn't be a problem
+                    }
+
+                    uninstaller.Close();
                 }
 
-                uninstaller.Close();
+                return true;
+            }catch(Exception){
+                return false;
             }
         }
 

Plugins/Controls/PluginControl.cs

@@ -50,7 +50,7 @@ namespace TweetDck.Plugins.Controls{
         }
 
         private void btnOpenConfig_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", "/select,\""+plugin.ConfigPath+"\"")){}
+            using(Process.Start("explorer.exe", "/select,\""+plugin.ConfigPath.Replace('/', '\\')+"\"")){}
         }
 
         private void btnToggleState_Click(object sender, EventArgs e){

Plugins/Enums/PluginEnvironment.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace TweetDck.Plugins{
+namespace TweetDck.Plugins.Enums{
     [Flags]
     enum PluginEnvironment{
         None = 0,

Plugins/Enums/PluginFolder.cs

@@ -0,0 +1,5 @@
+namespace TweetDck.Plugins.Enums{
+    enum PluginFolder{
+        Root, Data
+    }
+}

Plugins/Enums/PluginGroup.cs

@@ -1,4 +1,4 @@
-namespace TweetDck.Plugins{
+namespace TweetDck.Plugins.Enums{
     enum PluginGroup{
         Official, Custom
     }

Plugins/Plugin.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using TweetDck.Plugins.Enums;
 
 namespace TweetDck.Plugins{
     class Plugin{
@@ -26,29 +27,30 @@ namespace TweetDck.Plugins{
 
         public bool HasConfig{
             get{
-                return ConfigFile.Length > 0 && GetFullPathIfSafe(ConfigFile).Length > 0;
+                return ConfigFile.Length > 0 && GetFullPathIfSafe(PluginFolder.Data, ConfigFile).Length > 0;
             }
         }
 
         public string ConfigPath{
             get{
-                return HasConfig ? Path.Combine(path, ConfigFile) : string.Empty;
+                return HasConfig ? Path.Combine(GetPluginFolder(PluginFolder.Data), ConfigFile) : string.Empty;
             }
         }
 
         public bool HasDefaultConfig{
             get{
-                return ConfigDefault.Length > 0 && GetFullPathIfSafe(ConfigDefault).Length > 0;
+                return ConfigDefault.Length > 0 && GetFullPathIfSafe(PluginFolder.Root, ConfigDefault).Length > 0;
             }
         }
 
         public string DefaultConfigPath{
             get{
-                return HasDefaultConfig ? Path.Combine(path, ConfigDefault) : string.Empty;
+                return HasDefaultConfig ? Path.Combine(GetPluginFolder(PluginFolder.Root), ConfigDefault) : string.Empty;
             }
         }
 
-        private readonly string path;
+        private readonly string pathRoot;
+        private readonly string pathData;
         private readonly string identifier;
         private readonly Dictionary<string, string> metadata = new Dictionary<string, string>(4){
             { "NAME", "" },
@@ -64,8 +66,13 @@ namespace TweetDck.Plugins{
         private bool? canRun;
 
         private Plugin(string path, PluginGroup group){
-            this.path = path;
+            string name = Path.GetFileName(path);
-            this.identifier = group.GetIdentifierPrefix()+Path.GetFileName(path);
+            System.Diagnostics.Debug.Assert(name != null);
+
+            this.pathRoot = path;
+            this.pathData = Path.Combine(Program.PluginDataPath, group.GetIdentifierPrefix(), name);
+
+            this.identifier = group.GetIdentifierPrefix()+name;
             this.Group = group;
             this.Environments = PluginEnvironment.None;
         }
@@ -74,7 +81,26 @@ namespace TweetDck.Plugins{
             string configPath = ConfigPath, defaultConfigPath = DefaultConfigPath;
 
             if (configPath.Length > 0 && defaultConfigPath.Length > 0 && !File.Exists(configPath) && File.Exists(defaultConfigPath)){
+                string dataFolder = GetPluginFolder(PluginFolder.Data);
+
+                if (!Directory.Exists(dataFolder)){ // config migration
+                    string originalFile = Path.Combine(GetPluginFolder(PluginFolder.Root), ConfigFile);
+
+                    if (File.Exists(originalFile)){
+                        try{
+                            Directory.CreateDirectory(dataFolder);
+                            File.Copy(originalFile, configPath, false);
+                            File.Delete(originalFile); // will fail without write perms in program folder, ignore if so
+                        }catch{
+                            // ignore
+                        }
+
+                        return;
+                    }
+                }
+
                 try{
+                    Directory.CreateDirectory(dataFolder);
                     File.Copy(defaultConfigPath, configPath, false);
                 }catch(Exception e){
                     Program.Reporter.HandleException("Plugin Loading Error", "Could not generate a configuration file for '"+identifier+"' plugin.", true, e);
@@ -85,18 +111,27 @@ namespace TweetDck.Plugins{
         public string GetScriptPath(PluginEnvironment environment){
             if (Environments.HasFlag(environment)){
                 string file = environment.GetScriptFile();
-                return file != null ? Path.Combine(path, file) : string.Empty;
+                return file != null ? Path.Combine(pathRoot, file) : string.Empty;
             }
             else{
                 return string.Empty;
             }
         }
 
-        public string GetFullPathIfSafe(string relativePath){
+        public string GetPluginFolder(PluginFolder folder){
-            string fullPath = Path.Combine(path, relativePath);
+            switch(folder){
+                case PluginFolder.Root: return pathRoot;
+                case PluginFolder.Data: return pathData;
+                default: return string.Empty;
+            }
+        }
+
+        public string GetFullPathIfSafe(PluginFolder folder, string relativePath){
+            string rootFolder = GetPluginFolder(folder);
+            string fullPath = Path.Combine(rootFolder, relativePath);
 
             try{
-                string folderPathName = new DirectoryInfo(path).FullName;
+                string folderPathName = new DirectoryInfo(rootFolder).FullName;
                 DirectoryInfo currentInfo = new DirectoryInfo(fullPath);
 
                 while(currentInfo.Parent != null){
@@ -124,7 +159,7 @@ namespace TweetDck.Plugins{
 
         public override bool Equals(object obj){
             Plugin plugin = obj as Plugin;
-            return plugin != null && plugin.path.Equals(path);
+            return plugin != null && plugin.identifier.Equals(identifier);
         }
 
         public static Plugin CreateFromFolder(string path, PluginGroup group, out string error){

Plugins/PluginBridge.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using TweetDck.Plugins.Enums;
 using TweetDck.Plugins.Events;
 
 namespace TweetDck.Plugins{
@@ -18,35 +19,26 @@ namespace TweetDck.Plugins{
             fileCache.Clear();
         }
 
-        private string GetFullPathIfSafe(int token, string path){
+        private string GetFullPathOrThrow(int token, PluginFolder folder, string path){
             Plugin plugin = manager.GetPluginFromToken(token);
-            return plugin == null ? string.Empty : plugin.GetFullPathIfSafe(path);
+            string fullPath = plugin == null ? string.Empty : plugin.GetFullPathIfSafe(folder, path);
-        }
-
-        public void WriteFile(int token, string path, string contents){
-            string fullPath = GetFullPathIfSafe(token, path);
-
-            if (fullPath == string.Empty){
-                throw new Exception("File path has to be relative to the plugin folder.");
-            }
-
-            // ReSharper disable once AssignNullToNotNullAttribute
-            Directory.CreateDirectory(Path.GetDirectoryName(fullPath));
-
-            File.WriteAllText(fullPath, contents, Encoding.UTF8);
-            fileCache[fullPath] = contents;
-        }
-
-        public string ReadFile(int token, string path, bool cache){
-            string fullPath = GetFullPathIfSafe(token, path);
 
             if (fullPath.Length == 0){
-                throw new Exception("File path has to be relative to the plugin folder.");
+                switch(folder){
+                    case PluginFolder.Data: throw new Exception("File path has to be relative to the plugin data folder.");
+                    case PluginFolder.Root: throw new Exception("File path has to be relative to the plugin root folder.");
+                    default: throw new Exception("Invalid folder type "+folder+", this is a "+Program.BrandName+" error.");
+                }
             }
+            else{
+                return fullPath;
+            }
+        }
 
+        private string ReadFileUnsafe(string fullPath, bool readCached){
             string cachedContents;
             
-            if (cache && fileCache.TryGetValue(fullPath, out cachedContents)){
+            if (readCached && fileCache.TryGetValue(fullPath, out cachedContents)){
                 return cachedContents;
             }
 
@@ -59,25 +51,39 @@ namespace TweetDck.Plugins{
             }
         }
 
-        public void DeleteFile(int token, string path){
+        // Public methods
-            string fullPath = GetFullPathIfSafe(token, path);
+
+        public void WriteFile(int token, string path, string contents){
+            string fullPath = GetFullPathOrThrow(token, PluginFolder.Data, path);
+
+            // ReSharper disable once AssignNullToNotNullAttribute
+            Directory.CreateDirectory(Path.GetDirectoryName(fullPath));
+
+            File.WriteAllText(fullPath, contents, Encoding.UTF8);
+            fileCache[fullPath] = contents;
+        }
+
+        public string ReadFile(int token, string path, bool cache){
+            return ReadFileUnsafe(GetFullPathOrThrow(token, PluginFolder.Data, path), cache);
+        }
+
+        public void DeleteFile(int token, string path){
+            string fullPath = GetFullPathOrThrow(token, PluginFolder.Data, path);
 
-            if (fullPath.Length == 0){
-                throw new Exception("File path has to be relative to the plugin folder.");
-            }
-            
             fileCache.Remove(fullPath);
             File.Delete(fullPath);
         }
 
         public bool CheckFileExists(int token, string path){
-            string fullPath = GetFullPathIfSafe(token, path);
+            return File.Exists(GetFullPathOrThrow(token, PluginFolder.Data, path));
+        }
 
-            if (fullPath.Length == 0){
+        public string ReadFileRoot(int token, string path){
-                throw new Exception("File path has to be relative to the plugin folder.");
+            return ReadFileUnsafe(GetFullPathOrThrow(token, PluginFolder.Root, path), true);
-            }
+        }
 
-            return File.Exists(fullPath);
+        public bool CheckFileExistsRoot(int token, string path){
+            return File.Exists(GetFullPathOrThrow(token, PluginFolder.Root, path));
         }
     }
 }

Plugins/PluginManager.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using CefSharp;
+using TweetDck.Plugins.Enums;
 using TweetDck.Plugins.Events;
 using TweetDck.Resources;
 
@@ -34,6 +35,10 @@ namespace TweetDck.Plugins{
             this.Bridge = new PluginBridge(this);
         }
 
+        public bool IsPluginInstalled(string identifier){
+            return plugins.Any(plugin => plugin.Identifier.Equals(identifier));
+        }
+
         public IEnumerable<Plugin> GetPluginsByGroup(PluginGroup group){
             return plugins.Where(plugin => plugin.Group == group);
         }
@@ -103,6 +108,10 @@ namespace TweetDck.Plugins{
         }
 
         private IEnumerable<Plugin> LoadPluginsFrom(string path, PluginGroup group){
+            if (!Directory.Exists(path)){
+                yield break;
+            }
+
             foreach(string fullDir in Directory.EnumerateDirectories(path, "*", SearchOption.TopDirectoryOnly)){
                 string error;
                 Plugin plugin = Plugin.CreateFromFolder(fullDir, group, out error);

Plugins/PluginScriptGenerator.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using TweetDck.Plugins.Enums;
 
 namespace TweetDck.Plugins{
     static class PluginScriptGenerator{

Program.cs

@@ -23,8 +23,8 @@ namespace TweetDck{
 
         public const string BrowserSubprocess = BrandName+".Browser.exe";
 
-        public const string VersionTag = "1.4.2";
+        public const string VersionTag = "1.5";
-        public const string VersionFull = "1.4.2.0";
+        public const string VersionFull = "1.5.0.0";
 
         public static readonly Version Version = new Version(VersionTag);
 
@@ -35,6 +35,7 @@ namespace TweetDck{
         public static readonly string StoragePath = IsPortable ? Path.Combine(ProgramPath, "portable", "storage") : GetDataStoragePath();
         public static readonly string TemporaryPath = IsPortable ? Path.Combine(ProgramPath, "portable", "tmp") : Path.Combine(Path.GetTempPath(), BrandName+'_'+Path.GetRandomFileName().Substring(0, 6));
 
+        public static readonly string PluginDataPath = Path.Combine(StoragePath, "TD_Plugins");
         public static readonly string ConfigFilePath = Path.Combine(StoragePath, "TD_UserConfig.cfg");
         private static readonly string LogFilePath = Path.Combine(StoragePath, "TD_Log.txt");
         
@@ -56,8 +57,8 @@ namespace TweetDck{
 
             WindowRestoreMessage = NativeMethods.RegisterWindowMessage("TweetDuckRestore");
 
-            if (!WindowsUtils.CheckFolderPermission(ProgramPath, FileSystemRights.WriteData)){
+            if (!WindowsUtils.CheckFolderPermission(StoragePath, FileSystemRights.WriteData)){
-                MessageBox.Show(BrandName+" does not have write permissions to the program folder. If it is installed in Program Files, please run it as Administrator.", "Administrator Required", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                MessageBox.Show(BrandName+" does not have write permissions to the storage folder: "+StoragePath, "Permission Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 return;
             }
 
@@ -120,6 +121,7 @@ namespace TweetDck{
                 Locale = Args.GetValue("-locale", "en"),
                 CachePath = StoragePath,
                 BrowserSubprocessPath = File.Exists(BrowserSubprocess) ? BrowserSubprocess : "CefSharp.BrowserSubprocess.exe",
+                LogFile = Path.Combine(StoragePath, "TD_Console.txt"),
                 #if !DEBUG
                 LogSeverity = Args.HasFlag("-log") ? LogSeverity.Info : LogSeverity.Disable
                 #endif
@@ -147,7 +149,9 @@ namespace TweetDck{
             if (mainForm.UpdateInstallerPath != null){
                 ExitCleanup();
 
-                Process.Start(mainForm.UpdateInstallerPath, "/SP- /SILENT /NOICONS /CLOSEAPPLICATIONS");
+                bool runElevated = !IsPortable || !WindowsUtils.CheckFolderPermission(ProgramPath, FileSystemRights.WriteData);
+
+                WindowsUtils.StartProcess(mainForm.UpdateInstallerPath, "/SP- /SILENT /CLOSEAPPLICATIONS /UPDATEPATH=\""+ProgramPath+"\""+(IsPortable ? " /PORTABLE=1" : ""), runElevated); // ProgramPath has a trailing backslash
                 Application.Exit();
             }
         }

Reporter.cs

@@ -50,7 +50,9 @@ namespace TweetDck{
                 UseVisualStyleBackColor = true
             };
 
-            btnOpenLog.Click += (sender, args) => Process.Start(logFile);
+            btnOpenLog.Click += (sender, args) => {
+                using(Process.Start(logFile)){}
+            };
 
             form.AddActionControl(btnOpenLog);
 

Resources/Plugins/reply-account/.meta

@@ -8,7 +8,7 @@ Custom reply account
 chylex
 
 [version]
-1.1
+1.2
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/reply-account/browser.js

@@ -14,8 +14,25 @@ enabled(){
     
     if (configuration.useAdvancedSelector){
       if (configuration.customSelector){
-        var column = TD.controller.columnManager.get(data.element.closest("section.column").attr("data-column"));
+        if (configuration.customSelector.toString().startsWith("function (column){")){
-        query = configuration.customSelector(column);
+          $TD.alert("warning", "Plugin reply-account has invalid configuration: customSelector needs to be updated due to TweetDeck changes, please read the default configuration file for the updated guide");
+          return;
+        }
+        
+        var section = data.element.closest("section.column");
+        
+        var column = TD.controller.columnManager.get(section.attr("data-column"));
+        var header = $("h1.column-title", section);
+        
+        var columnTitle = header.children(".column-head-title").text();
+        var columnAccount = header.children(".attribution").text();
+        
+        try{
+          query = configuration.customSelector(column.getColumnType(), columnTitle, columnAccount, column);
+        }catch(e){
+          $TD.alert("warning", "Plugin reply-account has invalid configuration: customSelector threw an error: "+e.message);
+          return;
+        }
       }
       else{
         $TD.alert("warning", "Plugin reply-account has invalid configuration: useAdvancedSelector is true, but customSelector function is missing");

Resources/Plugins/reply-account/configuration.default.js

@@ -34,42 +34,43 @@
    * The 'customSelector' function should return a string in one of the formats supported by 'defaultAccount'.
    * If it returns anything else (for example, false or undefined), it falls back to 'defaultAccount' behavior.
    *
-   * The 'column' parameter is a TweetDeck column object. If you want to see all properties of the object, open your browser, nagivate to TweetDeck,
-   * log in, and run the following code in your browser console, which will return an object containing all of the column objects mapped to their IDs:
-   *   TD.controller.columnManager.getAll()
-   *
-   * The example below shows how to extract the column type, title, and account from the object.
-   * Column type is prefixed with col_, and may be one of the following:
    *
+   * The 'type' parameter is TweetDeck column type. Here is the full list of column types, note that some are
+   * unused and have misleading names (for example, Home columns are 'col_timeline' instead of 'col_home'):
    *   col_timeline, col_interactions, col_mentions, col_followers, col_search, col_list,
    *   col_customtimeline, col_messages, col_usertweets, col_favorites, col_activity,
    *   col_dataminr, col_home, col_me, col_inbox, col_scheduled, col_unknown
    *
-   * Some of these appear to be unused (for example, Home columns are 'col_timeline' instead of 'col_home').
+   * If you want to see your current column types, run this in your browser console:
+   *   TD.controller.columnManager.getAllOrdered().map(obj => obj.getColumnType());
    *
-   * If you want to see your column types, run this in your browser console:
+   *
-   *   Object.values(TD.controller.columnManager.getAll()).forEach(obj => console.log(obj.getColumnType()));
+   * The 'title' parameter is the column title. Some are fixed (such as 'Home' or 'Notifications'),
-   * 
+   * some contain specific information (for example, Search columns contain the search query).
-   * You can also get the jQuery column object using: $("section.column[data-column='"+column.ui.state.columnKey+"']")
+   *
+   *
+   * The 'account' parameter is the account name displayed next to the column title (including the @).
+   * This parameter is empty for some columns (such as Messages, or Notifications for all accounts) or can
+   * contain other text (for example, the Scheduled column contains the string 'All accounts').
+   *
+   *
+   * The 'column' parameter is a TweetDeck column object. If you want to see all properties of the object,
+   * run the following code in your browser console, which will return an array containing all of your
+   * current column objects in order:
+   *   TD.controller.columnManager.getAllOrdered()
    *
    */
   
   useAdvancedSelector: false,
   
-  /*customSelector: function(column){
+  /*customSelector: function(type, title, account, column){
-    var titleObj = $(column.getTitleHTML());
+    if (type === "col_search" && title === "TweetDuck"){
-    
-    var columnType = column.getColumnType(); // col_timeline
-    var columnTitle = titleObj.siblings(".column-head-title").text(); // Home
-    var columnAccount = titleObj.siblings(".attribution").text(); // @chylexmc
-    
-    if (columnType === "col_search" && columnTitle === "TweetDuck"){
       // This is a search column that looks for 'TweetDuck' in the tweets,
       // search columns are normally linked to the preferred account
       // so this forces the @TryTweetDuck account to be used instead.
       return "@TryTweetDuck";
     }
-    else if (columnType === "col_timeline" && columnAccount === "@chylexcz"){
+    else if (type === "col_timeline" && account === "@chylexcz"){
       // This is a Home column of my test account @chylexcz,
       // but I want to reply to tweets from my official account.
       return "@chylexmc";

Resources/Scripts/notification.js

@@ -114,7 +114,7 @@
     var account = embedded[0].getElementsByClassName("account-link");
     if (account.length === 0)return;
     
-    $TD.setNotificationTweetEmbedded(account[0].getAttribute("href")+"/status/"+tweetId);
+    $TD.setNotificationQuotedTweet(account[0].getAttribute("href")+"/status/"+tweetId);
   })();
   
   //

Resources/Scripts/plugins.js

@@ -8,8 +8,8 @@
 
     $TDP.checkFileExists(token, fileNameUser).then(exists => {
       var fileName = exists ? fileNameUser : fileNameDefault;
-
+      
-      $TDP.readFile(token, fileName, true).then(contents => {
+      (exists ? $TDP.readFile(token, fileName, true) : $TDP.readFileRoot(token, fileName)).then(contents => {
         var obj;
 
         try{

TweetDck.csproj

@@ -206,12 +206,13 @@
     <Compile Include="Plugins\Controls\PluginListFlowLayout.Designer.cs">
       <DependentUpon>PluginListFlowLayout.cs</DependentUpon>
     </Compile>
+    <Compile Include="Plugins\Enums\PluginFolder.cs" />
     <Compile Include="Plugins\Plugin.cs" />
     <Compile Include="Plugins\Events\PluginChangedStateEventArgs.cs" />
     <Compile Include="Plugins\PluginBridge.cs" />
     <Compile Include="Plugins\PluginConfig.cs" />
-    <Compile Include="Plugins\PluginEnvironment.cs" />
+    <Compile Include="Plugins\Enums\PluginEnvironment.cs" />
-    <Compile Include="Plugins\PluginGroup.cs" />
+    <Compile Include="Plugins\Enums\PluginGroup.cs" />
     <Compile Include="Plugins\Events\PluginLoadEventArgs.cs" />
     <Compile Include="Plugins\PluginManager.cs" />
     <Compile Include="Plugins\PluginScriptGenerator.cs" />

bld/gen_full.iss

@@ -23,6 +23,7 @@ OutputBaseFilename={#MyAppName}
 VersionInfoVersion={#MyAppVersion}
 LicenseFile=.\Resources\LICENSE
 SetupIconFile=.\Resources\icon.ico
+Uninstallable=TDIsUninstallable
 UninstallDisplayName={#MyAppName}
 UninstallDisplayIcon={app}\{#MyAppExeName}
 Compression=lzma
@@ -41,11 +42,11 @@ Source: "..\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignorever
 Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,devtools_resources.pak,d3dcompiler_43.dll"
 
 [Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Check: TDIsUninstallable
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall shellexec skipifsilent
 
 [InstallDelete]
 Type: files; Name: "{app}\td-log.txt"
@@ -56,11 +57,15 @@ Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Cache"
 Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\GPUCache"
 
 [Code]
+var UpdatePath: String;
+
 function TDGetNetFrameworkVersion: Cardinal; forward;
 
 { Check .NET Framework version on startup, ask user if they want to proceed if older than 4.5.2. }
 function InitializeSetup: Boolean;
 begin
+  UpdatePath := ExpandConstant('{param:UPDATEPATH}')
+  
   if TDGetNetFrameworkVersion() >= 379893 then
   begin
     Result := True;
@@ -76,6 +81,21 @@ begin
   Result := True;
 end;
 
+{ Set the installation path if updating. }
+procedure InitializeWizard();
+begin
+  if (UpdatePath <> '') then
+  begin
+    WizardForm.DirEdit.Text := UpdatePath;
+  end;
+end;
+
+{ Skip the install path selection page if running from an update installer. }
+function ShouldSkipPage(PageID: Integer): Boolean;
+begin
+  Result := (PageID = wpSelectDir) and (UpdatePath <> '')
+end;
+
 { Ask user if they want to delete 'AppData\TweetDuck' and 'plugins' folders after uninstallation. }
 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
 var ProfileDataFolder: String;
@@ -96,6 +116,12 @@ begin
   end;
 end;
 
+{ Returns true if the installer should create uninstallation entries (i.e. not running in full update mode). }
+function TDIsUninstallable: Boolean;
+begin
+  Result := (UpdatePath = '')
+end;
+
 { Return DWORD value containing the build version of .NET Framework. }
 function TDGetNetFrameworkVersion: Cardinal;
 var FrameworkVersion: Cardinal;

bld/gen_port.iss

@@ -0,0 +1,92 @@
+; Script generated by the Inno Script Studio Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "TweetDuck"
+#define MyAppPublisher "chylex"
+#define MyAppURL "https://tweetduck.chylex.com"
+#define MyAppExeName "TweetDuck.exe"
+
+#define MyAppVersion GetFileVersion("..\bin\x86\Release\TweetDuck.exe")
+
+[Setup]
+AppId={{8C25A716-7E11-4AAD-9992-8B5D0C78AE06}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DefaultGroupName={#MyAppName}
+OutputBaseFilename={#MyAppName}.Portable
+VersionInfoVersion={#MyAppVersion}
+LicenseFile=.\Resources\LICENSE
+SetupIconFile=.\Resources\icon.ico
+Uninstallable=no
+UsePreviousAppDir=no
+PrivilegesRequired=lowest
+Compression=lzma
+SolidCompression=yes
+InternalCompressLevel=max
+MinVersion=0,6.1
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Files]
+Source: "..\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,devtools_resources.pak,d3dcompiler_43.dll"
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall shellexec
+
+[Code]
+function TDGetNetFrameworkVersion: Cardinal; forward;
+
+{ Check .NET Framework version on startup, ask user if they want to proceed if older than 4.5.2. }
+function InitializeSetup: Boolean;
+begin
+  if TDGetNetFrameworkVersion() >= 379893 then
+  begin
+    Result := True;
+    Exit;
+  end;
+  
+  if (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please download it from {#MyAppURL}'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
+  begin
+    Result := False;
+    Exit;
+  end;
+  
+  Result := True;
+end;
+
+{ Return DWORD value containing the build version of .NET Framework. }
+function TDGetNetFrameworkVersion: Cardinal;
+var FrameworkVersion: Cardinal;
+
+begin
+  if RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'Software\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', FrameworkVersion) then
+  begin
+    Result := FrameworkVersion;
+    Exit;
+  end;
+  
+  Result := 0;
+end;
+
+{ Create a 'makeportable' file if running in portable mode. }
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssPostInstall then
+  begin
+    while not SaveStringToFile(ExpandConstant('{app}\makeportable'), '', False) do
+    begin
+      if MsgBox('Could not create a ''makeportable'' file in the installation folder. If the file is not present, the installation will not be fully portable.', mbCriticalError, MB_RETRYCANCEL) <> IDRETRY then
+      begin
+        break;
+      end;
+    end;
+  end;
+end;

bld/gen_upd.iss

@@ -25,8 +25,10 @@ OutputBaseFilename={#MyAppName}.Update
 VersionInfoVersion={#MyAppVersion}
 LicenseFile=.\Resources\LICENSE
 SetupIconFile=.\Resources\icon.ico
+Uninstallable=TDIsUninstallable
 UninstallDisplayName={#MyAppName}
 UninstallDisplayIcon={app}\{#MyAppExeName}
+PrivilegesRequired=lowest
 Compression=lzma
 SolidCompression=yes
 InternalCompressLevel=max
@@ -42,10 +44,10 @@ Source: "..\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignorever
 Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,*.dll,*.pak,*.bin,*.dat"
 
 [Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Check: TDIsUninstallable
 
 [Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall shellexec
 
 [InstallDelete]
 Type: files; Name: "{app}\*.xml"
@@ -54,6 +56,8 @@ Type: files; Name: "{app}\d3dcompiler_43.dll"
 Type: files; Name: "{app}\devtools_resources.pak"
 Type: files; Name: "{app}\CefSharp.BrowserSubprocess.exe"
 Type: files; Name: "{app}\td-log.txt"
+Type: files; Name: "{app}\debug.log"
+Type: files; Name: "{localappdata}\{#MyAppName}\ChromeDWriteFontCache"
 
 [UninstallDelete]
 Type: files; Name: "{app}\*.*"
@@ -63,22 +67,34 @@ Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Cache"
 Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\GPUCache"
 
 [Code]
+function TDIsUninstallable: Boolean; forward;
+function TDFindUpdatePath: String; forward;
 function TDGetNetFrameworkVersion: Cardinal; forward;
 function TDGetAppVersionClean: String; forward;
-function TDIsMatchingCEFVersion(InstallPath: String): Boolean; forward;
+function TDIsMatchingCEFVersion: Boolean; forward;
-function TDPrepareFullDownloadIfNeeded: Boolean; forward;
 procedure TDExecuteFullDownload; forward;
 
+var IsPortable: Boolean;
+var UpdatePath: String;
+
 { Check .NET Framework version on startup, ask user if they want to proceed if older than 4.5.2. Prepare full download package if required. }
 function InitializeSetup: Boolean;
 begin
-  if not TDPrepareFullDownloadIfNeeded() then
+  IsPortable := ExpandConstant('{param:PORTABLE}') = '1'
+  UpdatePath := TDFindUpdatePath()
+  
+  if UpdatePath = '' then
   begin
     MsgBox('{#MyAppName} installation could not be found on your system.', mbCriticalError, MB_OK);
     Result := False;
     Exit;
   end;
   
+  if not TDIsMatchingCEFVersion() then
+  begin
+    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/releases/download/'+TDGetAppVersionClean()+'/{#MyAppName}.exe', ExpandConstant('{tmp}\{#MyAppName}.Full.exe'));
+  end;
+  
   if TDGetNetFrameworkVersion() >= 379893 then
   begin
     Result := True;
@@ -94,9 +110,11 @@ begin
   Result := True;
 end;
 
-{ Prepare download plugin if there are any files to download. }
+{ Prepare download plugin if there are any files to download, and set the installation path. }
 procedure InitializeWizard();
 begin
+  WizardForm.DirEdit.Text := UpdatePath;
+  
   if idpFilesCount <> 0 then
   begin
     idpDownloadAfter(wpReady);
@@ -128,13 +146,44 @@ procedure CurStepChanged(CurStep: TSetupStep);
 begin
   if CurStep = ssInstall then
   begin
-    DeleteFile(ExpandConstant('{app}\unins000.dat'));
-    DeleteFile(ExpandConstant('{app}\unins000.exe'));
-    
     TDExecuteFullDownload();
+    
+    if TDIsUninstallable() then
+    begin
+      DeleteFile(ExpandConstant('{app}\unins000.dat'));
+      DeleteFile(ExpandConstant('{app}\unins000.exe'));
+    end;
   end;
 end;
 
+{ Returns true if the installer should create uninstallation entries (i.e. not running in portable mode). }
+function TDIsUninstallable: Boolean;
+begin
+  Result := not IsPortable
+end;
+
+{ Returns a validated installation path (including trailing backslash) using the /UPDATEPATH parameter or installation info in registry. Returns empty string on failure. }
+function TDFindUpdatePath: String;
+var Path: String;
+
+begin
+  Path := ExpandConstant('{param:UPDATEPATH}')
+  
+  if (Path = '') and not IsPortable and not RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\Microsoft\Windows\CurrentVersion\Uninstall\{{#MyAppID}}_is1', 'InstallLocation', Path) then
+  begin
+    Result := ''
+    Exit
+  end;
+  
+  if not FileExists(Path+'{#MyAppExeName}') then
+  begin
+    Result := ''
+    Exit
+  end;
+  
+  Result := Path
+end;
+
 { Return DWORD value containing the build version of .NET Framework. }
 function TDGetNetFrameworkVersion: Cardinal;
 var FrameworkVersion: Cardinal;
@@ -150,11 +199,11 @@ begin
 end;
 
 { Return whether the version of the installed libcef.dll library matches internal one. }
-function TDIsMatchingCEFVersion(InstallPath: String): Boolean;
+function TDIsMatchingCEFVersion: Boolean;
 var CEFVersion: String;
 
 begin
-  Result := (GetVersionNumbersString(InstallPath+'\libcef.dll', CEFVersion) and (CompareStr(CEFVersion, '{#CefVersion}') = 0))
+  Result := (GetVersionNumbersString(UpdatePath+'libcef.dll', CEFVersion) and (CompareStr(CEFVersion, '{#CefVersion}') = 0))
 end;
 
 { Return a cleaned up form of the app version string (removes all .0 suffixes). }
@@ -180,25 +229,6 @@ begin
   Result := CleanVersion;
 end;
 
-{ Prepare the full package installer to run if the CEF version is not matching. Return False if the app is not installed. }
-function TDPrepareFullDownloadIfNeeded: Boolean;
-var InstallPath: String;
-
-begin
-  if not RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\Microsoft\Windows\CurrentVersion\Uninstall\{{#MyAppID}}_is1', 'InstallLocation', InstallPath) then
-  begin
-    Result := False;
-    Exit;
-  end;
-  
-  if not TDIsMatchingCEFVersion(InstallPath) then
-  begin
-    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/releases/download/'+TDGetAppVersionClean()+'/{#MyAppName}.exe', ExpandConstant('{tmp}\{#MyAppName}.Full.exe'));
-  end;
-  
-  Result := True;
-end;
-
 { Run the full package installer if downloaded. }
 procedure TDExecuteFullDownload;
 var InstallFile: String;
@@ -212,10 +242,18 @@ begin
     WizardForm.ProgressGauge.Style := npbstMarquee;
     
     try
-      if not Exec(InstallFile, '/SP- /SILENT /MERGETASKS="!desktopicon"', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then begin
+      if Exec(InstallFile, '/SP- /SILENT /MERGETASKS="!desktopicon" /UPDATEPATH="'+UpdatePath+'"', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then begin
+        if ResultCode <> 0 then
+        begin
+          DeleteFile(InstallFile);
+          Abort();
+          Exit;
+        end;
+      end else
+      begin
         MsgBox('Could not run the full installer, please visit {#MyAppURL} and download the latest version manually. Error: '+SysErrorMessage(ResultCode), mbCriticalError, MB_OK);
-        DeleteFile(InstallFile);
         
+        DeleteFile(InstallFile);
         Abort();
         Exit;
       end;