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

Make standarddir work on HaikuOS

Browse Source 
For some reason, it returns an empty DataLocation.
This commit is contained in:
Florian Bruhin 2017-10-17 22:37:14 +02:00
parent 828ffd4979
commit 9dc9bcaf39
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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 shutil import shutil
import os.path import os.path
import contextlib import contextlib
@ -106,6 +107,10 @@ def _init_data(args):
if utils.is_windows: if utils.is_windows:
app_data_path = _writable_location(QStandardPaths.AppDataLocation) app_data_path = _writable_location(QStandardPaths.AppDataLocation)
path = os.path.join(app_data_path, 'data') path = os.path.join(app_data_path, 'data')
elif sys.platform.startswith('haiku'):
# HaikuOS returns an empty value for AppDataLocation
config_path = _writable_location(QStandardPaths.ConfigLocation)
path = os.path.join(config_path, 'data')
else: else:
path = _writable_location(typ) path = _writable_location(typ)
_create(path) _create(path)

14
tests/unit/utils/test_standarddir.py
View File

@ -103,6 +103,20 @@ def test_fake_windows(tmpdir, monkeypatch, what):
assert func() == str(tmpdir / APPNAME / what) assert func() == str(tmpdir / APPNAME / what)
def test_fake_haiku(tmpdir, monkeypatch):
"""Test getting data dir on HaikuOS."""
locations = {
QStandardPaths.DataLocation: '',
QStandardPaths.ConfigLocation: str(tmpdir / 'config' / APPNAME),
}
monkeypatch.setattr(standarddir.QStandardPaths, 'writableLocation',
locations.get)
monkeypatch.setattr(standarddir.sys, 'platform', 'haiku1')
standarddir._init_data(args=None)
assert standarddir.data() == str(tmpdir / 'config' / APPNAME / 'data')
class TestWritableLocation: class TestWritableLocation:
"""Tests for _writable_location.""" """Tests for _writable_location."""