X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=KancolleSniffer%2FSniffer.cs;h=2632c7e3b0097a40cece76de824e88a3813be6e3;hb=f893816510e81ea2c417e9a0f6b2cab77351f563;hp=31c240b3c74bea9d6c1a527dda3a5f0e55eb7641;hpb=f8025ed9b74a7cf29025a299567f12b7a349cee0;p=kancollesniffer%2FKancolleSniffer.git diff --git a/KancolleSniffer/Sniffer.cs b/KancolleSniffer/Sniffer.cs index 31c240b..2632c7e 100644 --- a/KancolleSniffer/Sniffer.cs +++ b/KancolleSniffer/Sniffer.cs @@ -1,176 +1,246 @@ -// Copyright (C) 2013, 2014 Kazuhiro Fujieda +// Copyright (C) 2013, 2014, 2015 Kazuhiro Fujieda // -// This program is part of KancolleSniffer. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at // -// KancolleSniffer is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. +// http://www.apache.org/licenses/LICENSE-2.0 // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, see . +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. using System; -using System.IO; +using System.Collections.Generic; +using System.Linq; namespace KancolleSniffer { public class Sniffer { private bool _start; - private readonly ShipMaster _shipMaster = new ShipMaster(); private readonly ItemInfo _itemInfo = new ItemInfo(); + private readonly MaterialInfo _materialInfo = new MaterialInfo(); private readonly QuestInfo _questInfo = new QuestInfo(); private readonly MissionInfo _missionInfo = new MissionInfo(); private readonly ShipInfo _shipInfo; + private readonly ConditionTimer _conditionTimer; private readonly DockInfo _dockInfo; private readonly AkashiTimer _akashiTimer; private readonly Achievement _achievement = new Achievement(); private readonly BattleInfo _battleInfo; + private readonly Logger _logger; + private readonly ExMapInfo _exMapInfo = new ExMapInfo(); + private readonly MiscTextInfo _miscTextInfo = new MiscTextInfo(); private readonly Status _status = new Status(); + private bool _saveState; + private readonly List _haveState; [Flags] public enum Update { None = 0, - Start = 1, - Item = 2, - Ship = 4, - Timer = 8, - NDock = 16, - Mission = 32, - QuestList = 64, - Battle = 128, - All = 255 + Error = 1 << 0, + Start = 1 << 1, + Item = 1 << 2, + Ship = 1 << 3, + Timer = 1 << 4, + NDock = 1 << 5, + Mission = 1 << 6, + QuestList = 1 << 7, + Battle = 1 << 8, + All = (1 << 9) - 1 } public Sniffer() { - _shipInfo = new ShipInfo(_shipMaster, _itemInfo); - _dockInfo = new DockInfo(_shipInfo, _itemInfo); - _akashiTimer = new AkashiTimer(_shipInfo, _itemInfo, _dockInfo); - _battleInfo = new BattleInfo(_shipMaster, _shipInfo, _itemInfo); + _shipInfo = new ShipInfo(_itemInfo); + _conditionTimer = new ConditionTimer(_shipInfo); + _dockInfo = new DockInfo(_shipInfo, _materialInfo); + _akashiTimer = new AkashiTimer(_shipInfo, _dockInfo); + _battleInfo = new BattleInfo(_shipInfo, _itemInfo); + _logger = new Logger(_shipInfo, _itemInfo, _battleInfo); + _haveState = new List {_achievement, _materialInfo, _conditionTimer, _exMapInfo}; } - public void SaveState() + private void SaveState() { - _achievement.SaveState(_status); - _itemInfo.SaveState(_status); + if (!_saveState) + return; + if (!_haveState.Any(x => x.NeedSave)) + return; + foreach (var x in _haveState) + x.SaveState(_status); _status.Save(); } public void LoadState() { _status.Load(); - _achievement.LoadState(_status); - _itemInfo.LoadSate(_status); + foreach (var x in _haveState) + x.LoadState(_status); + _saveState = true; } public Update Sniff(string url, string request, dynamic json) { - var data = json.IsDefined("api_data") ? json.api_data : new object(); - - if (LogFile != null) - { - File.AppendAllText(LogFile, - string.Format("url: {0}\nrequest: {1}\nresponse: {2}\n", url, request, json.ToString())); - } + if (!json.api_result()) + return Update.Error; + if ((int)json.api_result != 1) + return Update.None; + var data = json.api_data() ? json.api_data : new object(); if (url.EndsWith("api_start2")) { - _start = true; - _shipMaster.Inspect(data.api_mst_ship); - _shipMaster.InspectStype(data.api_mst_stype); - _missionInfo.InspectMaster(data.api_mst_mission); - _itemInfo.InspectMaster(data.api_mst_slotitem); - return Update.Start; + return ApiStart(data); } if (!_start) return Update.None; if (url.EndsWith("api_port/port")) + return ApiPort(data); + if (url.Contains("member")) + return ApiMember(url, json); + if (url.Contains("kousyou")) + return ApiKousyou(url, request, data); + if (url.Contains("battle")) + return ApiBattle(url, request, data); + return ApiOthers(url, request, data); + } + + private Update ApiStart(dynamic data) + { + _shipInfo.InspectMaster(data); + _missionInfo.InspectMaster(data.api_mst_mission); + _itemInfo.InspectMaster(data); + _exMapInfo.ResetIfNeeded(); + _start = true; + return Update.Start; + } + + private Update ApiPort(dynamic data) + { + _itemInfo.InspectBasic(data.api_basic); + _materialInfo.InspectMaterial(data.api_material, true); + _logger.InspectBasic(data.api_basic); + _logger.InspectMaterial(data.api_material); + _shipInfo.InspectShip(data); + _shipInfo.ClearBadlyDamagedShips(); + _conditionTimer.CalcRegenTime(); + _missionInfo.InspectDeck(data.api_deck_port); + _dockInfo.InspectNDock(data.api_ndock); + _akashiTimer.Port(); + _achievement.InspectBasic(data.api_basic); + if (data.api_parallel_quest_count()) // 昔のログにはないので + _questInfo.QuestCount = (int)data.api_parallel_quest_count; + _battleInfo.CleanupResult(); + _battleInfo.InBattle = false; + _shipInfo.ClearEscapedShips(); + _miscTextInfo.ClearIfNeeded(); + SaveState(); + return Update.All; + } + + private Update ApiMember(string url, dynamic json) + { + var data = json.api_data() ? json.api_data : new object(); + + if (url.EndsWith("api_get_member/require_info")) { - _itemInfo.InspectBasic(data.api_basic); - _itemInfo.InspectMaterial(data.api_material); - _shipInfo.InspectShip(data); - _missionInfo.InspectDeck(data.api_deck_port); - _dockInfo.InspectNDock(data.api_ndock); - _akashiTimer.SetTimer(true); - _achievement.InspectBasic(data.api_basic); - _battleInfo.InBattle = false; - _battleInfo.HasDamagedShip = false; - return Update.All; + _itemInfo.InspectSlotItem(data.api_slot_item, true); + _dockInfo.InspectKDock(data.api_kdock); + return Update.Timer; } if (url.EndsWith("api_get_member/basic")) { _itemInfo.InspectBasic(data); + _logger.InspectBasic(data); return Update.None; } if (url.EndsWith("api_get_member/slot_item")) { _itemInfo.InspectSlotItem(data, true); - return Update.None; + return Update.Item; } if (url.EndsWith("api_get_member/kdock")) { _dockInfo.InspectKDock(data); + _logger.InspectKDock(data); return Update.Timer; } if (url.EndsWith("api_get_member/ndock")) { _dockInfo.InspectNDock(data); - _akashiTimer.SetTimer(); + _conditionTimer.CheckCond(); + _akashiTimer.CheckFleet(); return Update.NDock | Update.Timer | Update.Ship; } - if (url.EndsWith("api_req_hensei/change")) - { - _shipInfo.InspectChange(request); - _akashiTimer.SetTimer(); - return Update.Ship; - } if (url.EndsWith("api_get_member/questlist")) { - _questInfo.Inspect(data); + _questInfo.InspectQuestList(data); return Update.QuestList; } if (url.EndsWith("api_get_member/deck")) { _shipInfo.InspectDeck(data); _missionInfo.InspectDeck(data); - _akashiTimer.SetTimer(); + _akashiTimer.CheckFleet(); return Update.Mission | Update.Timer; } if (url.EndsWith("api_get_member/ship2")) { // ここだけjsonなので注意 _shipInfo.InspectShip(json); - _akashiTimer.SetTimer(); + _akashiTimer.CheckFleet(); _battleInfo.InBattle = false; return Update.Item | Update.Ship | Update.Battle; } + if (url.EndsWith("api_get_member/ship_deck")) + { + _shipInfo.InspectShip(data); + _akashiTimer.CheckFleet(); + _battleInfo.InBattle = false; + return Update.Ship | Update.Battle; + } if (url.EndsWith("api_get_member/ship3")) { _shipInfo.InspectShip(data); - _akashiTimer.SetTimer(); + _akashiTimer.CheckFleet(); + _conditionTimer.CheckCond(); return Update.Ship; } if (url.EndsWith("api_get_member/material")) { - _itemInfo.InspectMaterial(data); + _materialInfo.InspectMaterial(data); return Update.Item; } - if (url.EndsWith("api_req_hokyu/charge")) + if (url.EndsWith("api_get_member/mapinfo")) { - _shipInfo.InspectCharge(data); - return Update.Item | Update.Ship; + _exMapInfo.InspectMapInfo(data); + _miscTextInfo.InspectMapInfo(data); + return Update.Item; } + if (url.EndsWith("api_req_member/get_practice_enemyinfo")) + { + _miscTextInfo.InspectPracticeEnemyInfo(data); + return Update.Item; + } + if (url.EndsWith("api_get_member/preset_deck")) + { + _shipInfo.InspectPresetDeck(data); + return Update.None; + } + return Update.None; + } + + private Update ApiKousyou(string url, string request, dynamic data) + { if (url.EndsWith("api_req_kousyou/createitem")) { _itemInfo.InspectCreateItem(data); + _materialInfo.InspectCreateIem(data); + _logger.InspectCreateItem(request, data); return Update.Item; } if (url.EndsWith("api_req_kousyou/getship")) @@ -178,177 +248,296 @@ namespace KancolleSniffer _itemInfo.InspectGetShip(data); _shipInfo.InspectShip(data); _dockInfo.InspectKDock(data.api_kdock); + _conditionTimer.CheckCond(); return Update.Item | Update.Timer; } if (url.EndsWith("api_req_kousyou/destroyship")) { _shipInfo.InspectDestroyShip(request, data); - _akashiTimer.SetTimer(); + _materialInfo.InspectDestroyShip(data); + _conditionTimer.CheckCond(); + _akashiTimer.CheckFleet(); return Update.Item | Update.Ship; } if (url.EndsWith("api_req_kousyou/destroyitem2")) { _itemInfo.InspectDestroyItem(request, data); + _materialInfo.InspectDestroyItem(data); return Update.Item; } - if (url.EndsWith("api_req_kaisou/powerup")) + if (url.EndsWith("api_req_kousyou/remodel_slot")) { - _shipInfo.InspectPowerup(request, data); - _akashiTimer.SetTimer(); - return Update.Item | Update.Ship; + _logger.SetCurrentMaterial(_materialInfo.Current); + _logger.InspectRemodelSlot(request, data); // 資材の差が必要なので_materialInfoより前 + _itemInfo.InspectRemodelSlot(data); + _materialInfo.InspectRemodelSlot(data); + return Update.Item; } - if (url.EndsWith("api_req_nyukyo/start")) + if (url.EndsWith("api_req_kousyou/createship")) { - _dockInfo.InspectNyukyo(request); - _akashiTimer.SetTimer(); - return Update.Item | Update.Ship; + _logger.InspectCreateShip(request); + return Update.None; } - if (url.EndsWith("api_req_nyukyo/speedchange")) + if (url.EndsWith("api_req_kousyou/createship_speedchange")) { - _dockInfo.InspectSpeedChange(request); - return Update.NDock | Update.Timer | Update.Ship; + _dockInfo.InspectCreateShipSpeedChange(request); + return Update.Timer; } + return Update.None; + } + + private Update ApiBattle(string url, string request, dynamic data) + { if (IsNormalBattleAPI(url)) { - _battleInfo.InspectBattle(data); - if (!url.EndsWith("api_req_practice/battle")) - return Update.Battle; - _shipInfo.StartSortie(request); - return Update.Battle | Update.Timer; + _battleInfo.InspectBattle(data, url); + _logger.InspectBattle(data); + return Update.Ship | Update.Battle; + } + if (url.EndsWith("api_req_practice/battle") || url.EndsWith("api_req_practice/midnight_battle")) + { + if (url.EndsWith("/battle")) + { + _shipInfo.InspectMapStart(request); // 演習を出撃中とみなす + _conditionTimer.InvalidateCond(); + _miscTextInfo.ClearFlag = true; + } + _battleInfo.InspectBattle(data, url); + return Update.Ship | Update.Battle | Update.Timer; + } + if (url.EndsWith("api_req_sortie/battleresult")) + { + _battleInfo.InspectBattleResult(data); + _exMapInfo.InspectBattleResult(data); + _logger.InspectBattleResult(data); + return Update.Ship; } - if (url.EndsWith("api_req_sortie/battleresult") || url.EndsWith("api_req_practice/battleresult")) + if (url.EndsWith("api_req_practice/battle_result")) { - _battleInfo.CauseDamage(); + _battleInfo.InspectPracticeResult(data); return Update.Ship; } if (IsCombinedBattleAPI(url)) { - _battleInfo.InspectCombinedBattle(data); - return Update.Battle; + _battleInfo.InspectCombinedBattle(data, url); + _logger.InspectBattle(data); + return Update.Ship | Update.Battle; } if (url.EndsWith("api_req_combined_battle/battleresult")) { - _battleInfo.CauseDamageCombined(); + _battleInfo.InspectCombinedBattleResult(data); + _logger.InspectBattleResult(data); return Update.Ship; } - if (url.EndsWith("api_req_map/start")) - { - _shipInfo.StartSortie(request); - return Update.Timer; - } - if (url.EndsWith("api_req_mission/result")) + if (url.EndsWith("api_req_combined_battle/goback_port")) { - _itemInfo.InspectMissionResult(data); - return Update.Item; + _battleInfo.CauseCombinedBattleEscape(); + return Update.Ship; } return Update.None; } - public bool IsBattleAPI(string url) - { - return IsNormalBattleAPI(url) || IsCombinedBattleAPI(url); - } - - public bool IsNormalBattleAPI(string url) + private bool IsNormalBattleAPI(string url) { - return url.EndsWith("api_req_sortie/battle") || url.EndsWith("api_req_practice/battle") || - url.EndsWith("api_req_battle_midnight/sp_midnight") || - url.EndsWith("api_req_practice/midnight_battle"); + return url.EndsWith("api_req_sortie/battle") || + url.EndsWith("api_req_sortie/airbattle") || + url.EndsWith("api_req_sortie/ld_airbattle") || + url.EndsWith("api_req_battle_midnight/battle") || + url.EndsWith("api_req_battle_midnight/sp_midnight"); } - public bool IsCombinedBattleAPI(string url) + private bool IsCombinedBattleAPI(string url) { - return url.EndsWith("api_req_combined_battle/battle") || url.EndsWith("api_req_combined_battle/airbattle") || + return url.EndsWith("api_req_combined_battle/battle") || + url.EndsWith("api_req_combined_battle/airbattle") || + url.EndsWith("api_req_combined_battle/ld_airbattle") || + url.EndsWith("api_req_combined_battle/battle_water") || url.EndsWith("api_req_combined_battle/midnight_battle") || url.EndsWith("api_req_combined_battle/sp_midnight"); } - public NameAndTimer[] NDock + private Update ApiOthers(string url, string request, dynamic data) { - get { return _dockInfo.NDock; } + if (url.EndsWith("api_req_hensei/change")) + { + _shipInfo.InspectChange(request); + _akashiTimer.InspectChange(request); + return Update.Ship; + } + if (url.EndsWith("api_req_hensei/preset_select")) + { + _shipInfo.InspectDeck(new[] {data}); + _akashiTimer.CheckFleet(); + return Update.Ship; + } + if (url.EndsWith("api_req_hensei/preset_register")) + { + _shipInfo.InspectPresetRegister(data); + return Update.None; + } + if (url.EndsWith("api_req_hensei/preset_delete")) + { + _shipInfo.InspectPresetDelete(request); + return Update.Timer; + } + if (url.EndsWith("api_req_hensei/combined")) + { + _shipInfo.InspectCombined(request); + return Update.Ship; + } + if (url.EndsWith("api_req_hokyu/charge")) + { + _shipInfo.InspectCharge(data); + _materialInfo.InspectCharge(data); + return Update.Item | Update.Ship; + } + if (url.EndsWith("api_req_kaisou/powerup")) + { + _shipInfo.InspectPowerup(request, data); + _conditionTimer.CheckCond(); + _akashiTimer.CheckFleet(); + return Update.Item | Update.Ship; + } + if (url.EndsWith("api_req_kaisou/slot_exchange_index")) + { + _shipInfo.InspectSlotExchange(request, data); + return Update.Ship; + } + if (url.EndsWith("api_req_kaisou/slot_deprive")) + { + _shipInfo.InspectSlotDeprive(data); + return Update.Ship; + } + if (url.EndsWith("api_req_nyukyo/start")) + { + _dockInfo.InspectNyukyo(request); + _conditionTimer.CheckCond(); + _akashiTimer.CheckFleet(); + return Update.Item | Update.Ship; + } + if (url.EndsWith("api_req_nyukyo/speedchange")) + { + _dockInfo.InspectSpeedChange(request); + _conditionTimer.CheckCond(); + return Update.NDock | Update.Timer | Update.Ship; + } + if (url.EndsWith("api_req_map/start")) + { + _shipInfo.InspectMapStart(request); // 出撃中判定が必要なので_conditionTimerより前 + _conditionTimer.InvalidateCond(); + _exMapInfo.InspectMapStart(data); + _logger.InspectMapStart(data); + _miscTextInfo.ClearFlag = true; + return Update.Timer | Update.Ship; + } + if (url.EndsWith("api_req_map/next")) + { + _battleInfo.InspectMapNext(request); + _exMapInfo.InspectMapNext(data); + _logger.InspectMapNext(data); + return Update.None; + } + if (url.EndsWith("api_req_mission/result")) + { + _materialInfo.InspectMissionResult(data); + _logger.InspectMissionResult(data); + return Update.Item; + } + if (url.EndsWith("api_req_quest/stop")) + { + _questInfo.InspectStop(request); + return Update.QuestList; + } + if (url.EndsWith("api_req_quest/clearitemget")) + { + _questInfo.InspectClearItemGet(request); + return Update.QuestList; + } + if (url.EndsWith("api_req_air_corps/supply")) + { + _materialInfo.InspectAirCorpsSupply(data); + return Update.Item; + } + if (url.EndsWith("api_req_air_corps/set_plane")) + { + _materialInfo.InspectAirCorpsSetPlane(data); + return Update.Item; + } + return Update.None; } - public RingTimer[] KDock - { - get { return _dockInfo.KDock; } - } + public NameAndTimer[] NDock => _dockInfo.NDock; - public ItemInfo Item - { - get { return _itemInfo; } - } + public RingTimer[] KDock => _dockInfo.KDock; - public QuestInfo.NameAndProgress[] Quests - { - get { return _questInfo.Quests; } - } + public ItemInfo Item => _itemInfo; - public NameAndTimer[] Missions - { - get { return _missionInfo.Missions; } - } + public MaterialInfo Material => _materialInfo; - public DateTime GetConditionTimer(int fleet) - { - return _shipInfo.GetConditionTiemr(fleet); - } + public QuestStatus[] Quests => _questInfo.Quests; - public int[] GetConditionNotice() - { - return _shipInfo.GetConditionNotice(); - } + public NameAndTimer[] Missions => _missionInfo.Missions; - public ShipStatus[] GetShipStatuses(int fleet) - { - return _shipInfo.GetShipStatuses(fleet); - } + public DateTime GetConditionTimer(int fleet) => _conditionTimer.GetTimer(fleet); - public ChargeStatus[] ChargeStatuses - { - get { return _shipInfo.ChargeStatuses; } - } + public int[] GetConditionNotice() => _conditionTimer.GetNotice(); - public int GetAirSuperiority(int fleet) - { - return _shipInfo.GetAirSuperiority(fleet); - } + public ShipStatus[] GetShipStatuses(int fleet) => _shipInfo.GetShipStatuses(fleet); - public DamageStatus[] DamagedShipList - { - get { return _shipInfo.GetDamagedShipList(_dockInfo); } - } + public int[] GetDeck(int fleet) => _shipInfo.GetDeck(fleet); - public ShipStatus[] ShipList - { - get { return _shipInfo.ShipList; } - } + public int CombinedFleetType => _shipInfo.CombinedFleetType; + + public ChargeStatus[] ChargeStatuses => _shipInfo.ChargeStatuses; - public ShipType[] ShipTypeList + public int[] GetFighterPower(int fleet) => _shipInfo.GetFighterPower(fleet); + + public double GetContactTriggerRate(int fleet) => _shipInfo.GetContactTriggerRate(fleet); + + public double GetFleetLineOfSights(int fleet) => _shipInfo.GetLineOfSights(fleet); + + public ShipStatus[] DamagedShipList => _shipInfo.GetDamagedShipList(_dockInfo); + + public ShipStatus[] ShipList => _shipInfo.ShipList; + + public string[] BadlyDamagedShips => _shipInfo.BadlyDamagedShips; + + public ItemStatus[] ItemList => _itemInfo.GetItemListWithOwner(ShipList); + + public AkashiTimer AkashiTimer => _akashiTimer; + + public Achievement Achievement => _achievement; + + public BattleInfo Battle => _battleInfo; + + public ExMapInfo ExMap => _exMapInfo; + + public string MiscText => _miscTextInfo.Text; + + public void SetLogWriter(Action writer, Func nowFunc) { - get { return _shipMaster.ShipTypeList; } + _logger.SetWriter(writer, nowFunc); } - public AkashiTimer.RepairSpan[] GetAkashiTimers(int fleet) + public void SkipMaster() { - return _akashiTimer.GetTimers(fleet); + _start = true; } - public string[] GetAkashiTimerNotice() + public void EnableLog(LogType type) { - return _akashiTimer.GetNotice(); + _logger.EnableLog(type); } - public Achievement Achievement + public int MaterialLogInterval { - get { return _achievement; } + set { _logger.MaterialLogInterval = value; } } - public BattleInfo Battle + public string LogOutputDir { - get { return _battleInfo; } + set { _logger.OutputDir = value; } } - - public string LogFile { get; set; } } public class NameAndTimer @@ -364,10 +553,16 @@ namespace KancolleSniffer public class RingTimer { - private DateTime _endTime; - private TimeSpan _rest; private readonly TimeSpan _spare; + public TimeSpan Rest { get; private set; } + + public bool IsFinished => EndTime != DateTime.MinValue && Rest <= _spare; + + public DateTime EndTime { get; private set; } + + public bool NeedRing { get; set; } + public RingTimer(int spare = 60) { _spare = TimeSpan.FromSeconds(spare); @@ -382,33 +577,27 @@ namespace KancolleSniffer public void SetEndTime(DateTime time) { - _endTime = time; - if (_endTime == DateTime.MinValue) - IsFinished = false; + EndTime = time; } public void Update() { - if (_endTime == DateTime.MinValue) + if (EndTime == DateTime.MinValue) { - _rest = TimeSpan.Zero; + Rest = TimeSpan.Zero; return; } - _rest = _endTime - DateTime.Now; - if (_rest < TimeSpan.Zero) - _rest = TimeSpan.Zero; - if (_rest > _spare || IsFinished) - return; - IsFinished = true; - NeedRing = true; + var prev = Rest; + Rest = EndTime - DateTime.Now; + if (Rest < TimeSpan.Zero) + Rest = TimeSpan.Zero; + if (prev > _spare && _spare >= Rest) + NeedRing = true; } - public bool IsFinished { get; private set; } - public bool NeedRing { get; set; } - - public override string ToString() - { - return _rest.Days == 0 ? _rest.ToString(@"hh\:mm\:ss") : _rest.ToString(@"d\.hh\:mm"); - } + public string ToString(bool finish = false) + => EndTime == DateTime.MinValue + ? "" + : finish ? EndTime.ToString(@"dd\ HH\:mm") : $@"{(int)Rest.TotalHours:d2}:{Rest:mm\:ss}"; } } \ No newline at end of file