Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement ignore url options in CFileItemList #8822

Merged
merged 1 commit into from
Mar 3, 2016

Conversation

arnova
Copy link
Member

@arnova arnova commented Jan 9, 2016

  • use in our directory-cache. There are other places that also use lookups for cfileitemlists which may also need to be updated (not sure though).

@arnova
Copy link
Member Author

arnova commented Jan 9, 2016

@ronie / @DaveTBlake / @MilhouseVH : Please test

jenkins build this please

@MilhouseVH
Copy link
Contributor

Doesn't build.

FileItem.cpp: In member function 'bool CFileItem::IsPath(const string&) const':
FileItem.cpp:1542:55: error: 'm_ignoreURLOptions' was not declared in this scope
   return URIUtils::PathEquals(m_strPath, path, false, m_ignoreURLOptions);
                                                       ^
FileItem.cpp: In member function 'void CFileItemList::Remove(int)':
FileItem.cpp:1812:100: error: expected ':' before ')' token
       m_map.erase(m_ignoreURLOptions ? CURL(pItem->GetPath()).GetWithoutOptions(), pItem->GetPath());
                                                                                                    ^
FileItem.cpp:1812:100: error: expected primary-expression before ')' token
/home/neil/projects/OpenELEC.tv/build.OpenELEC-RPi.arm-7.0-devel/kodi-17.0-alpha1-7ca3fea/Makefile.include:97: recipe for target 'FileItem.o' failed
make[2]: *** [FileItem.o] Error 1
make[2]: *** Waiting for unfinished jobs....

@arnova
Copy link
Member Author

arnova commented Jan 10, 2016

@ronie / @DaveTBlake / @MilhouseVH : Sorry forgot to completely push all the changes. Please test (again).

jenkins build this please

@ronie
Copy link
Member

ronie commented Jan 10, 2016

works ok at my end.

@MilhouseVH
Copy link
Contributor

Seems OK here with videos, music, YouTube. I'll include it in the next build, if you've got any concerns maybe wait a couple of days?

@DaveTBlake DaveTBlake added Type: Fix non-breaking change which fixes an issue v17 Krypton labels Jan 10, 2016
@DaveTBlake
Copy link
Member

Looks OK with music so far, but Millhouse's suggestion of a pause for some more testing is a good one.

@arnova
Copy link
Member Author

arnova commented Jan 10, 2016

Yes sounds good since we're fiddling in a sensitive area.

@MilhouseVH
Copy link
Contributor

I've had this in for the last 6-7 weeks weeks with no reported issues - is this ready to merge?

@DaveTBlake
Copy link
Member

+1 here

arnova added a commit that referenced this pull request Mar 3, 2016
Implement ignore url options in CFileItemList
@arnova arnova merged commit 30df176 into xbmc:master Mar 3, 2016
@arnova arnova deleted the fastlookup_no_options branch March 29, 2021 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Fix non-breaking change which fixes an issue v17 Krypton
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants