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

Some bug fixes

Browse Source
This commit is contained in:
Draper
2019-12-18 14:49:57 +00:00
parent c59a8c853d
commit 6b2114406a
2 changed files with 77 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
redbot/cogs/audio/audio.py
View File

@@ -274,7 +274,7 @@ class Audio(commands.Cog):
).clear_raw("playlists") ).clear_raw("playlists")
if from_version < 3 <= to_version: if from_version < 3 <= to_version:
for scope in PlaylistScope.list(): for scope in PlaylistScope.list():
scope_playlist = await get_all_playlist_for_migration23(scope) scope_playlist = await get_all_playlist_for_migration23(scope, self.bot)
for p in scope_playlist: for p in scope_playlist:
await p.save() await p.save()
await self.config.custom(scope).clear() await self.config.custom(scope).clear()

74
redbot/cogs/audio/playlists.py
View File

@@ -68,22 +68,23 @@ CREATE TABLE IF NOT EXISTS playlists (
""" """
_DELETE = """ _DELETE = """
DELETE FROM playlists DELETE
FROM
playlists
WHERE WHERE
( (
scope_type = :scope_type scope_type = :scope_type
AND AND playlist_id = :playlist_id
playlist_id = :playlist_id AND scope_id = :scope_id
AND
scope_id = :scope_id
) )
; ;
""" """
_DELETE_SCOPE = """ _DELETE_SCOPE = """
DELETE FROM playlists DELETE
FROM
playlists
WHERE WHERE
scope_type = :scope_type scope_type = :scope_type ;
;
""" """
_FETCH_ALL = """ _FETCH_ALL = """
@@ -94,10 +95,10 @@ scope_id,
author_id, author_id,
playlist_url, playlist_url,
tracks tracks
FROM playlists FROM
playlists
WHERE WHERE
scope_type = :scope_type scope_type = :scope_type ;
;
""" """
_FETCH_ALL_WITH_FILTER = """ _FETCH_ALL_WITH_FILTER = """
@@ -108,12 +109,12 @@ scope_id,
author_id, author_id,
playlist_url, playlist_url,
tracks tracks
FROM playlists FROM
playlists
WHERE WHERE
( (
scope_type = :scope_type scope_type = :scope_type
AND AND author_id = :author_id
author_id = :author_id
) )
; ;
""" """
@@ -126,50 +127,27 @@ scope_id,
author_id, author_id,
playlist_url, playlist_url,
tracks tracks
FROM playlists FROM
playlists
WHERE WHERE
( (
scope_type = :scope_type scope_type = :scope_type
AND AND playlist_id = :playlist_id
playlist_id = :playlist_id AND scope_id = :scope_id
AND
scope_id = :scope_id
) )
""" """
_UPSET = """INSERT INTO _UPSET = """
playlists INSERT INTO
( playlists ( scope_type, playlist_id, playlist_name, scope_id, author_id, playlist_url, tracks )
scope_type
playlist_id,
playlist_name,
scope_id,
author_id,
playlist_url,
tracks
)
VALUES VALUES
( (
:scope_type, :scope_type, :playlist_id, :playlist_name, :scope_id, :author_id, :playlist_url, :tracks
:playlist_id,
:playlist_name,
:scope_id,
:author_id,
:playlist_url,
:tracks
) )
ON CONFLICT ON CONFLICT (scope_type, playlist_id, scope_id) DO
( UPDATE
scope_type,
playlist_id,
scope_id
)
DO UPDATE
SET SET
playlist_name = excluded.playlist_name, playlist_name = excluded.playlist_name, playlist_url = excluded.playlist_url, tracks = excluded.tracks;
playlist_url = excluded.playlist_url,
tracks = excluded.tracks
;
""" """