Join concatenated strings

Author: snejus

beets/dbcore/query.py

@@ -690,9 +690,7 @@ class Period:
         ("%Y-%m-%dT%H:%M:%S", "%Y-%m-%d %H:%M:%S"),  # second
     )
     relative_units = {"y": 365, "m": 30, "w": 7, "d": 1}
-    relative_re = (
-        "(?P<sign>[+|-]?)(?P<quantity>[0-9]+)" + "(?P<timespan>[y|m|w|d])"
-    )
+    relative_re = "(?P<sign>[+|-]?)(?P<quantity>[0-9]+)(?P<timespan>[y|m|w|d])"
 
     def __init__(self, date: datetime, precision: str):
         """Create a period with the given date (a `datetime` object) and

beets/test/helper.py

@@ -837,10 +837,8 @@ def _make_track_match(self, artist, album, number):
         )
 
     def _make_album_match(self, artist, album, tracks, distance=0, missing=0):
-        if distance:
-            id = " " + "M" * distance
-        else:
-            id = ""
+        id = f" {'M' * distance}" if distance else ""
+
         if artist is None:
             artist = "Various Artists"
         else:

beets/ui/commands.py

@@ -136,7 +136,7 @@ def _print_keys(query):
 def fields_func(lib, opts, args):
     def _print_rows(names):
         names.sort()
-        print_("  " + "\n  ".join(names))
+        print_(f"  {'\n  '.join(names)}")
 
     print_("Item fields:")
     _print_rows(library.Item.all_keys())

beetsplug/bpd/__init__.py

@@ -1329,7 +1329,7 @@ def cmd_stats(self, conn):
             "albums: " + str(albums),
             "songs: " + str(songs),
             "uptime: " + str(int(time.time() - self.startup_time)),
-            "playtime: " + "0",  # Missing.
+            "playtime: 0",  # Missing.
             "db_playtime: " + str(int(totaltime)),
             "db_update: " + str(int(self.updated_time)),
         )

beetsplug/fish.py

@@ -127,15 +127,9 @@ def run(self, lib, opts, args):
         totstring += get_cmds_list([name[0] for name in cmd_names_help])
         totstring += "" if nobasicfields else get_standard_fields(fields)
         totstring += get_extravalues(lib, extravalues) if extravalues else ""
-        totstring += (
-            "\n" + "# ====== setup basic beet completion =====" + "\n" * 2
-        )
+        totstring += "\n# ====== setup basic beet completion =====\n\n"
         totstring += get_basic_beet_options()
-        totstring += (
-            "\n"
-            + "# ====== setup field completion for subcommands ====="
-            + "\n"
-        )
+        totstring += "\n# ====== setup field completion for subcommands =====\n"
         totstring += get_subcommands(cmd_names_help, nobasicfields, extravalues)
         # Set up completion for all the command options
         totstring += get_all_commands(beetcmds)
@@ -153,17 +147,13 @@ def _escape(name):
 
 def get_cmds_list(cmds_names):
     # Make a list of all Beets core & plugin commands
-    substr = ""
-    substr += "set CMDS " + " ".join(cmds_names) + ("\n" * 2)
-    return substr
+    return f"set CMDS {' '.join(cmds_names)}\n\n"
 
 
 def get_standard_fields(fields):
     # Make a list of album/track fields and append with ':'
     fields = (field + ":" for field in fields)
-    substr = ""
-    substr += "set FIELDS " + " ".join(fields) + ("\n" * 2)
-    return substr
+    return f"set FIELDS {' '.join(fields)}\n\n"
 
 
 def get_extravalues(lib, extravalues):
@@ -223,16 +213,16 @@ def get_subcommands(cmd_name_and_help, nobasicfields, extravalues):
     for cmdname, cmdhelp in cmd_name_and_help:
         cmdname = _escape(cmdname)
 
-        word += "\n" + f"# ------ fieldsetups for {cmdname} -------" + "\n"
+        word += "\n" + f"# ------ fieldsetups for {cmdname} -------\n"
         word += BL_NEED2.format(
-            ("-a " + cmdname), ("-f " + "-d " + wrap(clean_whitespace(cmdhelp)))
+            ("-a " + cmdname), ("-f -d " + wrap(clean_whitespace(cmdhelp)))
         )
 
         if nobasicfields is False:
             word += BL_USE3.format(
                 cmdname,
                 ("-a " + wrap("$FIELDS")),
-                ("-f " + "-d " + wrap("fieldname")),
+                ("-f -d " + wrap("fieldname")),
             )
 
         if extravalues:
@@ -242,7 +232,7 @@ def get_subcommands(cmd_name_and_help, nobasicfields, extravalues):
                     " ".join(
                         BL_EXTRA3.format(
                             (cmdname + " " + f + ":"),
-                            ("-f " + "-A " + "-a " + setvar),
+                            ("-f -A -a " + setvar),
                             ("-d " + wrap(f)),
                         ).split()
                     )
@@ -260,8 +250,7 @@ def get_all_commands(beetcmds):
         for name in names:
             name = _escape(name)
 
-            word += "\n"
-            word += ("\n" * 2) + f"# ====== completions for {name} =====" + "\n"
+            word += f"\n\n\n# ====== completions for {name} =====\n"
 
             for option in cmd.parser._get_all_options()[1:]:
                 cmd_l = (
@@ -306,7 +295,7 @@ def get_all_commands(beetcmds):
             word = word + " ".join(
                 BL_USE3.format(
                     name,
-                    ("-s " + "h " + "-l " + "help" + " -f "),
+                    ("-s h -l help -f "),
                     ("-d " + wrap("print help") + "\n"),
                 ).split()
             )

beetsplug/spotify.py

@@ -671,8 +671,8 @@ def _output_match_results(self, results):
                 self._log.info(
                     f"Attempting to open {self.data_source} with playlist"
                 )
-                spotify_url = "spotify:trackset:Playlist:" + ",".join(
-                    spotify_ids
+                spotify_url = (
+                    f"spotify:trackset:Playlist:{','.join(spotify_ids)}"
                 )
                 webbrowser.open(spotify_url)
             else:

test/plugins/test_playlist.py

@@ -132,7 +132,7 @@ def setup_test(self):
                 [
                     os.path.join("a", "b", "c.mp3") + "\n",
                     os.path.join("d", "e", "f.mp3") + "\n",
-                    "nonexisting.mp3" + "\n",
+                    "nonexisting.mp3\n",
                 ]
             )
 
@@ -155,7 +155,7 @@ def setup_test(self):
                 [
                     os.path.join("a", "b", "c.mp3") + "\n",
                     os.path.join("d", "e", "f.mp3") + "\n",
-                    "nonexisting.mp3" + "\n",
+                    "nonexisting.mp3\n",
                 ]
             )
 
@@ -214,7 +214,7 @@ def setup_test(self):
                 [
                     os.path.join("a", "b", "c.mp3") + "\n",
                     os.path.join("d", "e", "f.mp3") + "\n",
-                    "nonexisting.mp3" + "\n",
+                    "nonexisting.mp3\n",
                 ]
             )