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 Config] Make Mongo work with any db (#1355)

Browse Source
This commit is contained in:
Will 2018-02-26 15:28:20 -05:00 committed by GitHub
parent fdd61963e6
commit 41e0d105f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
redbot/core/drivers/red_mongo.py
View File

@ -1,5 +1,3 @@
from typing import Tuple
import motor.motor_asyncio import motor.motor_asyncio
from .red_base import BaseDriver from .red_base import BaseDriver
@ -14,27 +12,20 @@ class Mongo(BaseDriver):
super().__init__(cog_name) super().__init__(cog_name)
self.host = kwargs['HOST'] self.host = kwargs['HOST']
self.port = kwargs['PORT'] self.port = kwargs['PORT']
admin_user = kwargs['USERNAME'] self.admin_user = kwargs['USERNAME']
admin_pass = kwargs['PASSWORD'] self.admin_pass = kwargs['PASSWORD']
self.db_name = kwargs.get('DB_NAME', 'default_db')
from ..data_manager import instance_name from ..data_manager import instance_name
self.instance_name = instance_name self.instance_name = instance_name
self.conn = None self.url = "mongodb://{}:{}@{}:{}/{}".format(
self.admin_user, self.admin_pass, self.host, self.port,
self.db_name
)
self.admin_user = admin_user self.conn = motor.motor_asyncio.AsyncIOMotorClient(self.url)
self.admin_pass = admin_pass
async def _authenticate(self):
self.conn = motor.motor_asyncio.AsyncIOMotorClient(host=self.host, port=self.port)
if None not in (self.admin_pass, self.admin_user):
await self.db.authenticate(self.admin_user, self.admin_pass)
async def _ensure_connected(self):
if self.conn is None:
await self._authenticate()
@property @property
def db(self) -> motor.core.Database: def db(self) -> motor.core.Database:
@ -50,8 +41,7 @@ class Mongo(BaseDriver):
:return: :return:
PyMongo Database object. PyMongo Database object.
""" """
db_name = "RED_{}".format(self.instance_name) return self.conn.get_database()
return self.conn[db_name]
def get_collection(self) -> motor.core.Collection: def get_collection(self) -> motor.core.Collection:
""" """
@ -72,8 +62,6 @@ class Mongo(BaseDriver):
return uuid, identifiers return uuid, identifiers
async def get(self, *identifiers: str): async def get(self, *identifiers: str):
await self._ensure_connected()
mongo_collection = self.get_collection() mongo_collection = self.get_collection()
dot_identifiers = '.'.join(identifiers) dot_identifiers = '.'.join(identifiers)
@ -92,8 +80,6 @@ class Mongo(BaseDriver):
return partial return partial
async def set(self, *identifiers: str, value=None): async def set(self, *identifiers: str, value=None):
await self._ensure_connected()
dot_identifiers = '.'.join(identifiers) dot_identifiers = '.'.join(identifiers)
mongo_collection = self.get_collection() mongo_collection = self.get_collection()
@ -105,8 +91,6 @@ class Mongo(BaseDriver):
) )
async def clear(self, *identifiers: str): async def clear(self, *identifiers: str):
await self._ensure_connected()
dot_identifiers = '.'.join(identifiers) dot_identifiers = '.'.join(identifiers)
mongo_collection = self.get_collection() mongo_collection = self.get_collection()
@ -123,6 +107,8 @@ def get_config_details():
admin_uname = input("Enter login username: ") admin_uname = input("Enter login username: ")
admin_password = input("Enter login password: ") admin_password = input("Enter login password: ")
db_name = input("Enter mongodb database name: ")
if admin_uname == "": if admin_uname == "":
admin_uname = admin_password = None admin_uname = admin_password = None
@ -130,6 +116,7 @@ def get_config_details():
'HOST': host, 'HOST': host,
'PORT': port, 'PORT': port,
'USERNAME': admin_uname, 'USERNAME': admin_uname,
'PASSWORD': admin_password 'PASSWORD': admin_password,
'DB_NAME': db_name
} }
return ret return ret