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

[Config] Migrate UUID for JSON backend (#2604)

Browse Source 
* Migrate UUID for JSON backend

* Interesting...

* black

* Simplify UUID creation
This commit is contained in:
Will 2019-04-24 16:03:27 -04:00 committed by GitHub
parent f20a174038
commit 05e2851c67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
redbot/core/config.py
View File

@ -7,7 +7,7 @@ import weakref
import discord import discord
from .data_manager import cog_data_path, core_data_path from .data_manager import cog_data_path, core_data_path
from .drivers import get_driver, IdentifierData from .drivers import get_driver, IdentifierData, BackendType
if TYPE_CHECKING: if TYPE_CHECKING:
from .drivers.red_base import BaseDriver from .drivers.red_base import BaseDriver
@ -562,6 +562,10 @@ class Config:
def defaults(self): def defaults(self):
return deepcopy(self._defaults) return deepcopy(self._defaults)
@staticmethod
def _create_uuid(identifier: int):
return str(identifier)
@classmethod @classmethod
def get_conf(cls, cog_instance, identifier: int, force_registration=False, cog_name=None): def get_conf(cls, cog_instance, identifier: int, force_registration=False, cog_name=None):
"""Get a Config instance for your cog. """Get a Config instance for your cog.
@ -602,7 +606,8 @@ class Config:
cog_path_override = cog_data_path(cog_instance=cog_instance) cog_path_override = cog_data_path(cog_instance=cog_instance)
cog_name = cog_path_override.stem cog_name = cog_path_override.stem
uuid = str(hash(identifier)) # uuid = str(hash(identifier))
uuid = cls._create_uuid(identifier)
# We have to import this here otherwise we have a circular dependency # We have to import this here otherwise we have a circular dependency
from .data_manager import basic_config from .data_manager import basic_config
@ -613,6 +618,9 @@ class Config:
driver = get_driver( driver = get_driver(
driver_name, cog_name, uuid, data_path_override=cog_path_override, **driver_details driver_name, cog_name, uuid, data_path_override=cog_path_override, **driver_details
) )
if driver_name == BackendType.JSON.value:
driver.migrate_identifier(identifier)
conf = cls( conf = cls(
cog_name=cog_name, cog_name=cog_name,
unique_identifier=uuid, unique_identifier=uuid,

12
redbot/core/drivers/red_json.py
View File

@ -96,6 +96,18 @@ class JSON(BaseDriver):
self.data = {} self.data = {}
self.jsonIO._save_json(self.data) self.jsonIO._save_json(self.data)
def migrate_identifier(self, raw_identifier: int):
if self.unique_cog_identifier in self.data:
# Data has already been migrated
return
poss_identifiers = [str(raw_identifier), str(hash(raw_identifier))]
for ident in poss_identifiers:
if ident in self.data:
self.data[self.unique_cog_identifier] = self.data[ident]
del self.data[ident]
self.jsonIO._save_json(self.data)
break
async def get(self, identifier_data: IdentifierData): async def get(self, identifier_data: IdentifierData):
partial = self.data partial = self.data
full_identifiers = identifier_data.to_tuple() full_identifiers = identifier_data.to_tuple()