Nemcio/DemonEditor
1
0
Fork 0
mirror of https://github.com/DYefremov/DemonEditor.git synced 2026-03-04 19:41:41 +01:00
Code Issues Packages Projects Releases Activity

minor http api correction for neutrino

Browse Source
This commit is contained in:
DYefremov
2021-10-01 11:44:38 +03:00
parent 4fd2939d2e
commit 3c5144134c
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/connections.py
View File

@@ -714,7 +714,7 @@ class HttpAPI:
return {"info": f.read().decode("utf-8").strip()}
elif req_type is HttpAPI.Request.N_STREAM:
return {"m3u": f.read().decode("utf-8")}
return f.read().decode("utf-8")
return {"data": f.read().decode("utf-8")}
@staticmethod
def init_auth(user, password, url, use_ssl=False):

17
app/ui/main.py
View File

@@ -700,7 +700,8 @@ class Application(Gtk.Application):
def force_ctrl(self, view, event):
""" Function for force ctrl press event for view """
event.state |= MOD_MASK
if event.state is not Gdk.ModifierType.SHIFT_MASK:
event.state |= MOD_MASK
def on_close_app(self, *args):
""" Performing operations before closing the application. """
@@ -2687,7 +2688,8 @@ class Application(Gtk.Application):
self._http_api.send(HttpAPI.Request.STREAM_CURRENT, "", self.record)
elif self._s_type is SettingsType.NEUTRINO_MP:
self._http_api.send(HttpAPI.Request.N_ZAP, "",
lambda rf: self._http_api.send(HttpAPI.Request.N_STREAM, rf, self.record))
lambda rf: self._http_api.send(HttpAPI.Request.N_STREAM,
rf.get("data", ""), self.record))
else:
log("Error [on record]: Settings type is not supported!")
@@ -2811,7 +2813,7 @@ class Application(Gtk.Application):
self._http_api.send(HttpAPI.Request.ZAP, ref, zap)
elif self._s_type is SettingsType.NEUTRINO_MP:
def zap(rq):
if rq and rq == "ok":
if rq and rq.get("data", None) == "ok":
GLib.idle_add(scroll_to, path, self._fav_view)
if callback:
callback()
@@ -2931,11 +2933,18 @@ class Application(Gtk.Application):
self._http_api.init()
return
GLib.idle_add(self._receiver_info_label.set_text, info.get("info", ""), priority=GLib.PRIORITY_LOW)
if self._http_api:
self._http_api.send(HttpAPI.Request.SIGNAL, None, self.update_neutrino_signal)
@lru_cache(maxsize=2)
def update_neutrino_signal(self, sig):
data = sig.get("data", None)
if data:
self.set_neutrino_signal(data)
@lru_cache(maxsize=2)
def set_neutrino_signal(self, sig):
s_data = sig.split()
has_data = len(s_data) == 6
if has_data:

3
app/ui/playback.py
View File

@@ -370,7 +370,8 @@ class PlayerBox(Gtk.Box):
self._app.http_api.send(HttpAPI.Request.STREAM_CURRENT, "", self.watch)
elif s_type is SettingsType.NEUTRINO_MP:
self._app.http_api.send(HttpAPI.Request.N_ZAP, "",
lambda rf: self._app.http_api.send(HttpAPI.Request.N_STREAM, rf, self.watch))
lambda rf: self._app.http_api.send(HttpAPI.Request.N_STREAM, rf.get("data", ""),
self.watch))
def watch(self, data):
url = self._app.get_url_from_m3u(data)