Add the ability for Kodi to properly navigate Box Sets #1
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | ||
| <node order="99" type="folder" visible="Library.HasContent(boxsets)"> | ||
| <label>Boxsets</label> | ||
| <icon>DefaultSets.png</icon> | ||
| <path>musicdb://boxsets/</path> | ||
| </node> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Copyright (C) 2005-2018 Team Kodi | ||
| * This file is part of Kodi - https://kodi.tv | ||
| * | ||
| * SPDX-License-Identifier: GPL-2.0-or-later | ||
| * See LICENSES/README.md for more information. | ||
| */ | ||
|
|
||
| #include "DirectoryNodeBoxsetDiscSongs.h" | ||
|
|
||
| #include "QueryParams.h" | ||
| #include "guilib/LocalizeStrings.h" | ||
| #include "music/MusicDatabase.h" | ||
|
|
||
| using namespace XFILE::MUSICDATABASEDIRECTORY; | ||
|
|
||
| CDirectoryNodeBoxsetDiscSongs::CDirectoryNodeBoxsetDiscSongs(const std::string& strName, CDirectoryNode* pParent) | ||
| : CDirectoryNode(NODE_TYPE_BOXSET_DISC_SONGS, strName, pParent) | ||
| { | ||
|
|
||
| } | ||
|
|
||
| NODE_TYPE CDirectoryNodeBoxsetDiscSongs::GetChildType() const | ||
| { | ||
| return NODE_TYPE_BOXSET_DISC_SONGS; | ||
| } | ||
| std::string CDirectoryNodeBoxsetDiscSongs::GetLocalizedName() const | ||
| { | ||
|
|
||
| if (GetID() == -1) | ||
| return g_localizeStrings.Get(15102); // All Albums | ||
| return ""; | ||
| } | ||
|
|
||
| bool CDirectoryNodeBoxsetDiscSongs::GetContent(CFileItemList& items) const | ||
| { | ||
| CMusicDatabase musicdatabase; | ||
| if (!musicdatabase.Open()) | ||
| return false; | ||
|
|
||
| CQueryParams params; | ||
| CollectQueryParams(params); | ||
|
|
||
| bool bSuccess=musicdatabase.GetBoxsetDiscSongs(BuildPath(), items); | ||
|
|
||
|
There was a problem hiding this comment. What is this method and node doing that is different from
Owner
Author
There was a problem hiding this comment. Ah well, I guess I could ask you what's the difference between CDirectoryNodeSong and CDirectoryAlbumCompilationSongs because I don't think that is needed either. You shouldn't need the "compilations" flag when getting the songs as all the albums in items are already compilations and thus returning the songs for each album is enough. I've tested that funnily enough and it works fine. There was a problem hiding this comment. Yes exactly, CDirectoryAlbumCompilationSongs is historic and superseded. |
||
| musicdatabase.Close(); | ||
|
|
||
| return bSuccess; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /* | ||
| * Copyright (C) 2005-2018 Team Kodi | ||
| * This file is part of Kodi - https://kodi.tv | ||
| * | ||
| * SPDX-License-Identifier: GPL-2.0-or-later | ||
| * See LICENSES/README.md for more information. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "DirectoryNode.h" | ||
|
|
||
| namespace XFILE | ||
| { | ||
| namespace MUSICDATABASEDIRECTORY | ||
| { | ||
| class CDirectoryNodeBoxsetDiscSongs : public CDirectoryNode | ||
| { | ||
| public: | ||
| CDirectoryNodeBoxsetDiscSongs(const std::string& strName, CDirectoryNode* pParent); | ||
| protected: | ||
| NODE_TYPE GetChildType() const override; | ||
| bool GetContent(CFileItemList& items) const override; | ||
| std::string GetLocalizedName() const override; | ||
| }; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * Copyright (C) 2005-2018 Team Kodi | ||
| * This file is part of Kodi - https://kodi.tv | ||
| * | ||
| * SPDX-License-Identifier: GPL-2.0-or-later | ||
| * See LICENSES/README.md for more information. | ||
| */ | ||
|
|
||
| #include "DirectoryNodeBoxsetDiscs.h" | ||
|
|
||
| #include "QueryParams.h" | ||
| #include "guilib/LocalizeStrings.h" | ||
| #include "music/MusicDatabase.h" | ||
|
|
||
| using namespace XFILE::MUSICDATABASEDIRECTORY; | ||
|
|
||
| CDirectoryNodeBoxsetDiscs::CDirectoryNodeBoxsetDiscs(const std::string& strName, CDirectoryNode* pParent) | ||
| : CDirectoryNode(NODE_TYPE_BOXSET_DISCS, strName, pParent) | ||
| { | ||
|
|
||
| } | ||
|
|
||
| NODE_TYPE CDirectoryNodeBoxsetDiscs::GetChildType() const | ||
| { | ||
| return NODE_TYPE_BOXSET_DISC_SONGS; | ||
| } | ||
|
|
||
| std::string CDirectoryNodeBoxsetDiscs::GetLocalizedName() const | ||
| { | ||
|
|
||
| if (GetID() == -1) | ||
| return g_localizeStrings.Get(15102); // All Albums | ||
| return ""; | ||
| } | ||
|
|
||
| bool CDirectoryNodeBoxsetDiscs::GetContent(CFileItemList& items) const | ||
| { | ||
| CMusicDatabase musicdatabase; | ||
| if (!musicdatabase.Open()) | ||
| return false; | ||
|
|
||
| CQueryParams params; | ||
| CollectQueryParams(params); | ||
|
|
||
| bool bSuccess=musicdatabase.GetBoxsetDiscs(BuildPath(), items, params.GetAlbumId()); | ||
|
|
||
| musicdatabase.Close(); | ||
|
|
||
| return bSuccess; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Revert to original text