faerbit/fime
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Undo shortcut creation, because it doesn't work

Browse Source
This commit is contained in:
Fabian 2021-11-18 22:15:11 +01:00
parent 5753624065
commit 75af17d9b2
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fime/config.py
View File

@ -19,8 +19,8 @@ def dequotify(string):
class Config: class Config:
def __init__(self): def __init__(self):
self._configparser = ConfigParser() self._configparser = ConfigParser()
config_dir_path = Path(QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.ConfigLocation)) config_dir_path = Path(QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.AppConfigLocation))
config_path = config_dir_path / "fime" / "fime.conf" config_path = config_dir_path / "fime.conf"
if config_path.exists(): if config_path.exists():
print(f'Reading config file "{config_path}"') print(f'Reading config file "{config_path}"')
with open(config_path) as f: with open(config_path) as f:

12
src/fime/data.py
View File

@ -12,12 +12,6 @@ try:
except ImportError: except ImportError:
from PySide2 import QtCore from PySide2 import QtCore
data_dir_path = os.path.join(QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.AppDataLocation),
"fime")
tasks_path = os.path.join(data_dir_path, "tasks.json")
data_path = os.path.join(data_dir_path, "data_{}.json")
save_delay = 3 * 60 save_delay = 3 * 60
max_jira_tasks = 50 max_jira_tasks = 50
@ -84,6 +78,8 @@ class Tasks:
class Data(MutableMapping): class Data(MutableMapping):
def __init__(self): def __init__(self):
data_dir_path = QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.AppDataLocation)
self.data_path = os.path.join(data_dir_path, "data_{}.json")
if not os.path.exists(data_dir_path): if not os.path.exists(data_dir_path):
os.mkdir(data_dir_path) os.mkdir(data_dir_path)
self._cache = {} self._cache = {}
@ -101,7 +97,7 @@ class Data(MutableMapping):
atexit.register(cleanup) atexit.register(cleanup)
def __getitem__(self, key): def __getitem__(self, key):
dpath = data_path.format(key) dpath = self.data_path.format(key)
if key not in self._cache and os.path.exists(dpath): if key not in self._cache and os.path.exists(dpath):
with open(dpath, "r") as f: with open(dpath, "r") as f:
self._cache[key] = json.loads(f.read()) self._cache[key] = json.loads(f.read())
@ -128,7 +124,7 @@ class Data(MutableMapping):
for key in self._hot_keys: for key in self._hot_keys:
print(f"... saving dict {key} ...") print(f"... saving dict {key} ...")
to_write = self._cache[key] # apparently thread-safe to_write = self._cache[key] # apparently thread-safe
with open(data_path.format(key), "w+") as f: with open(self.data_path.format(key), "w+") as f:
f.write(json.dumps(to_write)) f.write(json.dumps(to_write))
self._hot_keys = set() self._hot_keys = set()
self._saving = False self._saving = False

5
src/fime/main.py
View File

@ -1,5 +1,4 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import signal import signal
import sys import sys
from functools import partial from functools import partial
@ -132,7 +131,7 @@ class App:
self.app.quit() self.app.quit()
def run(self): def run(self):
timer = QtCore.QTimer() timer = QtCore.QTimer(None)
# interrupt event loop regularly for signal handling # interrupt event loop regularly for signal handling
timer.timeout.connect(lambda: None) timer.timeout.connect(lambda: None)
timer.start(500) timer.start(500)
@ -161,6 +160,8 @@ class App:
def main(): def main():
try: try:
# important for QStandardPath to be correct
QtCore.QCoreApplication.setApplicationName("fime")
app = App() app = App()
app.run() app.run()
except FimeException as e: except FimeException as e: