rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipc: Always use standarddir.runtime().

Browse Source
This commit is contained in:
Florian Bruhin 2015-09-11 21:13:37 +02:00
parent 748496e88d
commit 3bdfa3001c
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qutebrowser/misc/ipc.py
View File

@ -63,11 +63,7 @@ def _get_socketname(basedir, legacy=False):
data_to_hash = '-'.join(parts_to_hash).encode('utf-8') data_to_hash = '-'.join(parts_to_hash).encode('utf-8')
md5 = hashlib.md5(data_to_hash).hexdigest() md5 = hashlib.md5(data_to_hash).hexdigest()
if sys.platform.startswith('linux'): target_dir = standarddir.runtime()
target_dir = standarddir.runtime()
else: # pragma: no cover
# OS X or other Unix
target_dir = standarddir.temp()
parts = ['ipc'] parts = ['ipc']
parts.append(md5) parts.append(md5)

14
qutebrowser/utils/standarddir.py
View File

@ -20,6 +20,7 @@
"""Utilities to get and initialize data/config paths.""" """Utilities to get and initialize data/config paths."""
import os import os
import sys
import os.path import os.path
from PyQt5.QtCore import QCoreApplication, QStandardPaths from PyQt5.QtCore import QCoreApplication, QStandardPaths
@ -86,11 +87,22 @@ def download():
def runtime(): def runtime():
"""Get a location for runtime data.""" """Get a location for runtime data."""
typ = QStandardPaths.RuntimeLocation if sys.platform.startswith('linux'):
typ = QStandardPaths.RuntimeLocation
else: # pragma: no cover
# RuntimeLocation is a weird path on OS X and Windows.
typ = QStandardPaths.TempLocation
overridden, path = _from_args(typ, _args) overridden, path = _from_args(typ, _args)
if not overridden: if not overridden:
path = _writable_location(typ) path = _writable_location(typ)
# This is generic, but per-user. # This is generic, but per-user.
#
# For TempLocation:
# "The returned value might be application-specific, shared among
# other applications for this user, or even system-wide."
#
# Unfortunately this path could get too long for sockets (which have a
# maximum length of 104 chars), so we don't add the username here...
appname = QCoreApplication.instance().applicationName() appname = QCoreApplication.instance().applicationName()
path = os.path.join(path, appname) path = os.path.join(path, appname)
_maybe_create(path) _maybe_create(path)