jacob.eva/Sideband_CE
1
0
Fork 0
mirror of https://github.com/liberatedsystems/Sideband_CE.git synced 2024-09-03 04:13:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added user-local config dir on desktop

Browse Source
This commit is contained in:
Mark Qvist 2022-07-08 13:53:04 +02:00
parent ad4662efa8
commit 06642c0fda
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sbapp/Makefile
View File

@ -27,8 +27,11 @@ apk: prepare release postbuild
devapk: prepare debug postbuild devapk: prepare debug postbuild
version:
@(echo $$(python ./gv.py))
install: install:
adb install bin/sideband-0.1.7-arm64-v8a-release.apk adb install bin/sideband-$$(python ./gv.py)-arm64-v8a-release.apk
console: console:
(adb logcat | grep python) (adb logcat | grep python)

17
sbapp/gv.py Normal file
View File

@ -0,0 +1,17 @@
import re
import os
def gv() -> str:
version_file = os.path.join(
os.path.dirname(__file__), "main.py"
)
version_file_data = open(version_file, "rt", encoding="utf-8").read()
version_regex = r"(?<=^__version__ = ['\"])[^'\"]+(?=['\"]$)"
try:
version = re.findall(version_regex, version_file_data, re.M)[0]
return version
except IndexError:
raise ValueError(f"Unable to find version string in {version_file}.")
print(gv(), end="")
exit(0)

5
sbapp/main.py
View File

@ -3,8 +3,7 @@ import LXMF
import time import time
from kivy.logger import Logger, LOG_LEVELS from kivy.logger import Logger, LOG_LEVELS
# TODO: Reset Logger.setLevel(LOG_LEVELS["error"])
# Logger.setLevel(LOG_LEVELS["error"])
from kivymd.app import MDApp from kivymd.app import MDApp
from kivy.core.window import Window from kivy.core.window import Window
@ -34,7 +33,7 @@ from kivy.metrics import dp
from kivymd.uix.button import MDFlatButton from kivymd.uix.button import MDFlatButton
from kivymd.uix.dialog import MDDialog from kivymd.uix.dialog import MDDialog
__version__ = "0.1.7" __version__ = "0.1.8"
__variant__ = "beta" __variant__ = "beta"
if RNS.vendor.platformutils.get_platform() == "android": if RNS.vendor.platformutils.get_platform() == "android":

4
sbapp/sideband/core.py
View File

@ -70,11 +70,11 @@ class SidebandCore():
self.owner_app = owner_app self.owner_app = owner_app
self.reticulum = None self.reticulum = None
self.app_dir = plyer.storagepath.get_application_dir() self.app_dir = plyer.storagepath.get_home_dir()+"/.sideband"
self.rns_configdir = None self.rns_configdir = None
if RNS.vendor.platformutils.get_platform() == "android": if RNS.vendor.platformutils.get_platform() == "android":
self.app_dir = self.app_dir+"/io.unsigned.sideband/files/" self.app_dir = plyer.storagepath.get_application_dir()+"/io.unsigned.sideband/files/"
self.rns_configdir = self.app_dir+"/app_storage/reticulum" self.rns_configdir = self.app_dir+"/app_storage/reticulum"
if not os.path.isdir(self.app_dir+"/app_storage"): if not os.path.isdir(self.app_dir+"/app_storage"):