chylex/TweetDuck
1
0
Fork 0
mirror of https://github.com/chylex/TweetDuck.git synced 2025-05-11 11:34:07 +02:00
Code

Update TweetDuck codebase to C# 7.0

Browse Source
This commit is contained in:
chylex 2017-04-28 13:29:45 +02:00
parent 37fec7e952
commit abddf61c88
39 changed files with 120 additions and 358 deletions

71
Configuration/UserConfig.cs
View File

@ -46,72 +46,44 @@ sealed class UserConfig{
public string CustomBrowserCSS { get; set; }
public string CustomNotificationCSS { get; set; }
public bool IsCustomNotificationPositionSet{
get{
return CustomNotificationPosition != ControlExtensions.InvisibleLocation;
}
public bool IsCustomNotificationPositionSet => CustomNotificationPosition != ControlExtensions.InvisibleLocation;
public string NotificationSoundPath{
get => string.IsNullOrEmpty(notificationSoundPath) ? string.Empty : notificationSoundPath;
set => notificationSoundPath = value;
}
public bool MuteNotifications{
get{
return muteNotifications;
}
get => muteNotifications;
set{
if (muteNotifications == value)return;
muteNotifications = value;
if (MuteToggled != null){
MuteToggled(this, new EventArgs());
if (muteNotifications != value){
muteNotifications = value;
MuteToggled?.Invoke(this, new EventArgs());
}
}
}
public int ZoomLevel{
get{
return zoomLevel;
}
get => zoomLevel;
set{
if (zoomLevel == value)return;
zoomLevel = value;
if (ZoomLevelChanged != null){
ZoomLevelChanged(this, new EventArgs());
if (zoomLevel != value){
zoomLevel = value;
ZoomLevelChanged?.Invoke(this, new EventArgs());
}
}
}
public double ZoomMultiplier{
get{
return zoomLevel/100.0;
}
}
public string NotificationSoundPath{
get{
return string.IsNullOrEmpty(notificationSoundPath) ? string.Empty : notificationSoundPath;
}
set{
notificationSoundPath = value;
}
}
public double ZoomMultiplier => zoomLevel/100.0;
public TrayIcon.Behavior TrayBehavior{
get{
return trayBehavior;
}
get => trayBehavior;
set{
if (trayBehavior == value)return;
trayBehavior = value;
if (TrayBehaviorChanged != null){
TrayBehaviorChanged(this, new EventArgs());
if (trayBehavior != value){
trayBehavior = value;
TrayBehaviorChanged?.Invoke(this, new EventArgs());
}
}
}
@ -247,11 +219,8 @@ public static UserConfig Load(string file){
config.file = file;
}
}
if (config != null){
config.UpgradeFile();
}
config?.UpgradeFile();
break;
}catch(FileNotFoundException){
}catch(DirectoryNotFoundException){

6
Core/Controls/FlatButton.cs
View File

@ -3,11 +3,7 @@
namespace TweetDck.Core.Controls{
class FlatButton : Button{
protected override bool ShowFocusCues{
get{
return false;
}
}
protected override bool ShowFocusCues => false;
public FlatButton(){
GotFocus += FlatButton_GotFocus;

14
Core/Controls/TabPanel.cs
View File

@ -6,21 +6,11 @@
namespace TweetDck.Core.Controls{
sealed partial class TabPanel : UserControl{
public IEnumerable<TabButton> Buttons{
get{
return panelButtons.Controls.Cast<TabButton>();
}
}
public Panel Content => panelContent;
public IEnumerable<TabButton> Buttons => panelButtons.Controls.Cast<TabButton>();
public TabButton ActiveButton { get; private set; }
// ReSharper disable once ConvertToAutoPropertyWithPrivateSetter
public Panel Content{
get{
return panelContent;
}
}
private int btnWidth;
public TabPanel(){

17
Core/FormBrowser.cs
View File

@ -23,11 +23,7 @@
namespace TweetDck.Core{
sealed partial class FormBrowser : Form{
private static UserConfig Config{
get{
return Program.UserConfig;
}
}
private static UserConfig Config => Program.UserConfig;
public string UpdateInstallerPath { get; private set; }
@ -93,13 +89,8 @@ public FormBrowser(PluginManager pluginManager, UpdaterSettings updaterSettings)
browser.Dispose();
contextMenu.Dispose();
if (notificationScreenshotManager != null){
notificationScreenshotManager.Dispose();
}
if (soundNotification != null){
soundNotification.Dispose();
}
notificationScreenshotManager?.Dispose();
soundNotification?.Dispose();
};
this.trayIcon.ClickRestore += trayIcon_ClickRestore;
@ -365,7 +356,7 @@ public void ResumeNotification(){
// javascript calls
public void ReinjectCustomCSS(string css){
browser.ExecuteScriptAsync("TDGF_reinjectCustomCSS", css == null ? string.Empty : css.Replace(Environment.NewLine, " "));
browser.ExecuteScriptAsync("TDGF_reinjectCustomCSS", css?.Replace(Environment.NewLine, " ") ?? string.Empty);
}
public void UpdateProperties(PropertyBridge.Properties properties){

3
Core/Handling/BrowserProcessHandler.cs
View File

@ -5,8 +5,7 @@ namespace TweetDck.Core.Handling{
class BrowserProcessHandler : IBrowserProcessHandler{
void IBrowserProcessHandler.OnContextInitialized(){
using(IRequestContext ctx = Cef.GetGlobalRequestContext()){
string err;
ctx.SetPreference("browser.enable_spellchecking", Program.UserConfig.EnableSpellCheck, out err);
ctx.SetPreference("browser.enable_spellchecking", Program.UserConfig.EnableSpellCheck, out string _);
}
}

7
Core/Handling/ResourceHandlerNotification.cs
View File

@ -9,10 +9,7 @@ class ResourceHandlerNotification : IResourceHandler{
private MemoryStream dataIn;
public void SetHTML(string html){
if (dataIn != null){
dataIn.Dispose();
}
dataIn?.Dispose();
dataIn = ResourceHandler.GetMemoryStream(html, Encoding.UTF8);
}
@ -35,7 +32,7 @@ void IResourceHandler.GetResponseHeaders(IResponse response, out long responseLe
response.StatusCode = 200;
response.StatusText = "OK";
response.ResponseHeaders = headers;
responseLength = dataIn != null ? dataIn.Length : -1;
responseLength = dataIn?.Length ?? -1;
}
bool IResourceHandler.ReadResponse(Stream dataOut, out int bytesRead, ICallback callback){

32
Core/Notification/FormNotificationBase.cs
View File

@ -50,23 +50,15 @@ protected Point PrimaryLocation{
}
}
public bool IsNotificationVisible{
get{
return Location != ControlExtensions.InvisibleLocation;
}
}
public bool IsNotificationVisible => Location != ControlExtensions.InvisibleLocation;
public new Point Location{
get{
return base.Location;
}
set{
Visible = (base.Location = value) != ControlExtensions.InvisibleLocation;
}
get => base.Location;
set => Visible = (base.Location = value) != ControlExtensions.InvisibleLocation;
}
public Func<bool> CanMoveWindow = () => true;
protected override bool ShowWithoutActivation => true;
protected readonly Form owner;
protected readonly ChromiumWebBrowser browser;
@ -76,17 +68,7 @@ public bool IsNotificationVisible{
private string currentColumn;
private int pauseCounter;
public bool IsPaused{
get{
return pauseCounter > 0;
}
}
protected override bool ShowWithoutActivation{
get{
return true;
}
}
public bool IsPaused => pauseCounter > 0;
public bool FreezeTimer { get; set; }
public bool ContextMenuOpen { get; set; }
@ -143,8 +125,8 @@ private void owner_FormClosed(object sender, FormClosedEventArgs e){
}
private void Browser_IsBrowserInitializedChanged(object sender, IsBrowserInitializedChangedEventArgs e){
if (e.IsBrowserInitialized && Initialized != null){
Initialized(this, new EventArgs());
if (e.IsBrowserInitialized){
Initialized?.Invoke(this, new EventArgs());
}
}

6
Core/Notification/FormNotificationTweet.cs
View File

@ -10,11 +10,7 @@ sealed partial class FormNotificationTweet : FormNotificationMain{
private const int NonIntrusiveIdleLimit = 30;
private const int TrimMinimum = 32;
private bool IsCursorOverNotificationArea{
get{
return new Rectangle(PrimaryLocation, Size).Contains(Cursor.Position);
}
}
private bool IsCursorOverNotificationArea => new Rectangle(PrimaryLocation, Size).Contains(Cursor.Position);
private readonly Queue<TweetNotification> tweetQueue = new Queue<TweetNotification>(4);
private bool needsTrim;

5
Core/Notification/Screenshot/TweetScreenshotManager.cs
View File

@ -69,10 +69,7 @@ private void Callback(){
public void Dispose(){
timeout.Dispose();
disposer.Dispose();
if (screenshot != null){
screenshot.Dispose();
}
screenshot?.Dispose();
}
}
}

2
Core/Notification/Sound/PlaybackErrorEventArgs.cs
View File

@ -2,7 +2,7 @@
namespace TweetDck.Core.Notification.Sound{
sealed class PlaybackErrorEventArgs : EventArgs{
public string Message { get; private set; }
public string Message { get; }
public bool Ignore { get; set; }
public PlaybackErrorEventArgs(string message){

6
Core/Notification/Sound/SoundPlayerImplFallback.cs
View File

@ -4,11 +4,7 @@
namespace TweetDck.Core.Notification.Sound{
sealed class SoundPlayerImplFallback : ISoundNotificationPlayer{
string ISoundNotificationPlayer.SupportedFormats{
get{
return "*.wav";
}
}
string ISoundNotificationPlayer.SupportedFormats => "*.wav";
public event EventHandler<PlaybackErrorEventArgs> PlaybackError;

6
Core/Notification/Sound/SoundPlayerImplWMP.cs
View File

@ -5,11 +5,7 @@
namespace TweetDck.Core.Notification.Sound{
sealed class SoundPlayerImplWMP : ISoundNotificationPlayer{
string ISoundNotificationPlayer.SupportedFormats{
get{
return "*.wav;*.mp3;*.mp2;*.m4a;*.mid;*.midi;*.rmi;*.wma;*.aif;*.aifc;*.aiff;*.snd;*.au";
}
}
string ISoundNotificationPlayer.SupportedFormats => "*.wav;*.mp3;*.mp2;*.m4a;*.mid;*.midi;*.rmi;*.wma;*.aif;*.aifc;*.aiff;*.snd;*.au";
public event EventHandler<PlaybackErrorEventArgs> PlaybackError;

20
Core/Notification/TweetNotification.cs
View File

@ -51,23 +51,9 @@ public enum Position{
TopLeft, TopRight, BottomLeft, BottomRight, Custom
}
public string Column{
get{
return column;
}
}
public string TweetUrl{
get{
return tweetUrl;
}
}
public string QuoteUrl{
get{
return quoteUrl;
}
}
public string Column => column;
public string TweetUrl => tweetUrl;
public string QuoteUrl => quoteUrl;
private readonly string column;
private readonly string html;

15
Core/Other/FormMessage.cs
View File

@ -6,20 +6,11 @@ namespace TweetDck.Core.Other{
sealed partial class FormMessage : Form{
public Button ClickedButton { get; private set; }
public int ActionPanelY{
get{
return panelActions.Location.Y;
}
}
public int ActionPanelY => panelActions.Location.Y;
private int ClientWidth{
get{
return ClientSize.Width;
}
set{
ClientSize = new Size(value, ClientSize.Height);
}
get => ClientSize.Width;
set => ClientSize = new Size(value, ClientSize.Height);
}
private readonly Icon icon;

4
Core/Other/FormSettings.cs
View File

@ -31,9 +31,7 @@ public FormSettings(FormBrowser browser, PluginManager plugins, UpdateHandler up
}
private void SelectTab<T>(Func<T> constructor) where T : BaseTabSettings{
BaseTabSettings control;
if (tabs.TryGetValue(typeof(T), out control)){
if (tabs.TryGetValue(typeof(T), out BaseTabSettings control)){
tabPanel.ReplaceContent(control);
}
else{

6
Core/Other/Settings/BaseTabSettings.cs
View File

@ -3,11 +3,7 @@
namespace TweetDck.Core.Other.Settings{
class BaseTabSettings : UserControl{
protected static UserConfig Config{
get{
return Program.UserConfig;
}
}
protected static UserConfig Config => Program.UserConfig;
public BaseTabSettings(){
Padding = new Padding(6);

13
Core/Other/Settings/Dialogs/DialogSettingsCSS.cs
View File

@ -5,17 +5,8 @@
namespace TweetDck.Core.Other.Settings.Dialogs{
sealed partial class DialogSettingsCSS : Form{
public string BrowserCSS{
get{
return textBoxBrowserCSS.Text;
}
}
public string NotificationCSS{
get{
return textBoxNotificationCSS.Text;
}
}
public string BrowserCSS => textBoxBrowserCSS.Text;
public string NotificationCSS => textBoxNotificationCSS.Text;
private readonly Action<string> reinjectBrowserCSS;

6
Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs
View File

@ -5,11 +5,7 @@
namespace TweetDck.Core.Other.Settings.Dialogs{
sealed partial class DialogSettingsCefArgs : Form{
public string CefArgs{
get{
return textBoxArgs.Text;
}
}
public string CefArgs => textBoxArgs.Text;
public DialogSettingsCefArgs(){
InitializeComponent();

4
Core/Other/Settings/Dialogs/DialogSettingsExport.cs
View File

@ -13,9 +13,7 @@ public static DialogSettingsExport Export(){
}
public ExportFileFlags Flags{
get{
return selectedFlags;
}
get => selectedFlags;
set{
// this will call events and SetFlag, which also updates the UI

2
Core/Other/Settings/Export/CombinedFileStream.cs
View File

@ -92,7 +92,7 @@ void IDisposable.Dispose(){
}
public class Entry{
public string Identifier { get; private set; }
public string Identifier { get; }
public string KeyName{
get{

12
Core/TrayIcon.cs
View File

@ -12,9 +12,7 @@ public enum Behavior{ // keep order
public event EventHandler ClickClose;
public bool Visible{
get{
return notifyIcon.Visible;
}
get => notifyIcon.Visible;
set{
if (value){
@ -72,9 +70,7 @@ private void contextMenu_Popup(object sender, EventArgs e){
}
private void menuItemRestore_Click(object sender, EventArgs e){
if (ClickRestore != null){
ClickRestore(this, e);
}
ClickRestore?.Invoke(this, e);
}
private void menuItemMuteNotifications_Click(object sender, EventArgs e){
@ -83,9 +79,7 @@ private void menuItemMuteNotifications_Click(object sender, EventArgs e){
}
private void menuItemClose_Click(object sender, EventArgs e){
if (ClickClose != null){
ClickClose(this, e);
}
ClickClose?.Invoke(this, e);
}
}

10
Core/Utils/BrowserUtils.cs
View File

@ -23,11 +23,7 @@ public static string HeaderAcceptLanguage{
}
}
public static string HeaderUserAgent{
get{
return Program.BrandName+" "+Application.ProductVersion;
}
}
public static string HeaderUserAgent => Program.BrandName+" "+Application.ProductVersion;
public static readonly Color BackgroundColor = Color.FromArgb(28, 99, 153);
public const string BackgroundColorFix = "let e=document.createElement('style');document.head.appendChild(e);e.innerHTML='body::before{background:#1c6399!important}'";
@ -37,9 +33,7 @@ public static string HeaderUserAgent{
};
public static bool IsValidUrl(string url){
Uri uri;
if (Uri.TryCreate(url, UriKind.Absolute, out uri)){
if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
string scheme = uri.Scheme;
return scheme == Uri.UriSchemeHttp || scheme == Uri.UriSchemeHttps || scheme == Uri.UriSchemeFtp || scheme == Uri.UriSchemeMailto;
}

9
Core/Utils/CommandLineArgs.cs
View File

@ -35,11 +35,7 @@ public static void ReadStringArray(char entryChar, string[] array, CommandLineAr
private readonly HashSet<string> flags = new HashSet<string>();
private readonly Dictionary<string, string> values = new Dictionary<string, string>();
public int Count{
get{
return flags.Count+values.Count;
}
}
public int Count => flags.Count+values.Count;
public void AddFlag(string flag){
flags.Add(flag.ToLowerInvariant());
@ -62,8 +58,7 @@ public bool HasValue(string key){
}
public string GetValue(string key, string defaultValue){
string val;
return values.TryGetValue(key.ToLowerInvariant(), out val) ? val : defaultValue;
return values.TryGetValue(key.ToLowerInvariant(), out string val) ? val : defaultValue;
}
public void RemoveValue(string key){

6
Core/Utils/CommandLineArgsParser.cs
View File

@ -4,11 +4,7 @@ namespace TweetDck.Core.Utils{
static class CommandLineArgsParser{
private static Regex splitRegex;
private static Regex SplitRegex{
get{
return splitRegex ?? (splitRegex = new Regex(@"([^=\s]+(?:=(?:[^ ]*""[^""]*?""[^ ]*|[^ ]*))?)", RegexOptions.Compiled));
}
}
private static Regex SplitRegex => splitRegex ?? (splitRegex = new Regex(@"([^=\s]+(?:=(?:[^ ]*""[^""]*?""[^ ]*|[^ ]*))?)", RegexOptions.Compiled));
public static CommandLineArgs ReadCefArguments(string argumentString){
CommandLineArgs args = new CommandLineArgs();

13
Core/Utils/HardwareAcceleration.cs
View File

@ -9,18 +9,9 @@ static class HardwareAcceleration{
private static readonly string DisabledLibEGL = LibEGL+".bak";
private static readonly string DisabledLibGLES = LibGLES+".bak";
public static bool IsEnabled{
get{
return File.Exists(LibEGL) && File.Exists(LibGLES);
}
}
public static bool IsEnabled => File.Exists(LibEGL) && File.Exists(LibGLES);
public static bool CanEnable => File.Exists(DisabledLibEGL) && File.Exists(DisabledLibGLES);
public static bool CanEnable{
get{
return File.Exists(DisabledLibEGL) && File.Exists(DisabledLibGLES);
}
}
public static bool Enable(){
if (IsEnabled)return false;

20
Core/Utils/TwoKeyDictionary.cs
View File

@ -21,9 +21,7 @@ public TwoKeyDictionary(int outerCapacity, int innerCapacity){
}
set{
Dictionary<K2, V> innerDict;
if (!dict.TryGetValue(outerKey, out innerDict)){
if (!dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict)){
dict.Add(outerKey, innerDict = new Dictionary<K2, V>(innerCapacity));
}
@ -44,9 +42,7 @@ public IEnumerable<V> InnerValues{
// Members
public void Add(K1 outerKey, K2 innerKey, V value){ // throws on duplicate
Dictionary<K2, V> innerDict;
if (!dict.TryGetValue(outerKey, out innerDict)){
if (!dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict)){
dict.Add(outerKey, innerDict = new Dictionary<K2, V>(innerCapacity));
}
@ -54,7 +50,7 @@ public void Add(K1 outerKey, K2 innerKey, V value){ // throws on duplicate
}
public void Clear(){
this.dict.Clear();
dict.Clear();
}
public void Clear(K1 outerKey){ // throws on missing key, but keeps the key unlike Remove(K1)
@ -83,10 +79,8 @@ public bool Remove(K1 outerKey){
}
public bool Remove(K1 outerKey, K2 innerKey){
Dictionary<K2, V> innerDict;
if (dict.TryGetValue(outerKey, out innerDict) && innerDict.Remove(innerKey)){
if (innerDict.Count == 0){
if (dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict) && innerDict.Remove(innerKey)){
if (innerDict.Count == 0) {
dict.Remove(outerKey);
}
@ -96,9 +90,7 @@ public bool Remove(K1 outerKey, K2 innerKey){
}
public bool TryGetValue(K1 outerKey, K2 innerKey, out V value){
Dictionary<K2, V> innerDict;
if (dict.TryGetValue(outerKey, out innerDict)){
if (dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict)){
return innerDict.TryGetValue(innerKey, out value);
}
else{

4
Plugins/Events/PluginChangedStateEventArgs.cs
View File

@ -2,8 +2,8 @@
namespace TweetDck.Plugins.Events{
class PluginChangedStateEventArgs : EventArgs{
public Plugin Plugin { get; private set; }
public bool IsEnabled { get; private set; }
public Plugin Plugin { get; }
public bool IsEnabled { get; }
public PluginChangedStateEventArgs(Plugin plugin, bool isEnabled){
this.Plugin = plugin;

6
Plugins/Events/PluginErrorEventArgs.cs
View File

@ -3,11 +3,7 @@
namespace TweetDck.Plugins.Events{
class PluginErrorEventArgs : EventArgs{
public bool HasErrors{
get{
return Errors.Count > 0;
}
}
public bool HasErrors => Errors.Count > 0;
public IList<string> Errors;

54
Plugins/Plugin.cs
View File

@ -7,51 +7,41 @@
namespace TweetDck.Plugins{
class Plugin{
public string Identifier { get { return identifier; } }
public string Name { get { return metadata["NAME"]; } }
public string Description { get { return metadata["DESCRIPTION"]; } }
public string Author { get { return metadata["AUTHOR"]; } }
public string Version { get { return metadata["VERSION"]; } }
public string Website { get { return metadata["WEBSITE"]; } }
public string ConfigFile { get { return metadata["CONFIGFILE"]; } }
public string ConfigDefault { get { return metadata["CONFIGDEFAULT"]; } }
public string RequiredVersion { get { return metadata["REQUIRES"]; } }
public PluginGroup Group { get; private set; }
public string Identifier { get; }
public PluginGroup Group { get; }
public PluginEnvironment Environments { get; private set; }
public string Name => metadata["NAME"];
public string Description => metadata["DESCRIPTION"];
public string Author => metadata["AUTHOR"];
public string Version => metadata["VERSION"];
public string Website => metadata["WEBSITE"];
public string ConfigFile => metadata["CONFIGFILE"];
public string ConfigDefault => metadata["CONFIGDEFAULT"];
public string RequiredVersion => metadata["REQUIRES"];
public bool CanRun{
get{
return canRun ?? (canRun = CheckRequiredVersion(RequiredVersion)).Value;
}
get => canRun ?? (canRun = CheckRequiredVersion(RequiredVersion)).Value;
}
public bool HasConfig{
get{
return ConfigFile.Length > 0 && GetFullPathIfSafe(PluginFolder.Data, ConfigFile).Length > 0;
}
get => ConfigFile.Length > 0 && GetFullPathIfSafe(PluginFolder.Data, ConfigFile).Length > 0;
}
public string ConfigPath{
get{
return HasConfig ? Path.Combine(GetPluginFolder(PluginFolder.Data), ConfigFile) : string.Empty;
}
get => HasConfig ? Path.Combine(GetPluginFolder(PluginFolder.Data), ConfigFile) : string.Empty;
}
public bool HasDefaultConfig{
get{
return ConfigDefault.Length > 0 && GetFullPathIfSafe(PluginFolder.Root, ConfigDefault).Length > 0;
}
get => ConfigDefault.Length > 0 && GetFullPathIfSafe(PluginFolder.Root, ConfigDefault).Length > 0;
}
public string DefaultConfigPath{
get{
return HasDefaultConfig ? Path.Combine(GetPluginFolder(PluginFolder.Root), ConfigDefault) : string.Empty;
}
get => HasDefaultConfig ? Path.Combine(GetPluginFolder(PluginFolder.Root), ConfigDefault) : string.Empty;
}
private readonly string pathRoot;
private readonly string pathData;
private readonly string identifier;
private readonly Dictionary<string, string> metadata = new Dictionary<string, string>(4){
{ "NAME", "" },
{ "DESCRIPTION", "" },
@ -72,7 +62,7 @@ private Plugin(string path, PluginGroup group){
this.pathRoot = path;
this.pathData = Path.Combine(Program.PluginDataPath, group.GetIdentifierPrefix(), name);
this.identifier = group.GetIdentifierPrefix()+name;
this.Identifier = group.GetIdentifierPrefix()+name;
this.Group = group;
this.Environments = PluginEnvironment.None;
}
@ -103,7 +93,7 @@ private void OnMetadataLoaded(){
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);
Program.Reporter.HandleException("Plugin Loading Error", "Could not generate a configuration file for '"+Identifier+"' plugin.", true, e);
}
}
}
@ -154,12 +144,12 @@ public override string ToString(){
}
public override int GetHashCode(){
return identifier.GetHashCode();
return Identifier.GetHashCode();
}
public override bool Equals(object obj){
Plugin plugin = obj as Plugin;
return plugin != null && plugin.identifier.Equals(identifier);
return plugin != null && plugin.Identifier.Equals(Identifier);
}
public static Plugin CreateFromFolder(string path, PluginGroup group, out string error){
@ -236,9 +226,7 @@ private static bool LoadMetadata(string path, Plugin plugin, out string error){
return false;
}
Version ver;
if (plugin.RequiredVersion.Length == 0 || !(plugin.RequiredVersion.Equals("*") || System.Version.TryParse(plugin.RequiredVersion, out ver))){
if (plugin.RequiredVersion.Length == 0 || !(plugin.RequiredVersion.Equals("*") || System.Version.TryParse(plugin.RequiredVersion, out Version _))){
error = "Plugin contains invalid version: "+plugin.RequiredVersion;
return false;
}

10
Plugins/PluginBridge.cs
View File

@ -16,11 +16,7 @@ private static string SanitizeCacheKey(string key){
private readonly TwoKeyDictionary<int, string, string> fileCache = new TwoKeyDictionary<int, string, string>(4, 2);
private readonly TwoKeyDictionary<int, string, InjectedHTML> notificationInjections = new TwoKeyDictionary<int,string,InjectedHTML>(4, 1);
public IEnumerable<InjectedHTML> NotificationInjections{
get{
return notificationInjections.InnerValues;
}
}
public IEnumerable<InjectedHTML> NotificationInjections => notificationInjections.InnerValues;
public PluginBridge(PluginManager manager){
this.manager = manager;
@ -63,10 +59,8 @@ private string GetFullPathOrThrow(int token, PluginFolder folder, string path){
private string ReadFileUnsafe(int token, string cacheKey, string fullPath, bool readCached){
cacheKey = SanitizeCacheKey(cacheKey);
string cachedContents;
if (readCached && fileCache.TryGetValue(token, cacheKey, out cachedContents)){
if (readCached && fileCache.TryGetValue(token, cacheKey, out string cachedContents)){
return cachedContents;
}

17
Plugins/PluginConfig.cs
View File

@ -8,25 +8,14 @@ sealed class PluginConfig{
[field:NonSerialized]
public event EventHandler<PluginChangedStateEventArgs> InternalPluginChangedState; // should only be accessed from PluginManager
public IEnumerable<string> DisabledPlugins{
get{
return Disabled;
}
}
public bool AnyDisabled{
get{
return Disabled.Count > 0;
}
}
public IEnumerable<string> DisabledPlugins => Disabled;
public bool AnyDisabled => Disabled.Count > 0;
private readonly HashSet<string> Disabled = new HashSet<string>();
public void SetEnabled(Plugin plugin, bool enabled){
if ((enabled && Disabled.Remove(plugin.Identifier)) || (!enabled && Disabled.Add(plugin.Identifier))){
if (InternalPluginChangedState != null){
InternalPluginChangedState(this, new PluginChangedStateEventArgs(plugin, enabled));
}
InternalPluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
}
}

26
Plugins/PluginManager.cs
View File

@ -15,12 +15,12 @@ sealed class PluginManager{
private const int InvalidToken = 0;
public string PathOfficialPlugins { get { return Path.Combine(rootPath, "official"); } }
public string PathCustomPlugins { get { return Path.Combine(rootPath, "user"); } }
public string PathOfficialPlugins => Path.Combine(rootPath, "official");
public string PathCustomPlugins => Path.Combine(rootPath, "user");
public IEnumerable<Plugin> Plugins { get { return plugins; } }
public IEnumerable<Plugin> Plugins => plugins;
public PluginConfig Config { get; private set; }
public PluginBridge Bridge { get; private set; }
public PluginBridge Bridge { get; }
public event EventHandler<PluginErrorEventArgs> Reloaded;
public event EventHandler<PluginErrorEventArgs> Executed;
@ -47,9 +47,7 @@ private void Program_UserConfigReplaced(object sender, EventArgs e){
}
private void Config_InternalPluginChangedState(object sender, PluginChangedStateEventArgs e){
if (PluginChangedState != null){
PluginChangedState(this, e);
}
PluginChangedState?.Invoke(this, e);
}
private void SetConfig(PluginConfig config){
@ -88,8 +86,7 @@ public int GetTokenFromPlugin(Plugin plugin){
}
public Plugin GetPluginFromToken(int token){
Plugin plugin;
return tokens.TryGetValue(token, out plugin) ? plugin : null;
return tokens.TryGetValue(token, out Plugin plugin) ? plugin : null;
}
public void Reload(){
@ -106,9 +103,7 @@ public void Reload(){
plugins.Add(plugin);
}
if (Reloaded != null){
Reloaded(this, new PluginErrorEventArgs(loadErrors));
}
Reloaded?.Invoke(this, new PluginErrorEventArgs(loadErrors));
}
public void ExecutePlugins(IFrame frame, PluginEnvironment environment, bool includeDisabled){
@ -144,9 +139,7 @@ public void ExecutePlugins(IFrame frame, PluginEnvironment environment, bool inc
ScriptLoader.ExecuteScript(frame, PluginScriptGenerator.GeneratePlugin(plugin.Identifier, script, token, environment), "plugin:"+plugin);
}
if (Executed != null){
Executed(this, new PluginErrorEventArgs(failedPlugins));
}
Executed?.Invoke(this, new PluginErrorEventArgs(failedPlugins));
}
private IEnumerable<Plugin> LoadPluginsFrom(string path, PluginGroup group){
@ -155,8 +148,7 @@ private IEnumerable<Plugin> LoadPluginsFrom(string path, PluginGroup group){
}
foreach(string fullDir in Directory.EnumerateDirectories(path, "*", SearchOption.TopDirectoryOnly)){
string error;
Plugin plugin = Plugin.CreateFromFolder(fullDir, group, out error);
Plugin plugin = Plugin.CreateFromFolder(fullDir, group, out string error);
if (plugin == null){
loadErrors.Add(group.GetIdentifierPrefix()+Path.GetFileName(fullDir)+": "+error);

5
Program.cs
View File

@ -213,10 +213,7 @@ private static string GetDataStoragePath(){
public static void ReloadConfig(){
UserConfig = UserConfig.Load(ConfigFilePath);
if (UserConfigReplaced != null){
UserConfigReplaced(UserConfig, new EventArgs());
}
UserConfigReplaced?.Invoke(UserConfig, new EventArgs());
}
public static void ResetConfig(){

1
TweetDck.csproj
View File

@ -42,6 +42,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<UseVSHostingProcess>false</UseVSHostingProcess>
<LangVersion>7</LangVersion>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Resources\icon.ico</ApplicationIcon>

6
Updates/Events/UpdateCheckEventArgs.cs
View File

@ -2,9 +2,9 @@
namespace TweetDck.Updates.Events{
class UpdateCheckEventArgs : EventArgs{
public int EventId { get; private set; }
public bool UpdateAvailable { get; private set; }
public string LatestVersion { get; private set; }
public int EventId { get; }
public bool UpdateAvailable { get; }
public string LatestVersion { get; }
public UpdateCheckEventArgs(int eventId, bool updateAvailable, string latestVersion){
EventId = eventId;

6
Updates/FormUpdateDownload.cs
View File

@ -10,11 +10,7 @@ namespace TweetDck.Updates{
sealed partial class FormUpdateDownload : Form{
private const double BytesToKB = 1024.0;
public string InstallerPath{
get{
return Path.Combine(Path.GetTempPath(), updateInfo.FileName);
}
}
public string InstallerPath => Path.Combine(Path.GetTempPath(), updateInfo.FileName);
public enum Status{
Waiting, Failed, Cancelled, Manual, Succeeded

16
Updates/UpdateHandler.cs
View File

@ -9,11 +9,7 @@
namespace TweetDck.Updates{
sealed class UpdateHandler{
private static bool IsSystemSupported{
get{
return true; // Environment.OSVersion.Version >= new Version("6.1"); // 6.1 NT version = Windows 7
}
}
private static bool IsSystemSupported => true; // Environment.OSVersion.Version >= new Version("6.1"); // 6.1 NT version = Windows 7
private readonly ChromiumWebBrowser browser;
private readonly FormBrowser form;
@ -61,10 +57,7 @@ public int Check(bool force){
public void DismissUpdate(string tag){
settings.DismissedUpdate = tag;
if (UpdateDismissed != null){
UpdateDismissed(this, new UpdateDismissedEventArgs(tag));
}
UpdateDismissed?.Invoke(this, new UpdateDismissedEventArgs(tag));
}
private void TriggerUpdateAcceptedEvent(UpdateAcceptedEventArgs args){
@ -76,10 +69,7 @@ private void TriggerUpdateAcceptedEvent(UpdateAcceptedEventArgs args){
private void TriggerUpdateDismissedEvent(UpdateDismissedEventArgs args){
form.InvokeAsyncSafe(() => {
settings.DismissedUpdate = args.VersionTag;
if (UpdateDismissed != null){
UpdateDismissed(this, args);
}
UpdateDismissed?.Invoke(this, args);
});
}

6
Updates/UpdateInfo.cs
View File

@ -5,11 +5,7 @@ class UpdateInfo{
public readonly string VersionTag;
public readonly string DownloadUrl;
public string FileName{
get{
return BrowserUtils.GetFileNameFromUrl(DownloadUrl) ?? Program.BrandName+".Update.exe";
}
}
public string FileName => BrowserUtils.GetFileNameFromUrl(DownloadUrl) ?? Program.BrandName+".Update.exe";
public UpdateInfo(string versionTag, string downloadUrl){
this.VersionTag = versionTag;

6
tests/Core/Utils/TestInjectedHTML.cs
View File

@ -7,11 +7,7 @@
namespace UnitTests.Core.Utils{
[TestClass]
public class TestInjectedHTML{
private static IEnumerable<InjectedHTML.Position> Positions{
get{
return Enum.GetValues(typeof(InjectedHTML.Position)).Cast<InjectedHTML.Position>();
}
}
private static IEnumerable<InjectedHTML.Position> Positions => Enum.GetValues(typeof(InjectedHTML.Position)).Cast<InjectedHTML.Position>();
[TestMethod]
public void TestFailedMatches(){