From c354f06c005124ae7f1a1de4157a366bb66756a0 Mon Sep 17 00:00:00 2001
From: Lars Kruse <devel@sumpfralle.de>
Date: Thu, 17 Feb 2022 01:56:06 +0100
Subject: [PATCH] style: remove visual separators and clear almost empty files
Thanks, flake8.
---
src/__init__.py | 1 -
src/base/__init__.py | 1 -
src/client/client.py | 11 -----------
src/client/connector.py | 8 ++------
src/client/playerclient.py | 16 ----------------
src/plugins/__init__.py | 1 -
src/scheduling/__init__.py | 1 -
tests/__init__.py | 1 -
8 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/src/__init__.py b/src/__init__.py
index 8b137891..e69de29b 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -1 +0,0 @@
-
diff --git a/src/base/__init__.py b/src/base/__init__.py
index 8b137891..e69de29b 100644
--- a/src/base/__init__.py
+++ b/src/base/__init__.py
@@ -1 +0,0 @@
-
diff --git a/src/client/client.py b/src/client/client.py
index 9d499d8f..27fa97eb 100644
--- a/src/client/client.py
+++ b/src/client/client.py
@@ -63,7 +63,6 @@ class LiquidSoapClient:
self.socket = None
self.metareader = configparser.ConfigParser()
- # ------------------------------------------------------------------------------------------ #
def connect(self):
"""
Verbindung herstellen
@@ -92,11 +91,9 @@ class LiquidSoapClient:
# AttributeError('characters_written')
- # ------------------------------------------------------------------------------------------ #
def is_connected(self):
return self.connected
- # ------------------------------------------------------------------------------------------ #
def write(self, data):
"""
Auf den Socket schreiben
@@ -106,7 +103,6 @@ class LiquidSoapClient:
if self.connected:
self.socket.sendall(data.decode("UTF-8"))
- # ------------------------------------------------------------------------------------------ #
def read_all(self, timeout=2):
"""
Vom Socket lesen, bis dieser "END" sendet
@@ -146,7 +142,6 @@ class LiquidSoapClient:
return data
- # ------------------------------------------------------------------------------------------ #
def read(self):
"""
read from socket and store return value in self.message
@@ -172,7 +167,6 @@ class LiquidSoapClient:
return self.message
- # ------------------------------------------------------------------------------------------ #
def close(self):
"""
Quit senden und Verbindung schließen
@@ -183,7 +177,6 @@ class LiquidSoapClient:
self.socket.close()
self.connected = False
- # ------------------------------------------------------------------------------------------ #
def command(self, namespace, command, param=""):
"""
Kommando an Liquidosap senden
@@ -254,7 +247,6 @@ class LiquidSoapClient:
self.logger.error(msg)
raise LQConnectionError(msg)
- # ------------------------------------------------------------------------------------------ #
def help(self):
"""
get liquidsoap server help
@@ -265,7 +257,6 @@ class LiquidSoapClient:
self.command("help", "")
return self.message
- # ------------------------------------------------------------------------------------------ #
def version(self):
"""
Liquidsoap get version
@@ -277,7 +268,6 @@ class LiquidSoapClient:
self.command(message, "")
return self.message
- # ------------------------------------------------------------------------------------------ #
def uptime(self):
"""
Liquidsoap get uptime
@@ -289,7 +279,6 @@ class LiquidSoapClient:
self.command("uptime", "")
return self.message
- # ------------------------------------------------------------------------------------------ #
def byebye(self):
"""
Liquidsoap say byebye
diff --git a/src/client/connector.py b/src/client/connector.py
index 9345538e..ce4fb660 100644
--- a/src/client/connector.py
+++ b/src/client/connector.py
@@ -172,12 +172,10 @@ class PlayerConnector:
)
raise e
- # ------------------------------------------------------------------------------------------ #
def try_to_reconnect(self):
self.enable_transaction()
return self.transaction > 0
- # ------------------------------------------------------------------------------------------ #
def enable_transaction(self, socket=None):
# set socket to playout if nothing else is given
if socket is None:
@@ -207,9 +205,9 @@ class PlayerConnector:
)
self.logger.critical(SU.red(msg))
# Not using this for now, as it should be triggered by "on_sick(..)" as well
- # self.event_dispatcher.on_critical(subject, msg, None)
+ if False:
+ self.event_dispatcher.on_critical(subject, msg, None)
- # ------------------------------------------------------------------------------------------ #
def disable_transaction(self, socket=None, force=False):
if not force:
# nothing to disable
@@ -241,7 +239,6 @@ class PlayerConnector:
self.__close_conn(socket)
self.transaction = 0
- # ------------------------------------------------------------------------------------------ #
def __open_conn(self, socket):
# already connected
# if self.transaction > 1:
@@ -260,7 +257,6 @@ class PlayerConnector:
socket.connect()
self.has_connection = True
- # ------------------------------------------------------------------------------------------ #
def __close_conn(self, socket):
# set socket to playout
if socket is None:
diff --git a/src/client/playerclient.py b/src/client/playerclient.py
index 3aa2fb87..f98b45cc 100644
--- a/src/client/playerclient.py
+++ b/src/client/playerclient.py
@@ -48,7 +48,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# return "LiquidSoapPlayerClient does not understand mixer."+command+str(args)
- # ------------------------------------------------------------------------------------------ #
def mixer_inputs(self, mixer_id):
# send command
self.command(mixer_id, "inputs")
@@ -56,7 +55,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# convert to list and return it
return self.message.strip().split(" ")
- # ------------------------------------------------------------------------------------------ #
def mixer_status(self, mixer_id, pos=""):
"""
Get state of a source in the mixer
@@ -268,7 +266,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
self.command("auraengine", "state")
return self.message
- # ------------------------------------------------------------------------------------------ #
# def skip(self, namespace="playlist", pos=""):
# """
# Source skippen
@@ -282,7 +279,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# self.command('skip', namespace, pos)
# return self.message
- # # ------------------------------------------------------------------------------------------ #
# def remove(self, pos, namespace="playlist"):
# """
# Track aus der secondary_queue oder der Playlist entfernen
@@ -296,7 +292,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# self.command('remove', namespace, str(pos))
# return self.message
- # # ------------------------------------------------------------------------------------------ #
# def insert(self, uri, pos='0', namespace="playlist"):
# """
# Track einfügen
@@ -312,7 +307,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# self.command('insert', namespace, str(pos) + ' ' + uri)
# return self.message
- # # ------------------------------------------------------------------------------------------ #
# def move(self, fromPos, toPos, namespace="playlist"):
# """
# Track von Position fromPos nach Position toPos verschieben
@@ -328,7 +322,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# self.command('move', namespace, str(fromPos) + ' ' + str(toPos))
# return self.message
- # ------------------------------------------------------------------------------------------ #
# def play(self, namespace="playlist"):
# """
# Source abspielen - funktioniert nur bei Playlist
@@ -340,7 +333,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# self.command('play', namespace)
# return self.message
- # # ------------------------------------------------------------------------------------------ #
# def pause(self, namespace="playlist"):
# """
# Source pausieren/stoppen - funktioniert nur bei Playlist
@@ -352,7 +344,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# self.command('pause', namespace)
# return self.message
- # # ------------------------------------------------------------------------------------------ #
# def flush(self, namespace="playlist"):
# """
# Playlist leeren
@@ -364,7 +355,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# self.command('flush', namespace)
# return self.message
- # # ------------------------------------------------------------------------------------------ #
# def playlistData(self):
# """
# Metadaten der Playlist ausgeben
@@ -374,7 +364,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# self.command('data', 'playlist')
# return self.message
- # # ------------------------------------------------------------------------------------------ #
# def get_queue(self, namespace="ch1", queue='queue'):
# """
# Queue eines Kanals ausgeben
@@ -388,7 +377,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# self.command(queue, namespace)
# return self.message
- # ------------------------------------------------------------------------------------------ #
# def loadPlaylist(self, uri, params="", namespace="playlist"):
# """
# Playlist laden
@@ -404,7 +392,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# self.command('load', namespace, uri + params)
# return self.message
- # ------------------------------------------------------------------------------------------ #
# def currentTrack(self, namespace="request"):
# """
# Das oder die ID(s) der gerade abgespielten requests erhalten
@@ -416,7 +403,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# self.command('on_air', namespace)
# return self.message
- # ------------------------------------------------------------------------------------------ #
def volume(self, pos, volume, namespace="mixer"):
"""
Lautstärke eines Kanals setzen
@@ -432,7 +418,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
self.command("volume", namespace, str(pos) + " " + str(volume))
return self.message
- # ------------------------------------------------------------------------------------------ #
# def playlist_remaining(self):
# """
# Wie lange läuft der aktuelle Track der Playlist noch
@@ -442,7 +427,6 @@ class LiquidSoapPlayerClient(LiquidSoapClient):
# self.command('remaining', 'playlist')
# return self.message
- # ------------------------------------------------------------------------------------------ #
# def list_channels(self):
# """
# Channels auflisten (Simple JSON)
diff --git a/src/plugins/__init__.py b/src/plugins/__init__.py
index 8b137891..e69de29b 100644
--- a/src/plugins/__init__.py
+++ b/src/plugins/__init__.py
@@ -1 +0,0 @@
-
diff --git a/src/scheduling/__init__.py b/src/scheduling/__init__.py
index 8b137891..e69de29b 100644
--- a/src/scheduling/__init__.py
+++ b/src/scheduling/__init__.py
@@ -1 +0,0 @@
-
diff --git a/tests/__init__.py b/tests/__init__.py
index 8b137891..e69de29b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1 +0,0 @@
-
--
GitLab