Skip to content

Commit 13bd577

Browse files
committed
ahhhh idk what happend
1 parent cecf69a commit 13bd577

8 files changed

Lines changed: 23 additions & 924 deletions

File tree

app.py

Lines changed: 0 additions & 63 deletions
This file was deleted.

apps.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

build.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,32 @@
77
system = platform.system()
88
if system == "Windows":
99
ext = ".exe"
10-
app_name = "pydeej.exe"
10+
app_name = "deej.exe"
1111
data_flag = "--add-data"
1212
data_sep = ";"
1313
elif system == "Darwin":
1414
ext = ".app"
15-
app_name = "pydeej"
15+
app_name = "deej"
1616
data_flag = "--add-data"
1717
data_sep = ":"
1818
else:
1919
ext = ""
20-
app_name = "pydeej"
20+
app_name = "deej"
2121
data_flag = "--add-data"
2222
data_sep = ":"
2323

2424
config_data = f"{spec_dir / 'config.yaml'}{data_sep}."
2525

2626
args = [
27-
str(spec_dir / "pydeej.py"),
27+
str(spec_dir / "deej.py"),
2828
f"--name={app_name}",
29-
"--onefile",
29+
"--onefile" if system != "Darwin" else "--onedir",
3030
"--console",
3131
f"{data_flag}={config_data}",
3232
"--hidden-import=comtypes",
33+
"--hidden-import=pyserial",
34+
"--hidden-import=pyyaml",
35+
"--hidden-import=pulsectl",
3336
f"--distpath={spec_dir}/dist",
3437
f"--workpath={spec_dir}/build",
3538
f"--specpath={spec_dir}",

config.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
slider_mapping:
2+
"0": master
3+
"1": brave.exe
4+
"2": spotify.exe
5+
"3":
6+
- assetocorsa.exe
7+
- discord.exe
8+
"4": master
9+
10+
jitter_threshold: 10
11+
invert_sliders: false
12+
reconnect: true
13+
com_port: COM3
14+
baud_rate: 9600

pydeej.py renamed to deej.py

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919
except ImportError:
2020
WINDOWS = False
2121

22-
23-
def _init_com():
24-
if WINDOWS:
25-
try:
26-
comtypes.CoInitialize()
27-
except Exception:
28-
pass
29-
3022
# ---------------- Linux ----------------
3123
try:
3224
import pulsectl
@@ -36,7 +28,7 @@ def _init_com():
3628

3729

3830
logging.basicConfig(level=logging.INFO)
39-
logger = logging.getLogger("pydeej")
31+
logger = logging.getLogger("deej")
4032

4133

4234
# =========================================================
@@ -53,12 +45,6 @@ def __init__(self):
5345
except:
5446
self.pulse = None
5547

56-
if WINDOWS:
57-
try:
58-
comtypes.CoInitialize()
59-
except Exception:
60-
pass
61-
6248
# ---------------- Windows ----------------
6349
def refresh_windows(self):
6450
if not WINDOWS:
@@ -251,19 +237,12 @@ def get(self):
251237
# App
252238
# =========================================================
253239
class DeejApp:
254-
_instance = None
255-
256240
def __init__(self, config, debug=False):
257241
self.config = Path(config)
258242
self.debug = debug
259243
self.volume = VolumeController()
260244
self.reader = None
261-
DeejApp._instance = self
262245

263-
@classmethod
264-
def get_instance(cls):
265-
return cls._instance
266-
267246
def load(self):
268247
with open(self.config) as f:
269248
return yaml.safe_load(f)
@@ -283,7 +262,6 @@ def run(self):
283262
self.reader = SerialReader(port, baud, sliders, self.debug, jitter_threshold=jitter, reconnect=reconnect)
284263
self.last_percent = {}
285264
self.invert = invert
286-
self.current_volumes = {}
287265

288266
def handle(values):
289267
if self.invert:
@@ -297,7 +275,6 @@ def handle(values):
297275

298276
percent = int((v / 1023) * 100)
299277
apps = mapping[key]
300-
self.current_volumes[key] = {"percent": percent, "apps": apps}
301278

302279
if key not in self.last_percent or self.last_percent[key] != percent:
303280
self.last_percent[key] = percent

0 commit comments

Comments
 (0)