Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: add pyupgrade pre-commit hook 

- add --py3-plus flag to pyupgrade hook
- add --py36-plus flag to pyupgrade hook
This commit is contained in:
jo 2022-01-25 23:45:00 +01:00 committed by Kyle Robbertze
parent 21aaf9bca1
commit 32cb67806a
26 changed files with 90 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.pre-commit-config.yaml
View File

@ -34,6 +34,12 @@ repos:
- id: prettier
files: \.(md|yml|yaml|json)$
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
hooks:
- id: pyupgrade
args: [--py3-plus, --py36-plus]
- repo: https://github.com/psf/black
rev: 21.12b0
hooks:

6
analyzer/libretime_analyzer/message_listener.py
View File

@ -77,7 +77,7 @@ class MessageListener:
self.wait_for_messages()
except (KeyboardInterrupt, SystemExit):
break # Break out of the while loop and exit the application
except select.error:
except OSError:
pass
except pika.exceptions.AMQPError as e:
if self._shutdown:
@ -141,9 +141,7 @@ class MessageListener:
Here we parse the message, spin up an analyzer process, and report the
metadata back to the Airtime web application (or report an error).
"""
logger.info(
" - Received '%s' on routing_key '%s'" % (body, method_frame.routing_key)
)
logger.info(f" - Received '{body}' on routing_key '{method_frame.routing_key}'")
# Declare all variables here so they exist in the exception handlers below, no matter what.
audio_file_path = ""

2
analyzer/libretime_analyzer/status_reporter.py
View File

@ -53,7 +53,7 @@ def process_http_requests(ipc_queue, http_retry_queue_path):
try:
with open(http_retry_queue_path, "rb") as pickle_file:
retry_queue = pickle.load(pickle_file)
except IOError as e:
except OSError as e:
if e.errno == 2:
pass
else:

4
analyzer/libretime_analyzer/steps/analyze_metadata.py
View File

@ -25,7 +25,7 @@ def analyze_metadata(filename: str, metadata: Dict[str, Any]):
"metadata must be a dict. Was of type " + type(metadata).__name__
)
if not os.path.exists(filename):
raise FileNotFoundError("audio file not found: {}".format(filename))
raise FileNotFoundError(f"audio file not found: {filename}")
# Airtime <= 2.5.x nonsense:
metadata["ftype"] = "audioclip"
@ -186,6 +186,6 @@ def _analyze_wave(filename, metadata):
metadata["length_seconds"] = length_seconds
metadata["cueout"] = metadata["length"]
except wave.Error as ex:
logger.error("Invalid WAVE file: {}".format(str(ex)))
logger.error(f"Invalid WAVE file: {str(ex)}")
raise
return metadata

8
analyzer/libretime_analyzer/steps/organise_file.py
View File

@ -46,7 +46,7 @@ def organise_file(audio_file_path, import_directory, original_filename, metadata
"metadata must be a dict. Was of type " + type(metadata).__name__
)
if not os.path.exists(audio_file_path):
raise FileNotFoundError("audio file not found: {}".format(audio_file_path))
raise FileNotFoundError(f"audio file not found: {audio_file_path}")
# Import the file over to it's final location.
# TODO: Also, handle the case where the move fails and write some code
@ -80,7 +80,7 @@ def organise_file(audio_file_path, import_directory, original_filename, metadata
metadata["full_path"] = final_file_path
return metadata
base_file_path, file_extension = os.path.splitext(final_file_path)
final_file_path = "%s_%s%s" % (
final_file_path = "{}_{}{}".format(
base_file_path,
time.strftime("%m-%d-%Y-%H-%M-%S", time.localtime()),
file_extension,
@ -89,7 +89,7 @@ def organise_file(audio_file_path, import_directory, original_filename, metadata
# If THAT path exists, append a UUID instead:
while os.path.exists(final_file_path):
base_file_path, file_extension = os.path.splitext(final_file_path)
final_file_path = "%s_%s%s" % (
final_file_path = "{}_{}{}".format(
base_file_path,
str(uuid.uuid4()),
file_extension,
@ -99,7 +99,7 @@ def organise_file(audio_file_path, import_directory, original_filename, metadata
mkdir_p(os.path.dirname(final_file_path))
# Move the file into its final destination directory
logger.debug("Moving %s to %s" % (audio_file_path, final_file_path))
logger.debug(f"Moving {audio_file_path} to {final_file_path}")
shutil.move(audio_file_path, final_file_path)
metadata["full_path"] = final_file_path

2
api/libretime_api/models/authentication.py
View File

@ -60,7 +60,7 @@ class User(AbstractBaseUser):
objects = UserManager()
def get_full_name(self):
return "{} {}".format(self.first_name, self.last_name)
return f"{self.first_name} {self.last_name}"
def get_short_name(self):
return self.first_name

2
api/libretime_api/permissions.py
View File

@ -38,7 +38,7 @@ def get_permission_for_view(request, view):
try:
permission_type = REQUEST_PERMISSION_TYPE_MAP[request.method]
if view.__class__.__name__ == "APIRootView":
return "{}_apiroot".format(permission_type)
return f"{permission_type}_apiroot"
model = view.model_permission_name
own_obj = get_own_obj(request, view)
return "{permission_type}_{own_obj}{model}".format(

4
api/libretime_api/tests/runners.py
View File

@ -14,10 +14,10 @@ class ManagedModelTestRunner(DiscoverRunner):
self.unmanaged_models = [m for m in apps.get_models() if not m._meta.managed]
for m in self.unmanaged_models:
m._meta.managed = True
super(ManagedModelTestRunner, self).setup_test_environment(*args, **kwargs)
super().setup_test_environment(*args, **kwargs)
def teardown_test_environment(self, *args, **kwargs):
super(ManagedModelTestRunner, self).teardown_test_environment(*args, **kwargs)
super().teardown_test_environment(*args, **kwargs)
# reset unmanaged models
for m in self.unmanaged_models:
m._meta.managed = False

14
api/libretime_api/tests/test_permissions.py
View File

@ -28,7 +28,7 @@ class TestIsSystemTokenOrUser(APITestCase):
token = "doesnotexist"
request = APIRequestFactory().get(self.path)
request.user = AnonymousUser()
request.META["Authorization"] = "Api-Key {token}".format(token=token)
request.META["Authorization"] = f"Api-Key {token}"
allowed = IsSystemTokenOrUser().has_permission(request, None)
self.assertFalse(allowed)
@ -36,7 +36,7 @@ class TestIsSystemTokenOrUser(APITestCase):
token = settings.CONFIG.get("general", "api_key")
request = APIRequestFactory().get(self.path)
request.user = AnonymousUser()
request.META["Authorization"] = "Api-Key {token}".format(token=token)
request.META["Authorization"] = f"Api-Key {token}"
allowed = IsSystemTokenOrUser().has_permission(request, None)
self.assertTrue(allowed)
@ -81,7 +81,7 @@ class TestPermissions(APITestCase):
for model in self.URLS:
response = self.logged_in_test_model(model, "guest", GUEST, self.client.get)
self.assertEqual(
response.status_code, 200, msg="Invalid for model {}".format(model)
response.status_code, 200, msg=f"Invalid for model {model}"
)
def test_guest_permissions_failure(self):
@ -90,14 +90,14 @@ class TestPermissions(APITestCase):
model, "guest", GUEST, self.client.post
)
self.assertEqual(
response.status_code, 403, msg="Invalid for model {}".format(model)
response.status_code, 403, msg=f"Invalid for model {model}"
)
def test_dj_get_permissions(self):
for model in self.URLS:
response = self.logged_in_test_model(model, "dj", DJ, self.client.get)
self.assertEqual(
response.status_code, 200, msg="Invalid for model {}".format(model)
response.status_code, 200, msg=f"Invalid for model {model}"
)
def test_dj_post_permissions(self):
@ -110,7 +110,7 @@ class TestPermissions(APITestCase):
last_name="user",
)
f = baker.make("libretime_api.File", owner=user)
model = "files/{}".format(f.id)
model = f"files/{f.id}"
path = self.path.format(model)
self.client.login(username="test-dj", password="test")
response = self.client.patch(path, {"name": "newFilename"})
@ -126,7 +126,7 @@ class TestPermissions(APITestCase):
last_name="user",
)
f = baker.make("libretime_api.File")
model = "files/{}".format(f.id)
model = f"files/{f.id}"
path = self.path.format(model)
self.client.login(username="test-dj", password="test")
response = self.client.patch(path, {"name": "newFilename"})

16
api/libretime_api/tests/test_views.py
View File

@ -18,13 +18,13 @@ class TestFileViewSet(APITestCase):
def test_invalid(self):
path = self.path.format(id="a")
self.client.credentials(HTTP_AUTHORIZATION="Api-Key {}".format(self.token))
self.client.credentials(HTTP_AUTHORIZATION=f"Api-Key {self.token}")
response = self.client.get(path)
self.assertEqual(response.status_code, 400)
def test_does_not_exist(self):
path = self.path.format(id="1")
self.client.credentials(HTTP_AUTHORIZATION="Api-Key {}".format(self.token))
self.client.credentials(HTTP_AUTHORIZATION=f"Api-Key {self.token}")
response = self.client.get(path)
self.assertEqual(response.status_code, 404)
@ -40,7 +40,7 @@ class TestFileViewSet(APITestCase):
filepath="song.mp3",
)
path = self.path.format(id=str(f.pk))
self.client.credentials(HTTP_AUTHORIZATION="Api-Key {}".format(self.token))
self.client.credentials(HTTP_AUTHORIZATION=f"Api-Key {self.token}")
response = self.client.get(path)
self.assertEqual(response.status_code, 200)
@ -78,7 +78,7 @@ class TestScheduleViewSet(APITestCase):
instance=show,
file=f,
)
self.client.credentials(HTTP_AUTHORIZATION="Api-Key {}".format(self.token))
self.client.credentials(HTTP_AUTHORIZATION=f"Api-Key {self.token}")
response = self.client.get(self.path)
self.assertEqual(response.status_code, 200)
result = response.json()
@ -111,7 +111,7 @@ class TestScheduleViewSet(APITestCase):
instance=show,
file=f,
)
self.client.credentials(HTTP_AUTHORIZATION="Api-Key {}".format(self.token))
self.client.credentials(HTTP_AUTHORIZATION=f"Api-Key {self.token}")
response = self.client.get(self.path)
self.assertEqual(response.status_code, 200)
result = response.json()
@ -157,7 +157,7 @@ class TestScheduleViewSet(APITestCase):
instance=show,
file=f,
)
self.client.credentials(HTTP_AUTHORIZATION="Api-Key {}".format(self.token))
self.client.credentials(HTTP_AUTHORIZATION=f"Api-Key {self.token}")
response = self.client.get(self.path, {"is_valid": True})
self.assertEqual(response.status_code, 200)
result = response.json()
@ -203,13 +203,13 @@ class TestScheduleViewSet(APITestCase):
instance=show,
file=f,
)
self.client.credentials(HTTP_AUTHORIZATION="Api-Key {}".format(self.token))
self.client.credentials(HTTP_AUTHORIZATION=f"Api-Key {self.token}")
range_start = (filter_point - timedelta(minutes=1)).isoformat(
timespec="seconds"
)
range_end = (filter_point + timedelta(minutes=1)).isoformat(timespec="seconds")
response = self.client.get(
self.path, {"starts__range": "{},{}".format(range_start, range_end)}
self.path, {"starts__range": f"{range_start},{range_end}"}
)
self.assertEqual(response.status_code, 200)
result = response.json()

2
api/libretime_api/utils.py
View File

@ -10,7 +10,7 @@ def read_config_file(config_filepath):
try:
with open(config_filepath, encoding="utf-8") as config_file:
config.read_file(config_file)
except IOError as error:
except OSError as error:
print(
f"Unable to read config file at {config_filepath}: {error.strerror}",
file=sys.stderr,

8
api_client/libretime_api_client/utils.py
View File

@ -35,7 +35,7 @@ class IncompleteUrl(UrlException):
self.url = url
def __str__(self):
return "Incomplete url: '{}'".format(self.url)
return f"Incomplete url: '{self.url}'"
class UrlBadParam(UrlException):
@ -44,7 +44,7 @@ class UrlBadParam(UrlException):
self.param = param
def __str__(self):
return "Bad param '{}' passed into url: '{}'".format(self.param, self.url)
return f"Bad param '{self.param}' passed into url: '{self.url}'"
class KeyAuth(AuthBase):
@ -52,7 +52,7 @@ class KeyAuth(AuthBase):
self.key = key
def __call__(self, r):
r.headers["Authorization"] = "Api-Key {}".format(self.key)
r.headers["Authorization"] = f"Api-Key {self.key}"
return r
@ -195,7 +195,7 @@ class RequestProvider:
if attr in self:
return self.requests[attr]
else:
return super(RequestProvider, self).__getattribute__(attr)
return super().__getattribute__(attr)
def time_in_seconds(value):

10
api_client/libretime_api_client/version1.py
View File

@ -126,7 +126,7 @@ api_config["bin_dir"] = "/usr/lib/airtime/api_clients/"
################################################################################
# Airtime API Version 1 Client
################################################################################
class AirtimeApiClient(object):
class AirtimeApiClient:
def __init__(self, logger=None, config_path="/etc/airtime/airtime.conf"):
if logger is None:
self.logger = logging
@ -282,7 +282,7 @@ class AirtimeApiClient(object):
if self.config["general"]["base_dir"].startswith("/"):
self.config["general"]["base_dir"] = self.config["general"]["base_dir"][1:]
protocol = get_protocol(self.config)
url = "%s://%s:%s/%s%s/%s" % (
url = "{}://{}:{}/{}{}/{}".format(
protocol,
self.config["general"]["base_url"],
str(self.config["general"]["base_port"]),
@ -298,7 +298,7 @@ class AirtimeApiClient(object):
if self.config["general"]["base_dir"].startswith("/"):
self.config["general"]["base_dir"] = self.config["general"]["base_dir"][1:]
protocol = get_protocol(self.config)
url = "%s://%s:@%s:%s/%s/%s" % (
url = "{}://{}:@{}:{}/{}/{}".format(
protocol,
self.config["general"]["api_key"],
self.config["general"]["base_url"],
@ -348,9 +348,7 @@ class AirtimeApiClient(object):
# Note that we must prefix every key with: mdX where x is a number
# Is there a way to format the next line a little better? The
# parenthesis make the code almost unreadable
md_list = dict(
(("md%d" % i), json.dumps(md)) for i, md in enumerate(valid_actions)
)
md_list = {("md%d" % i): json.dumps(md) for i, md in enumerate(valid_actions)}
# For testing we add the following "dry" parameter to tell the
# controller not to actually do any changes
if dry:

6
api_client/libretime_api_client/version2.py
View File

@ -53,7 +53,7 @@ class AirtimeApiClient:
str_end = end_time.isoformat(timespec="seconds")
data = self.services.schedule_url(
params={
"ends__range": ("{}Z,{}Z".format(str_current, str_end)),
"ends__range": (f"{str_current}Z,{str_end}Z"),
"is_valid": True,
"playout_status__gt": 0,
}
@ -104,7 +104,7 @@ class AirtimeApiClient:
# Stream events are instantaneous
current["end"] = current["start"]
result["{}_0".format(key)] = {
result[f"{key}_0"] = {
"id": current["id"],
"type": "stream_output_start",
"start": current["start"],
@ -123,7 +123,7 @@ class AirtimeApiClient:
"independent_event": current["independent_event"],
}
result["{}_0".format(end.isoformat())] = {
result[f"{end.isoformat()}_0"] = {
"type": "stream_output_end",
"start": current["end"],
"end": current["end"],

2
installer/icecast/install/icecast2-install.py
View File

@ -20,5 +20,5 @@ try:
)
except Exception as e:
print("exception: {}".format(e))
print(f"exception: {e}")
sys.exit(1)

6
playout/libretime_liquidsoap/generate_liquidsoap_cfg.py
View File

@ -21,15 +21,15 @@ def generate_liquidsoap_config(ss, log_filepath: Optional[Path]):
try:
if not "port" in key and not "bitrate" in key: # Stupid hack
raise ValueError()
str_buffer = "%s = %s\n" % (key, int(value))
str_buffer = f"{key} = {int(value)}\n"
except ValueError:
try: # Is it a boolean?
if value == "true" or value == "false":
str_buffer = "%s = %s\n" % (key, value.lower())
str_buffer = f"{key} = {value.lower()}\n"
else:
raise ValueError() # Just drop into the except below
except: # Everything else is a string
str_buffer = '%s = "%s"\n' % (key, value)
str_buffer = f'{key} = "{value}"\n'
fh.write(str_buffer)
# ignore squashes unused variable errors from Liquidsoap

2
playout/libretime_liquidsoap/liquidsoap_prepare_terminate.py
View File

@ -15,5 +15,5 @@ try:
tn.read_all()
except Exception as e:
print("Error loading config file: {}".format(e))
print(f"Error loading config file: {e}")
sys.exit()

2
playout/libretime_playout/main.py
View File

@ -58,7 +58,7 @@ def liquidsoap_get_info(telnet_lock, host, port):
tn = telnetlib.Telnet(host, port)
msg = "version\n"
tn.write(msg.encode("utf-8"))
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
response = tn.read_all().decode("utf-8")
except Exception as e:
logger.error(e)

12
playout/libretime_playout/pypofetch.py
View File

@ -192,7 +192,7 @@ class PypoFetch(Thread):
self.config.playout.liquidsoap_host,
self.config.playout.liquidsoap_port,
)
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
tn.read_all()
logger.info("Liquidsoap is up and running")
break
@ -237,11 +237,11 @@ class PypoFetch(Thread):
logger.info(boot_up_time_command)
tn.write(boot_up_time_command)
connection_status = ("streams.connection_status\n").encode("utf-8")
connection_status = b"streams.connection_status\n"
logger.info(connection_status)
tn.write(connection_status)
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
output = tn.read_all()
except Exception as e:
@ -280,7 +280,7 @@ class PypoFetch(Thread):
command = ("vars.stream_metadata_type %s\n" % stream_format).encode("utf-8")
logger.info(command)
tn.write(command)
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
tn.read_all()
except Exception as e:
logger.exception(e)
@ -300,7 +300,7 @@ class PypoFetch(Thread):
command = ("vars.default_dj_fade %s\n" % fade).encode("utf-8")
logger.info(command)
tn.write(command)
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
tn.read_all()
except Exception as e:
logger.exception(e)
@ -321,7 +321,7 @@ class PypoFetch(Thread):
command = ("vars.station_name %s\n" % station_name).encode("utf-8")
logger.info(command)
tn.write(command)
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
tn.read_all()
except Exception as e:
logger.exception(e)

6
playout/libretime_playout/pypofile.py
View File

@ -53,7 +53,7 @@ class PypoFile(Thread):
media_item["file_ready"] = not do_copy
if do_copy:
logger.info("copying from %s to local cache %s" % (src, dst))
logger.info(f"copying from {src} to local cache {dst}")
try:
with open(dst, "wb") as handle:
logger.info(media_item)
@ -82,7 +82,7 @@ class PypoFile(Thread):
media_item["file_ready"] = True
except Exception as e:
logger.error("Could not copy from %s to %s" % (src, dst))
logger.error(f"Could not copy from {src} to {dst}")
logger.error(e)
def report_file_size_and_md5_to_api(self, file_path, file_id):
@ -97,7 +97,7 @@ class PypoFile(Thread):
break
m.update(data)
md5_hash = m.hexdigest()
except (OSError, IOError) as e:
except OSError as e:
file_size = 0
logger.error(
"Error getting file size and md5 hash for file id %s" % file_id

2
playout/libretime_playout/pypoliquidsoap.py
View File

@ -130,7 +130,7 @@ class PypoLiquidsoap:
x for x in scheduled_now if x["type"] == eventtypes.STREAM_OUTPUT_START
]
schedule_ids = set([x["row_id"] for x in scheduled_now_files])
schedule_ids = {x["row_id"] for x in scheduled_now_files}
row_id_map = {}
liq_queue_ids = set()

10
playout/libretime_playout/recorder.py
View File

@ -68,7 +68,7 @@ class ShowRecorder(Thread):
filename = filename.replace(" ", "-")
joined_path = os.path.join(RECORD_DIR, filename)
filepath = "%s.%s" % (joined_path, self.config.playout.record_file_format)
filepath = f"{joined_path}.{self.config.playout.record_file_format}"
br = self.config.playout.record_bitrate
sr = self.config.playout.record_samplerate
@ -77,7 +77,7 @@ class ShowRecorder(Thread):
# -f:16,2,44100
# -b:256
command = "ecasound -f:%s,%s,%s -i alsa -o %s,%s000 -t:%s" % (
command = "ecasound -f:{},{},{} -i alsa -o {},{}000 -t:{}".format(
ss,
c,
sr,
@ -145,7 +145,9 @@ class ShowRecorder(Thread):
recorded_file = mutagen.File(filepath, easy=True)
recorded_file["artist"] = artist
recorded_file["date"] = full_date
recorded_file["title"] = "%s-%s-%s" % (self.show_name, full_date, full_time)
recorded_file["title"] = "{}-{}-{}".format(
self.show_name, full_date, full_time
)
# You cannot pass ints into the metadata of a file. Even tracknumber needs to be a string
recorded_file["tracknumber"] = self.show_instance
recorded_file.save()
@ -240,7 +242,7 @@ class Recorder(Thread):
next_show = getDateTimeObj(start_time)
delta = next_show - tnow
s = "%s.%s" % (delta.seconds, delta.microseconds)
s = f"{delta.seconds}.{delta.microseconds}"
out = float(s)
if out < 5:

28
playout/libretime_playout/telnetliquidsoap.py
View File

@ -76,7 +76,7 @@ class TelnetLiquidsoap:
logger.debug(msg)
tn.write(msg.encode("utf-8"))
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
logger.debug(tn.read_all().decode("utf-8"))
except Exception:
raise
@ -93,7 +93,7 @@ class TelnetLiquidsoap:
logger.debug(msg)
tn.write(msg.encode("utf-8"))
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
logger.debug(tn.read_all().decode("utf-8"))
except Exception:
raise
@ -110,7 +110,7 @@ class TelnetLiquidsoap:
tn = self.__connect()
annotation = create_liquidsoap_annotation(media_item)
msg = "%s.push %s\n" % (queue_id, annotation)
msg = f"{queue_id}.push {annotation}\n"
logger.debug(msg)
tn.write(msg.encode("utf-8"))
@ -119,7 +119,7 @@ class TelnetLiquidsoap:
tn.write(msg.encode("utf-8"))
logger.debug(msg)
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
logger.debug(tn.read_all().decode("utf-8"))
except Exception:
raise
@ -141,7 +141,7 @@ class TelnetLiquidsoap:
logger.debug(msg)
tn.write(msg.encode("utf-8"))
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
logger.debug(tn.read_all().decode("utf-8"))
except Exception as e:
@ -161,7 +161,7 @@ class TelnetLiquidsoap:
logger.debug(msg)
tn.write(msg.encode("utf-8"))
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
logger.debug(tn.read_all().decode("utf-8"))
except Exception as e:
@ -184,7 +184,7 @@ class TelnetLiquidsoap:
logger.debug(msg)
tn.write(msg.encode("utf-8"))
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
logger.debug(tn.read_all().decode("utf-8"))
self.current_prebuffering_stream_id = None
@ -208,7 +208,7 @@ class TelnetLiquidsoap:
logger.debug(msg)
tn.write(msg.encode("utf-8"))
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
logger.debug(tn.read_all().decode("utf-8"))
self.current_prebuffering_stream_id = media_item["row_id"]
@ -228,7 +228,7 @@ class TelnetLiquidsoap:
logger.debug(msg)
tn.write(msg.encode("utf-8"))
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
stream_id = tn.read_all().decode("utf-8").splitlines()[0]
logger.debug("stream_id: %s" % stream_id)
@ -253,7 +253,7 @@ class TelnetLiquidsoap:
tn = telnetlib.Telnet(self.ls_host, self.ls_port)
logger.info(command)
tn.write(command.encode("utf-8"))
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
tn.read_all().decode("utf-8")
except Exception as e:
logger.error(traceback.format_exc())
@ -272,7 +272,7 @@ class TelnetLiquidsoap:
i = i.encode("utf-8")
tn.write(i)
tn.write("exit\n".encode("utf-8"))
tn.write(b"exit\n")
tn.read_all().decode("utf-8")
except Exception as e:
logger.error(str(e))
@ -311,10 +311,10 @@ class DummyTelnetLiquidsoap:
try:
self.telnet_lock.acquire()
logger.info("Pushing %s to queue %s" % (media_item, queue_id))
logger.info(f"Pushing {media_item} to queue {queue_id}")
from datetime import datetime
print("Time now: {:s}".format(datetime.utcnow()))
print(f"Time now: {datetime.utcnow():s}")
annotation = create_liquidsoap_annotation(media_item)
self.liquidsoap_mock_queues[queue_id].append(annotation)
@ -331,7 +331,7 @@ class DummyTelnetLiquidsoap:
logger.info("Purging queue %s" % queue_id)
from datetime import datetime
print("Time now: {:s}".format(datetime.utcnow()))
print(f"Time now: {datetime.utcnow():s}")
except Exception:
raise

2
playout/libretime_playout/testpypoliqqueue.py
View File

@ -46,7 +46,7 @@ plq.daemon = True
plq.start()
print("Time now: {:s}".format(datetime.utcnow()))
print(f"Time now: {datetime.utcnow():s}")
media_schedule = {}

6
utils/airtime-silan
View File

@ -56,9 +56,9 @@ try:
out = proc.communicate()[0].strip("\r\n")
info = json.loads(out)
data = {}
data["cuein"] = str("{0:f}".format(info["sound"][0][0]))
data["cueout"] = str("{0:f}".format(info["sound"][-1][1]))
data["length"] = str("{0:f}".format(info["file duration"]))
data["cuein"] = str("{:f}".format(info["sound"][0][0]))
data["cueout"] = str("{:f}".format(info["sound"][-1][1]))
data["length"] = str("{:f}".format(info["file duration"]))
processed_data.append((f["id"], data))
total += 1
if total % 5 == 0:

8
worker/libretime_worker/tasks.py
View File

@ -66,7 +66,7 @@ def podcast_download(
metadata_audiofile.save()
filetypeinfo = metadata_audiofile.pprint()
logger.info(
"filetypeinfo is {0}".format(filetypeinfo.encode("ascii", "ignore"))
"filetypeinfo is {}".format(filetypeinfo.encode("ascii", "ignore"))
)
re = requests.post(
callback_url,
@ -85,7 +85,7 @@ def podcast_download(
obj["status"] = 1
except Exception as e:
obj["error"] = e.message
logger.info("Error during file download: {0}".format(e))
logger.info(f"Error during file download: {e}")
logger.debug("Original Traceback: %s" % (traceback.format_exc(e)))
obj["status"] = 0
return json.dumps(obj)
@ -98,7 +98,7 @@ def podcast_override_metadata(m, podcast_name, override, track_title):
# if the album override option is enabled replace the album id3 tag with the podcast name even if the album tag contains data
if override is True:
logger.debug(
"overriding album name to {0} in podcast".format(
"overriding album name to {} in podcast".format(
podcast_name.encode("ascii", "ignore")
)
)
@ -111,7 +111,7 @@ def podcast_override_metadata(m, podcast_name, override, track_title):
m["album"]
except KeyError:
logger.debug(
"setting new album name to {0} in podcast".format(
"setting new album name to {} in podcast".format(
podcast_name.encode("ascii", "ignore")
)
)