Use metadata title in search results if present

[mill1000]

Use metadata title in search results (if present) instead of the raw dc_title field. Closes #1867

[neheb]

find is a bool, no?

[neheb]

to clarify, find() is faster than count() as it exits early.

[mill1000]

find() returns an iterator, so the proper form would be meta.find() != meta.end() IIRC. In the case of a std::map since all keys are unique I believe the performance would be equivalent.

[neheb]

I checked this. Seems correct. I would still make the change as count() is not used in if statements in the code base.

edit: sorry, not used as a bool like this.

[mill1000]

Sure no problem. I'll switch to find() later today

[KarlStraussberger]

title is handled exactly the same way for search and browse (

gerbera/src/upnp_cds.cc

Line 189 in 24e5be8

for (auto&& cdsObject : results) {

). The text depends on the item in the virtual layout. If you want to change the output, this is the better place.

[mill1000]

Hi Karl. I don't agree that they are handled exactly the same way. My control point clearly displays different titles for search results vs browsing.

Ultimately, I don't care where this code goes. But I'd argue that it makes more sense for it to be located where the CdsObject is created. I'd even go to say that the above blocks of code should be moved into createObjectFromSearchRow and createObjectFromRow. Probably even broken out into it's own function since there are nearly identical.

Search

Browse

[KarlStraussberger]

I double checked the code in sql_database and it returns the same column. I may happen that your endpoint uses metadata in case of browsing while the text displayed after search is the original set by the layout script on import. Please, try another client, like foobar, on your mobile.

[mill1000]

@KarlStraussberger I've tried BubbleUpnp on mobile, and foobar2000 on desktop. Both have the same behavior of showing the metadata title in browse, and the dc_title in search.

foobar2000

BubbleUpnp

[mill1000]

I also saw no ability to perform a search against Gerbera on foobar2000 mobile.

[KarlStraussberger]

I still don't see where it happens, did you configure title-properties? (https://docs.gerbera.io/en/latest/config-server.html#upnp)

[mill1000]

I did not configure any additional properties. (Plus the documentation says title-properties can't be changed?)

It looks like the browse title is coming directly from the database. When I re-run the browse query on the DB directly I get the desired dc:title. This must be because browse is looking at the virtual items, while search (for tracks) is looking directly at the non-virtual items marked with object.item.audioItem.musicTrack.

So perhaps this PR was just a poorly thought out band-aid for a bigger issue. Along with the duplicate album issue in #1863. Perhaps this database structure just isn't ideal for search.

[KarlStraussberger]

The real reason for the behaviour is that the title for the source items is determined from the file name.

I took your idea and implemented a configuration option for the title.