\r
public class ShipListConfig\r
{\r
+ public bool Visible { get; set; }\r
public Point Location { get; set; }\r
public Size Size { get; set; }\r
+ public string Mode { get; set; }\r
public bool ShipType { get; set; }\r
+ public bool ShowHpInPercent { get; set; }\r
public ListForm.SortOrder SortOrder { get; set; } = ListForm.SortOrder.ExpToNext;\r
public List<List<int>> ShipGroup { get; set; }\r
\r
}\r
}\r
\r
- public class KancolleDbConfig\r
+ public class PushbulletConfig\r
{\r
public bool On { get; set; }\r
public string Token { get; set; } = "";\r
}\r
\r
- public class PushbulletConfig\r
+ public class PushoverConfig\r
{\r
public bool On { get; set; }\r
- public string Token { get; set; } = "";\r
+ public string ApiKey { get; set; } = "";\r
+ public string UserKey { get; set; } = "";\r
}\r
\r
public class SoundConfig\r
FlashWindow = 1,\r
ShowBaloonTip = 1 << 1,\r
PlaySound = 1 << 2,\r
+ All = (1 << 3) - 1,\r
Pushbullet = 1 << 3,\r
- All = (1 << 3) - 1 // Pushbullet以外\r
+ Push = 1 << 4,\r
+ Repeat = 1 << 5,\r
+ Cont = 1 << 6,\r
+ Preliminary = 1 << 7\r
+ }\r
+\r
+\r
+ public class NotificationSpec\r
+ {\r
+ public string Name { get; set; }\r
+ public NotificationType Flags { get; set; }\r
+ public int RepeatInterval { get; set; }\r
+ public int PreliminaryPeriod { get; set; }\r
}\r
\r
public class NotificationConfig\r
public NotificationType[] Settings =\r
Config.NotificationNames.Select(x => NotificationType.All).ToArray();\r
\r
- public NotificationType this[string name]\r
+ public int[] RepeatIntervals =\r
+ Config.NotificationNames.Select(x => 0).ToArray();\r
+\r
+ public int[] PreliminaryPeriods =\r
+ Config.NotificationNames.Select(x => 0).ToArray();\r
+\r
+ public NotificationSpec this[string name]\r
{\r
- get => Settings[Config.NotificationIndex[name]];\r
- set => Settings[Config.NotificationIndex[name]] = value;\r
+ get => new NotificationSpec\r
+ {\r
+ Name = name,\r
+ Flags = Settings[Config.NotificationIndex[name]],\r
+ RepeatInterval = RepeatIntervals[Config.NotificationIndex[name]],\r
+ PreliminaryPeriod = PreliminaryPeriods[Config.NotificationIndex[name]]\r
+ };\r
+ set\r
+ {\r
+ Settings[Config.NotificationIndex[name]] = value.Flags;\r
+ RepeatIntervals[Config.NotificationIndex[name]] = value.RepeatInterval;\r
+ PreliminaryPeriods[Config.NotificationIndex[name]] = value.PreliminaryPeriod;\r
+ }\r
}\r
}\r
\r
public Size ListSize { get; set; }\r
}\r
\r
+ [Flags]\r
+ public enum Spoiler\r
+ {\r
+ ResultRank = 1,\r
+ AirBattleResult = 1 << 1,\r
+ BattleResult = 1 << 2,\r
+ All = (1 << 3) - 1\r
+ }\r
+\r
+ [Flags]\r
+ public enum TimerKind\r
+ {\r
+ Mission = 1,\r
+ NDock = 1 << 1\r
+ }\r
+\r
public class Config\r
{\r
private readonly string _baseDir = AppDomain.CurrentDomain.BaseDirectory;\r
public bool ExitSilently { get; set; }\r
public int Zoom { get; set; } = 100;\r
public bool SaveLocationPerMachine { get; set; }\r
- public List<LocationPerMachine> LocationList { get; set; }= new List<LocationPerMachine>();\r
+ public List<LocationPerMachine> LocationList { get; set; } = new List<LocationPerMachine>();\r
+ public bool ShowHpInPercent { get; set; }\r
+ public TimerKind ShowEndTime { get; set; }\r
public bool FlashWindow { get; set; } = true;\r
- public bool ShowBaloonTip { get; set; }\r
+ public bool ShowBaloonTip { get; set; } = true;\r
public bool PlaySound { get; set; } = true;\r
+ public NotificationType NotificationFlags { get; set; } = NotificationType.All;\r
public NotificationConfig Notifications { get; set; } = new NotificationConfig();\r
public int MarginShips { get; set; } = 4;\r
public int MarginEquips { get; set; } = 10;\r
public List<int> NotifyConditions { get; set; }\r
public List<int> ResetHours { get; set; }\r
public bool AlwaysShowResultRank { get; set; }\r
+ public Spoiler Spoilers { get; set; }\r
public bool UsePresetAkashi { get; set; }\r
public SoundConfig Sounds { get; set; } = new SoundConfig();\r
public bool DebugLogging { get; set; }\r
public ProxyConfig Proxy { get; set; } = new ProxyConfig();\r
public ShipListConfig ShipList { get; set; } = new ShipListConfig();\r
public LogConfig Log { get; set; } = new LogConfig();\r
- public KancolleDbConfig KancolleDb { get; set; } = new KancolleDbConfig();\r
public PushbulletConfig Pushbullet { get; set; } = new PushbulletConfig();\r
+ public PushoverConfig Pushover { get; set; } = new PushoverConfig();\r
\r
public static readonly string[] NotificationNames =\r
{\r
config = (Config)serializer.Deserialize(file);\r
foreach (var property in GetType().GetProperties())\r
property.SetValue(this, property.GetValue(config, null), null);\r
+ var ns = Notifications.Settings;\r
+ for (var i = 0; i < ns.Length; i++)\r
+ {\r
+ if ((ns[i] & NotificationType.Pushbullet) != 0)\r
+ ns[i] = ns[i] ^ NotificationType.Pushbullet | NotificationType.Push;\r
+ }\r
+ ComposeNotificationFlags();\r
+ if (AlwaysShowResultRank)\r
+ {\r
+ Spoilers = Spoiler.All;\r
+ AlwaysShowResultRank = false;\r
+ }\r
if (SaveLocationPerMachine)\r
{\r
foreach (var l in LocationList)\r
catch (FileNotFoundException)\r
{\r
InitializeValues();\r
- ReadOldConfig();\r
Save();\r
}\r
ConvertPath(PrependBaseDir);\r
}\r
\r
+ private void ComposeNotificationFlags()\r
+ {\r
+ NotificationFlags = (NotificationFlags & ~NotificationType.All) |\r
+ (FlashWindow ? NotificationType.FlashWindow : 0) |\r
+ (ShowBaloonTip ? NotificationType.ShowBaloonTip : 0) |\r
+ (PlaySound ? NotificationType.PlaySound : 0);\r
+ }\r
+\r
public void Save()\r
{\r
if (SaveLocationPerMachine)\r
{\r
LocationList = new List<LocationPerMachine>();\r
}\r
+ DecomposeNotificationFlags();\r
ConvertPath(StripBaseDir);\r
var serializer = new XmlSerializer(typeof(Config));\r
using (var file = File.CreateText(_configFileName))\r
serializer.Serialize(file, this);\r
}\r
\r
+ private void DecomposeNotificationFlags()\r
+ {\r
+ FlashWindow = (NotificationFlags & NotificationType.FlashWindow) != 0;\r
+ ShowBaloonTip = (NotificationFlags & NotificationType.ShowBaloonTip) != 0;\r
+ PlaySound = (NotificationFlags & NotificationType.PlaySound) != 0;\r
+ }\r
+\r
private void ConvertPath(Func<string, string> func)\r
{\r
DebugLogFile = func(DebugLogFile);\r
}\r
\r
private string PrependBaseDir(string path) => Path.IsPathRooted(path) ? path : Path.Combine(_baseDir, path);\r
-\r
- private void ReadOldConfig()\r
- {\r
- var old = Path.Combine(_baseDir, "config.json");\r
- dynamic json;\r
- try\r
- {\r
- json = JsonParser.Parse(File.ReadAllText(old));\r
- }\r
- catch (FileNotFoundException)\r
- {\r
- return;\r
- }\r
- Location = new Point((int)json.Location.X, (int)json.Location.Y);\r
- foreach (var property in (from prop in GetType().GetProperties()\r
- let type = prop.PropertyType\r
- where type == typeof(bool) || type == typeof(int) || type == typeof(string)\r
- select prop))\r
- {\r
- if (!json.IsDefined(property.Name))\r
- continue;\r
- var v = json[property.Name];\r
- property.SetValue(this, property.PropertyType == typeof(int) ? (int)v : v);\r
- }\r
- NotifyConditions = new List<int>((int[])json.NotifyConditions);\r
- ResetHours = new List<int>((int[])json.ResetHours);\r
- Sounds.Volume = (int)json.SoundVolume;\r
- var idx = 0;\r
- foreach (var name in new[]\r
- {\r
- "Mission", "NDock", "KDock", "MaxShips", "MaxEquips",\r
- "DamagedShip", "Akashi20Min", "AkashiProgress", "AkashiComplete", "Condition"\r
- })\r
- {\r
- if (json.IsDefined(name + "SoundFile"))\r
- Sounds.Files[idx] = json[name + "SoundFile"];\r
- idx++;\r
- }\r
- Proxy.Auto = json.Proxy.Auto;\r
- Proxy.Listen = (int)json.Proxy.Listen;\r
- Proxy.UseUpstream = json.Proxy.UseUpstream;\r
- Proxy.UpstreamPort = (int)json.Proxy.UpstreamPort;\r
- var sl = json.ShipList;\r
- ShipList.Location = new Point((int)sl.Location.X, (int)sl.Location.Y);\r
- ShipList.Size = new Size((int)sl.Size.Width, (int)sl.Size.Height);\r
- ShipList.ShipType = sl.ShipType;\r
- var sg = (int[][])sl.ShipGroup;\r
- ShipList.ShipGroup = new List<List<int>>();\r
- foreach (var g in sg)\r
- ShipList.ShipGroup.Add(new List<int>(g));\r
- Log.On = json.Log.On;\r
- Log.OutputDir = json.Log.OutputDir;\r
- Log.MaterialLogInterval = (int)json.Log.MaterialLogInterval;\r
- }\r
}\r
}
\ No newline at end of file
OSDN Git Service
