Fix Obok import in Calibre flatpak by using /sys/class/net/IFACE/address instead of ip
#586
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
jcotton42
changed the title
ip
jcotton42
changed the title
ipip
jcotton42
commented
Aug 4, 2024
| @@ -449,9 +449,15 @@ def __getmacaddrs (self): | |||
| for m in matches: | |||
| # print "m:{0}".format(m[0]) | |||
| macaddrs.append(m[0].upper()) | |||
| elif sys.platform.startswith('linux'): | |||
| for interface in os.listdir('/sys/class/net'): | |||
| with open('/sys/class/net/' + interface + '/address', 'r') as f: | |||
There was a problem hiding this comment.
I used string concat here instead of f-strings because I wasn't sure if I could assume at least Python 3.6.
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 #585 by using
/sys/class/net/IFACE/addressfor the MAC address instead of theipcommand. I left the old Linux method ofipandipconfigas an ultimate fallback, but I'm not sure if it's going to be useful.After making this change I was able to successfully import a DRM'd Kobo book from the Calibre flatpak. I should note I can only test in Calibre 7.