Printer status special character support #689
Merged
Conversation
This file contains 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
# Conflicts: # src/qz/printer/info/NativePrinterMap.java # src/qz/printer/status/PrinterStatus.java # src/qz/printer/status/StatusMonitor.java
tresf
requested changes
Jul 16, 2020
tresf
requested changes
Jul 16, 2020
tresf
requested changes
Jul 16, 2020
| @@ -54,7 +59,7 @@ public static PrinterStatus getFromCupsString(String reason, String issuingPrint | |||
| } | |||
|
|
|||
| public String toString() { | |||
| String returnString = type.getName() + ": Level " + type.getSeverity() + ", StatusCode " + type.getCode() + ", From " + issuingPrinterName; | |||
| String returnString = type.getName() + ": Level " + type.getSeverity() + ", StatusCode " + type.getCode() + ", From " + issuingPrinterDescription; | |||
There was a problem hiding this comment.
To avoid confusion please keep issuingPrinterName in the logs. If description is desired, add it as an additional field.
There was a problem hiding this comment.
The reason this changed is because this is the status' toString, and I wanted it to reflect exactly what the status will report to the client. Should I still go ahead with this change?
There was a problem hiding this comment.
The reason this changed is because this is the status' toString, and I wanted it to reflect exactly what the status will report to the client. Should I still go ahead with this change?
It's just misleading that on Linux, it will use a field labeled "description", when it's clearly not.
tresf
reviewed
Jul 16, 2020
tresf
reviewed
Jul 16, 2020
tresf
requested changes
Jul 16, 2020
tresf
approved these changes
Jul 17, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes #668
Ready for merge.
Fixes:
Known Issues:
Changing printer names on mac doesn't affect the names returned by status until qz restarts. This is due to there being no warning that a printer's description was changed, and renaming a printer on mac only changes the description.Todo:
Investigate solution to mac renaming issueTest changes on windows