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

[V3 Downloader] Fix non relative data path (#1150)

Browse Source
This commit is contained in:
Will 2017-12-08 20:09:23 -05:00 committed by GitHub
parent ef7216722f
commit 02d7193a92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
redbot/cogs/downloader/installable.py
View File

@ -5,6 +5,7 @@ from enum import Enum
from pathlib import Path from pathlib import Path
from typing import Union, MutableMapping, Any from typing import Union, MutableMapping, Any
from redbot.core import data_manager
from .log import log from .log import log
from .json_mixins import RepoJSONMixin from .json_mixins import RepoJSONMixin
@ -191,11 +192,13 @@ class Installable(RepoJSONMixin):
return info return info
def to_json(self): def to_json(self):
data_path = data_manager.cog_data_path()
return { return {
"location": self._location.relative_to(Path.cwd()).parts "location": self._location.relative_to(data_path).parts
} }
@classmethod @classmethod
def from_json(cls, data: dict): def from_json(cls, data: dict):
location = Path.cwd() / Path(*data["location"]) data_path = data_manager.cog_data_path()
location = data_path / Path(*data["location"])
return cls(location=location) return cls(location=location)

6
redbot/cogs/downloader/repo_manager.py
View File

@ -468,19 +468,21 @@ class Repo(RepoJSONMixin):
) )
def to_json(self): def to_json(self):
data_path = data_manager.cog_data_path()
return { return {
"url": self.url, "url": self.url,
"name": self.name, "name": self.name,
"branch": self.branch, "branch": self.branch,
"folder_path": self.folder_path.relative_to(Path.cwd()).parts, "folder_path": self.folder_path.relative_to(data_path).parts,
"available_modules": [m.to_json() for m in self.available_modules] "available_modules": [m.to_json() for m in self.available_modules]
} }
@classmethod @classmethod
def from_json(cls, data): def from_json(cls, data):
data_path = data_manager.cog_data_path()
# noinspection PyTypeChecker # noinspection PyTypeChecker
return Repo(data['name'], data['url'], data['branch'], return Repo(data['name'], data['url'], data['branch'],
Path.cwd() / Path(*data['folder_path']), data_path / Path(*data['folder_path']),
tuple([Installable.from_json(m) for m in data['available_modules']])) tuple([Installable.from_json(m) for m in data['available_modules']]))