Skip to content

Conversation

@poldi171254
Copy link

@poldi171254 poldi171254 commented May 18, 2025

I have now made the Network Remote optional and cleaned up the code as per request.
This replaces V2 pull request.
I tried to close my previous pull request, but can't find a way of doinng this

@poldi171254
Copy link
Author

I'd appreciate of you could find the time for a review so I can maybe focus on working on some other areas of Strawberry.
Also, as I mentioned before, I cannot close my previous pull request Network Remote V2.

@jonaski
Copy link
Member

jonaski commented May 27, 2025

I'd appreciate of you could find the time for a review so I can maybe focus on working on some other areas of Strawberry. Also, as I mentioned before, I cannot close my previous pull request Network Remote V2.

I already reviewed in the previous PR #1688, most of the issues are not addressed.

Copy link
Member

@jonaski jonaski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of the issues are not addressed, there is also still lot's of formatting issues, it's not consistent.
I also made some additional comments.

@jonaski
Copy link
Member

jonaski commented May 27, 2025

I don't understand why your merging in a bunch of unrelated commits here, there is no commit here explaining what's being done here.

@jonaski
Copy link
Member

jonaski commented May 27, 2025

Commit 8e158ad looks strange, it's a mix my changes and your changes, the text in the commit title is from a different commit, while the commit message body is a mix of different comments.

@poldi171254
Copy link
Author

I think one of the recurring issues seems to be the format of the code.

I'm using Qt Creator

If you are using CLangFormat settings maybe you can share your .clang_format file

If you you are using something else for your development, maybe you can share what that is

jonaski and others added 5 commits May 30, 2025 11:16
You need to restart Strawberry for this setting to take affect
Renamed classes to be less ambiguous

Save before clientmanager changes

This works after major change in clientmanager

Cleaned up formatting

Still works

I have fixed most of the code issues apart from the one I commented on where I wasn't sure what was meant or how to resolve the issue.
I reformatted all my code and used Qt stringliterals where applicable
Cmake now uses Qt Protobuf
I removed Application where I could. Still needed where I need acces to the player.
All objects should now be freed.
I have hardcoded the CMAKE_INSTALL_RPATH as RPATH seems to be a requirement when using Ninja as the cmake generator. Ubuntu currently comes with 6.4.2, but the QtCreator is on 6.8 I'm pulling in the library from the Creator

Not sure what you meant by "I think we should use signals/slots to reload settings (like most other places) instead of the singleton"
Not sure what the Copyright header should look like. Do I put my name on this?
I have not made the Network remote optional yet as I wanted to get the code sorted out first

I still have have one outstanding issue on Ubuntu
[1276/1276 11.5/sec] Linking CXX executable strawberry
/usr/bin/ld: warning: libicui18n.so.73, needed by /home/llist/Qt/6.8.2/gcc_64/lib/libQt6Core.so.6.8.2, may conflict with libicui18n.so.74
/usr/bin/ld: warning: libicuuc.so.73, needed by /home/llist/Qt/6.8.2/gcc_64/lib/libQt6Core.so.6.8.2, may conflict with libicuuc.so.74

Changes requested by maintainer

Added Copyright

Passing Player instead of Application as an argument

Clean code as per maintainers request
Using Player rather than Application class to get song data

Code cleanup

Removed RPATH related entries form cmake file
Fixed code as per maintainers reuqest
Removed all non essential refererences to a Application from the code
Inserted Copyright

Stage 1 of making Network Remote optional
@poldi171254
Copy link
Author

Commit 8e158ad looks strange, it's a mix my changes and your changes, the text in the commit title is from a different commit, while the commit message body is a mix of different comments.

I think I made mistakes when I squashed the commits. Any idea how to fix this?

@poldi171254
Copy link
Author

I've gone through your requests for V2 PR and as far as I can see I've done them all.
I'd like to move forward and suggest that we delete the V2 PR and focus on V3.

@jonaski
Copy link
Member

jonaski commented Jun 5, 2025

I think one of the recurring issues seems to be the format of the code.

I'm using Qt Creator

If you are using CLangFormat settings maybe you can share your .clang_format file

There already is a clang-format file in this repository as I explained here:
#1688 (review)

If you you are using something else for your development, maybe you can share what that is

@jonaski
Copy link
Member

jonaski commented Jun 5, 2025

Commit 8e158ad looks strange, it's a mix my changes and your changes, the text in the commit title is from a different commit, while the commit message body is a mix of different comments.

I think I made mistakes when I squashed the commits. Any idea how to fix this?

I'm not sure you can fix it with a normal rebase since you have changed commits that were part of master.
I think you need to undo all the commits without deleting the the changes, then commit again and force push:
Do git reset HEAD^ until you reach a clean commit, then commit your changes and rebase with master to get back all the deleted commits.
I suggest to make a copy of the branch in case you accidentally delete something.

poldi171254 and others added 5 commits June 10, 2025 09:56
You need to restart Strawberry for this setting to take affect
I now have a working version with option network remote code.
I still need to check the maintainers latest comments.
@poldi171254
Copy link
Author

There are two ourstanding issues that need clarification
Thanks

@poldi171254
Copy link
Author

Can you please review my latest changes

@poldi171254 poldi171254 requested a review from jonaski October 20, 2025 03:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants