diff --git a/mp3monitoring/core.py b/mp3monitoring/core.py
index 7b58ad3..515e4ff 100644
--- a/mp3monitoring/core.py
+++ b/mp3monitoring/core.py
@@ -24,7 +24,7 @@ def _init(ignore_save=False):
with dynamic_data.SAVE_FILE.open('w', encoding='utf-8') as writer:
json.dump(json_dict, writer, indent=4)
except PermissionError:
- print('Cant write to config folder ({home}). Make sure you have write permissions.'.format(home=str(home)))
+ print(f"Cant write to config folder ({home}). Make sure you have write permissions.")
# load save file
# TODO: version not used
@@ -48,7 +48,7 @@ def start():
Entry point into program.
"""
if sys.version_info[0] < 3 or sys.version_info[1] < 6:
- sys.exit('Only Python 3.6 or greater is supported. You are using: {version}'.format(version=sys.version))
+ sys.exit("Only Python 3.6 or greater is supported. You are using: " + sys.version)
parser = ArgumentParser(prog='mp3-monitoring',
description='Monitors a folder and copies mp3s to another folder. Quit with Ctrl+C.')
diff --git a/mp3monitoring/gui/windows/about.py b/mp3monitoring/gui/windows/about.py
index 660e3c5..487d9bf 100644
--- a/mp3monitoring/gui/windows/about.py
+++ b/mp3monitoring/gui/windows/about.py
@@ -22,10 +22,9 @@ def __init__(self, parent):
# set descriptions
self.programName.setText(static_data.LONG_NAME)
self.version.setText(static_data.VERSION)
- self.authorValue.setText(
- "{name}".format(link=static_data.AUTHOR_GITHUB, name=static_data.AUTHOR))
+ self.authorValue.setText(f"{static_data.AUTHOR}")
self.licenseValue.setText("GPLv3")
- self.websiteValue.setText("Github".format(url=static_data.PROJECT_URL))
+ self.websiteValue.setText(f"Github")
# set logo
self.logo.setStyleSheet('background: transparent')
diff --git a/mp3monitoring/monitor.py b/mp3monitoring/monitor.py
index a1c027e..057b7c4 100644
--- a/mp3monitoring/monitor.py
+++ b/mp3monitoring/monitor.py
@@ -45,14 +45,7 @@ def from_json_dict(cls, json_dict):
return cls(source_dir, target_dir, startup, pause, last_mod_time)
def __str__(self):
- return "{active} | {source} | {target} | {pause}s | {status} | {startup} | {time}".format(
- active=self.thread.isAlive(),
- source=str(self.source_dir),
- target=str(self.target_dir),
- pause=str(self.pause),
- status=self.status,
- startup=self.startup,
- time=self.last_mod_time)
+ return f"{self.thread.isAlive()} | {self.source_dir} | {self.target_dir} | {self.pause}s | {self.status} | {self.startup} | {self.last_mod_time}"
def start(self):
"""
@@ -107,21 +100,20 @@ def check_directories(self):
Check source and initialize target directory.
"""
if not self.source_dir.exists():
- self.status = 'Source ({source_dir}) does not exist.'.format(source_dir=str(self.source_dir))
+ self.status = f"Source ({self.source_dir}) does not exist."
return False
elif not self.source_dir.is_dir():
- self.status = 'Source ({source_dir}) is not a directory.'.format(source_dir=str(self.source_dir))
+ self.status = f"Source ({self.source_dir}) is not a directory."
return False
if not self.target_dir.exists():
try:
Path.mkdir(self.target_dir, parents=True)
except PermissionError:
- self.status = 'Cant create target directory ({target_dir}). Do you have write permissions?'.format(
- target_dir=str(self.target_dir))
+ self.status = f"Cant create target directory ({self.target_dir}). Do you have write permissions?"
return False
elif not self.target_dir.is_dir():
- self.status = 'Target ({target_dir}) is not a directory.'.format(target_dir=str(self.target_dir))
+ self.status = f"Target ({self.target_dir}) is not a directory."
return False
return True
@@ -184,7 +176,8 @@ def get_all_mp3(files):
:param files: file list
:return: set(file)
"""
- pbar = tqdm(files, desc="Checking for mp3", unit="file", leave=True, mininterval=0.2, ncols=100, disable=dynamic_data.DISABLE_TQDM)
+ pbar = tqdm(files, desc="Checking for mp3", unit="file", leave=True, mininterval=0.2, ncols=100,
+ disable=dynamic_data.DISABLE_TQDM)
mp3_files = {file for file in pbar if is_mp3(file)}
pbar.close()
return mp3_files
@@ -198,7 +191,8 @@ def copy_files(files, target_dir: Path):
:param pbar:
:return:
"""
- pbar = tqdm(files, desc="Copying new mp3", unit="mp3", leave=True, mininterval=0.2, ncols=100, disable=dynamic_data.DISABLE_TQDM)
+ pbar = tqdm(files, desc="Copying new mp3", unit="mp3", leave=True, mininterval=0.2, ncols=100,
+ disable=dynamic_data.DISABLE_TQDM)
for file in pbar:
try:
new_file = target_dir.joinpath(file.name)
diff --git a/mp3monitoring/tools.py b/mp3monitoring/tools.py
index ba67efb..034dff2 100644
--- a/mp3monitoring/tools.py
+++ b/mp3monitoring/tools.py
@@ -12,7 +12,7 @@ def load_settings(save_dict):
if value.lower() in settings:
setattr(settings_data, value, settings[value.lower()])
else:
- print('{value} not found in settings.'.format(value=value))
+ print(f"{value} not found in settings.")
else:
print('No settings found in save file.')
@@ -34,7 +34,7 @@ def get_settings_dict():
try:
settings[value.lower()] = getattr(settings_data, value)
except AttributeError:
- print('Internal fail, for settings variable. ({variable}'.format(variable=value))
+ print(f"Internal fail, for settings variable. ({value}")
return settings
diff --git a/setup.cfg b/setup.cfg
index b523326..ee83221 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,11 +3,6 @@ start-dir = tests
code-directories = mp3monitoring
test-file-pattern = *_test.py
-[output-buffer]
-always-on = True
-stderr = False
-stdout = True
-
[coverage]
always-on = True
coverage = mp3monitoring