Working on fixing crashing
This commit is contained in:
@@ -1,10 +1,12 @@
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
from typing import List
|
||||
|
||||
from ..utils import platform_utils
|
||||
|
||||
FILE_NAME = 'last-party.json'
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def memory_path() -> str:
|
||||
@@ -19,11 +21,15 @@ def load_last_party() -> List[str]:
|
||||
with open(memory_path(), 'r') as party_file:
|
||||
data = json.load(party_file)
|
||||
except (OSError, json.JSONDecodeError):
|
||||
logger.debug("no readable remembered party at %s", memory_path())
|
||||
return []
|
||||
names = data.get('player_names') if isinstance(data, dict) else None
|
||||
if not isinstance(names, list):
|
||||
logger.debug("remembered party file has no player_names: %s", memory_path())
|
||||
return []
|
||||
return _clean_names(names)
|
||||
clean_names = _clean_names(names)
|
||||
logger.debug("loaded remembered party from %s: %s", memory_path(), clean_names)
|
||||
return clean_names
|
||||
|
||||
|
||||
def save_last_party(names: List[str]):
|
||||
@@ -37,6 +43,7 @@ def save_last_party(names: List[str]):
|
||||
os.makedirs(directory, exist_ok=True)
|
||||
with open(path, 'w') as party_file:
|
||||
json.dump({'player_names': clean_names}, party_file)
|
||||
logger.debug("saved remembered party to %s: %s", path, clean_names)
|
||||
|
||||
|
||||
def clear_last_party():
|
||||
@@ -46,6 +53,8 @@ def clear_last_party():
|
||||
pass
|
||||
except OSError:
|
||||
pass
|
||||
else:
|
||||
logger.debug("cleared remembered party at %s", memory_path())
|
||||
|
||||
|
||||
def _clean_names(names: List[str]) -> List[str]:
|
||||
|
||||
+15
-6
@@ -1,3 +1,4 @@
|
||||
import logging
|
||||
from typing import Dict, List, Optional
|
||||
|
||||
from .. import environment
|
||||
@@ -9,6 +10,7 @@ from .translate import GameMessage
|
||||
FIX_POINT = 10000.0
|
||||
FAME_MIN_TOTAL = 1000000 # albion-lens sanity filter for UpdateFame events
|
||||
SILVER_SOURCE_LOOTED = 54
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class IdCache:
|
||||
@@ -150,6 +152,11 @@ class World:
|
||||
else remember_last_party)
|
||||
self._remembered_party_names = (party_memory.load_last_party()
|
||||
if self._remember_last_party else [])
|
||||
if self._remember_last_party:
|
||||
logger.debug("remember_last_party enabled; loaded names: %s",
|
||||
self._remembered_party_names)
|
||||
else:
|
||||
logger.debug("remember_last_party disabled; saved party will not autoload")
|
||||
self._zone_candidate_names: List[str] = []
|
||||
self._explicit_party_seen = False
|
||||
self._party_inferred = False
|
||||
@@ -421,14 +428,16 @@ class World:
|
||||
return self._party_event(event)
|
||||
|
||||
def _remember_party_event(self, event: Optional[dict]):
|
||||
if not self._remember_last_party or event is None:
|
||||
if event is None:
|
||||
return
|
||||
names = event.get('value', {}).get('player_names', [])
|
||||
self._remembered_party_names = _unique_names(names)
|
||||
if self._remembered_party_names:
|
||||
party_memory.save_last_party(self._remembered_party_names)
|
||||
else:
|
||||
party_memory.clear_last_party()
|
||||
remembered_names = _unique_names(names)
|
||||
if remembered_names:
|
||||
self._remembered_party_names = remembered_names
|
||||
party_memory.save_last_party(remembered_names)
|
||||
elif self._remember_last_party:
|
||||
self._remembered_party_names = []
|
||||
logger.debug("empty party event cleared in-memory party only")
|
||||
|
||||
def _reset_zone_party_inference(self):
|
||||
self._zone_candidate_names = []
|
||||
|
||||
Reference in New Issue
Block a user