Skip to content
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.

Sign up for GitHub

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

Fix windows rpc close & broken ipc pipe detection #236

Merged
merged 5 commits into from
Mar 2, 2024
Merged

Fix windows rpc close & broken ipc pipe detection #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
530e799
fix: fix windows error if the ipc file can't be used.
NikOverflow Mar 1, 2024
9621278
fix: fix rpc close for windows.
NikOverflow Mar 1, 2024
c7009db
fix: fix rpc close for windows on the rich presence itself.
NikOverflow Mar 1, 2024
f10fb9e
feat: let test_ipc_path throw the error.
NikOverflow Mar 2, 2024
b493893
refactor: fix the linting.
NikOverflow Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pypresence/presence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import json
import os
import time
import sys

from .baseclient import BaseClient
from .payloads import Payload
Expand Down Expand Up @@ -44,8 +45,10 @@ def connect(self):

def close(self):
self.send_data(2, {'v': 1, 'client_id': self.client_id})
self.sock_writer.close()
self.loop.close()
self.sock_writer.close()
if sys.platform == 'win32' or sys.platform == 'win64':
self.sock_writer._call_connection_lost(None)


class AioPresence(BaseClient):
Expand Down Expand Up @@ -81,5 +84,7 @@ async def connect(self):

def close(self):
self.send_data(2, {'v': 1, 'client_id': self.client_id})
self.sock_writer.close()
self.loop.close()
self.sock_writer.close()
if sys.platform == 'win32' or sys.platform == 'win64':
self.sock_writer._call_connection_lost(None)
8 changes: 7 additions & 1 deletion pypresence/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ def remove_none(d: dict):
return d


def test_ipc_path(path):
'''Tests an IPC pipe to ensure that it actually works'''
with open(path):
return True


# Returns on first IPC pipe matching Discord's
def get_ipc_path(pipe=None):
ipc = 'discord-ipc-'
Expand All @@ -40,7 +46,7 @@ def get_ipc_path(pipe=None):
full_path = os.path.abspath(os.path.join(tempdir, path))
if sys.platform == 'win32' or os.path.isdir(full_path):
for entry in os.scandir(full_path):
if entry.name.startswith(ipc) and os.path.exists(entry):
if entry.name.startswith(ipc) and os.path.exists(entry) and test_ipc_path(entry):
return entry.path


Expand Down
Loading