CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-21 10:17:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Kill JsonIO and fix JSON driver caching issues (#2796)

Browse Source 
* Kill JsonIO and fix JSON driver caching issues

Signed-off-by: Toby Harradine <tobyharradine@gmail.com>

* Ensure lock covers critical region in set()

Signed-off-by: Toby Harradine <tobyharradine@gmail.com>

* Make tests pass

Signed-off-by: Toby Harradine <tobyharradine@gmail.com>

* Use pickle over deepcopy in Config

Signed-off-by: Toby Harradine <tobyharradine@gmail.com>

* Fix temp instance creation

Signed-off-by: Toby Harradine <tobyharradine@gmail.com>

* Serialise value before doing anything in set()

Signed-off-by: Toby Harradine <tobyharradine@gmail.com>
This commit is contained in:
Toby Harradine
2019-06-28 04:49:45 +10:00
committed by Michael H
parent f3bbfdc64d
commit bff7e214ab
9 changed files with 133 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
redbot/setup.py
View File

@@ -23,7 +23,6 @@ from redbot.core.data_manager import (
core_data_path,
storage_details,
)
from redbot.core.json_io import JsonIO
from redbot.core.utils import safe_delete
from redbot.core import Config
from redbot.core.drivers import BackendType, IdentifierData
@@ -50,7 +49,8 @@ def load_existing_config():
if not config_file.exists():
return {}
return JsonIO(config_file)._load_json()
with config_file.open(encoding="utf-8") as fs:
return json.load(fs)
instance_data = load_existing_config()
@@ -74,7 +74,9 @@ def save_config(name, data, remove=False):
print("Not continuing")
sys.exit(0)
config[name] = data
JsonIO(config_file)._save_json(config)
with config_file.open("w", encoding="utf-8") as fs:
json.dump(config, fs, indent=4)
def get_data_dir():
@@ -220,7 +222,7 @@ async def json_to_mongov2(instance):
if "." in cog_name:
# Garbage handler
continue
with p.open(mode="r") as f:
with p.open(mode="r", encoding="utf-8") as f:
cog_data = json.load(f)
for identifier, all_data in cog_data.items():
try: