spezifisch / stmps

Subsonic Terminal Music Player S
GNU General Public License v3.0
19 stars 6 forks source link

Feat 52 search by genre #80

Open xxxserxxx opened 1 month ago

xxxserxxx commented 1 month ago

This is forked off issue-76-clarify-search-results!!!

It's branched here because, otherwise, the merge for both will be nasty. It's a separate branch, because it adds a feature.

This implements #52.

I try to keep commits focused, but this commit changes a couple of other (unrelated) things:

You should be able to merge "clarify" and then merge this branch; or if you decide to merge both, just merge this branch and you'll get both.

xxxserxxx commented 1 month ago

@spezifisch There are conflicts between my PRs, because I keep forking them off main and they often overlap files. When it's too obvious to me that merges are going to be hard this way, I'll branch off another of my unmerged branches, but this has its own problems.

I have a suggestion: when you're next ready, tell me which of the PRs you would like to merge. I'll create a merge branch off main, merge and resolve the conflicts, and you can take a look at it, test run it, and pull them in at once without having to deal with the conflicts.

spezifisch commented 3 weeks ago

I have a suggestion: when you're next ready, tell me which of the PRs you would like to merge. I'll create a merge branch off main, merge and resolve the conflicts, and you can take a look at it, test run it, and pull them in at once without having to deal with the conflicts.

Let's try that. I've just been through PRs and want to weed out the performance bugs on my setup next. This PR here is the one I would merge next.

xxxserxxx commented 3 weeks ago

Let's try that. I've just been through PRs and want to weed out the performance bugs on my setup next. This PR here is the one I would merge next.

Yeah, that was an ugly one.

I rebased the branch on the current main; it passes make all and I cleaned up a couple of column content things in 5cac4ac. Then I did a test merge back onto main with no issues.

I have yet to remember to sign a commit :-/