-
-
Notifications
You must be signed in to change notification settings - Fork 10
Optimise display of property values #3
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
base: main
Are you sure you want to change the base?
Changes from all commits
fca9e7b
f4567ef
746cd01
a168bb3
c431fe4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,29 +42,75 @@ public class PropertyValueTransformer: ValueTransformer | |
|
|
||
| if let number = value.propertyList as? NSNumber | ||
| { | ||
| if Preferences.shared.numberDisplayMode == 0 | ||
| if CFGetTypeID(number) == CFBooleanGetTypeID() | ||
| { | ||
| return number.boolValue ? "true" : "false" | ||
| } | ||
| else if Preferences.shared.numberDisplayMode == 0 | ||
| { | ||
| return number.description | ||
| } | ||
| else if Preferences.shared.numberDisplayMode == 1 | ||
| else | ||
| { | ||
| return String( format: "0x%llX", number.int64Value ) | ||
| switch CFNumberGetType(number) | ||
| { | ||
| case .sInt8Type, .sInt16Type, .sInt32Type, .sInt64Type, .charType, .shortType, .intType, .longType, .longLongType: | ||
| return String(format: "0x%0*llX", CFNumberGetByteSize(number) * 2, number.uint64Value) | ||
|
|
||
CarterLi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| case .float32Type, .float64Type, .floatType, .doubleType, .cgFloatType: | ||
| return String(format: "0x%a", number.doubleValue) | ||
|
|
||
| default: | ||
| return number.description | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if let data = value.propertyList as? Data, data.count > 0 | ||
| { | ||
| if Preferences.shared.detectNumbersInData, let number = data.number() | ||
| if Preferences.shared.detectNumbersInData != 0, [1, 2, 4, 8].contains(data.count) | ||
| { | ||
| return PropertyValueTransformer().transformedValue( PropertyListNode( key: value.key, propertyList: NSNumber( value: number ) ) ) | ||
| } | ||
| else if Preferences.shared.dataDisplayMode == 0 | ||
| { | ||
| return data.base64EncodedString() | ||
| var number: UInt64 = 0 | ||
|
|
||
| switch (Preferences.shared.detectNumbersInData) | ||
| { | ||
| case 1: // big-endian | ||
| for byte in data | ||
| { | ||
| number = (number << 8) | UInt64(byte) | ||
| } | ||
| case 2: // little-endian | ||
| for ( i, byte ) in data.enumerated() | ||
| { | ||
| number |= UInt64( byte ) << ( i * 8 ) | ||
| } | ||
| default: | ||
| break | ||
CarterLi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| if Preferences.shared.numberDisplayMode == 0 | ||
| { | ||
| return number.description | ||
| } | ||
| else | ||
| { | ||
| let width = data.count * 2 | ||
| return String(format: "0x%0*llX", width, number) | ||
| } | ||
|
Comment on lines
+71
to
+99
|
||
| } | ||
| else if Preferences.shared.dataDisplayMode == 1 | ||
| else | ||
| { | ||
| return data.hexadecimalString() | ||
| switch Preferences.shared.dataDisplayMode | ||
| { | ||
| case 1: | ||
| return data.base64EncodedString() | ||
| case 2: | ||
| return "0x" + data.map { String(format: "%02X", $0) }.joined() | ||
CarterLi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| case 3: | ||
| return String(data: data, encoding: .utf8) ?? "<invalid UTF-8 data>" | ||
CarterLi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| default: | ||
| return data.description | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.