partitura 1.3.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

partitura/io/matchlines_v1.py

@@ -58,6 +58,9 @@ from partitura.io.matchfile_utils import (
     format_key_signature_v1_0_0,
     to_snake_case,
     get_kwargs_from_matchline,
+    MatchTempoIndication,
+    interpret_as_tempo_indication,
+    format_tempo_indication,
 )
 
 # Define current version of the match file format
@@ -127,7 +130,6 @@ class MatchInfo(BaseInfoLine):
         value_type: type,
         format_fun: Callable[Any, str],
     ) -> None:
-
         if version < Version(1, 0, 0):
             raise ValueError("The version must be >= 1.0.0")
 
@@ -195,7 +197,6 @@ class MatchInfo(BaseInfoLine):
     def from_instance(
         cls, instance: BaseInfoLine, version: Version = LATEST_VERSION
     ) -> MatchInfo:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -239,6 +240,11 @@ SCOREPROP_LINE = {
             format_key_signature_v1_0_0,
             MatchKeySignature,
         ),
+        "tempoIndication": (
+            interpret_as_tempo_indication,
+            format_tempo_indication,
+            MatchTempoIndication,
+        ),
         "beatSubDivision": (interpret_as_list_int, format_list, list),
         "directions": (interpret_as_list, format_list, list),
     }
@@ -250,7 +256,6 @@ SCOREPROP_ATTRIBUTE_EQUIVALENCES = dict(
 
 
 class MatchScoreProp(MatchLine):
-
     field_names = (
         "Attribute",
         "Value",
@@ -285,7 +290,6 @@ class MatchScoreProp(MatchLine):
         offset: FractionalSymbolicDuration,
         time_in_beats: float,
     ) -> None:
-
         if version < Version(1, 0, 0):
             raise ValueError("The version must be >= 1.0.0")
 
@@ -351,7 +355,6 @@ class MatchScoreProp(MatchLine):
         class_dict = SCOREPROP_LINE[version]
 
         if match_pattern is not None:
-
             (
                 attribute,
                 value_str,
@@ -401,7 +404,6 @@ class MatchScoreProp(MatchLine):
         offset: Optional[FractionalSymbolicDuration] = None,
         time_in_beats: Optional[float] = None,
     ) -> MatchScoreProp:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -511,7 +513,6 @@ class MatchSection(MatchLine):
         end_in_beats_original: float,
         repeat_end_type: List[str],
     ) -> None:
-
         if version not in SECTION_LINE:
             raise ValueError(
                 f"Unknown version {version}!. "
@@ -549,7 +550,6 @@ class MatchSection(MatchLine):
         class_dict = SECTION_LINE[version]
 
         if match_pattern is not None:
-
             kwargs = dict(
                 [
                     (to_snake_case(fn), class_dict[fn][0](match_pattern.group(fn)))
@@ -588,7 +588,6 @@ class MatchStime(BaseStimeLine):
         onset_in_beats: float,
         annotation_type: List[str],
     ) -> None:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -613,7 +612,6 @@ class MatchStime(BaseStimeLine):
         pos: int = 0,
         version: Version = LATEST_VERSION,
     ) -> MatchStime:
-
         if version not in STIME_LINE:
             raise ValueError(
                 f"Unknown version {version}!. "
@@ -647,7 +645,6 @@ class MatchPtime(BasePtimeLine):
         version: Version,
         onsets: List[int],
     ) -> None:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -668,7 +665,6 @@ class MatchPtime(BasePtimeLine):
         pos: int = 0,
         version: Version = LATEST_VERSION,
     ) -> MatchStime:
-
         if version not in PTIME_LINE:
             raise ValueError(
                 f"Unknown version {version}!. "
@@ -690,7 +686,6 @@ class MatchPtime(BasePtimeLine):
 
 
 class MatchSnote(BaseSnoteLine):
-
     format_fun = dict(
         Anchor=format_string,
         NoteName=lambda x: str(x.upper()),
@@ -720,7 +715,6 @@ class MatchSnote(BaseSnoteLine):
         offset_in_beats: float,
         score_attributes_list: List[str],
     ) -> None:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
         super().__init__(
@@ -816,7 +810,6 @@ NOTE_LINE = {
 
 
 class MatchNote(BaseNoteLine):
-
     field_names = (
         "Id",
         "MidiPitch",
@@ -852,7 +845,6 @@ class MatchNote(BaseNoteLine):
         channel: int,
         track: int,
     ) -> None:
-
         if version not in NOTE_LINE:
             raise ValueError(
                 f"Unknown version {version}!. "
@@ -883,7 +875,6 @@ class MatchNote(BaseNoteLine):
         pos: int = 0,
         version: Version = LATEST_VERSION,
     ) -> MatchNote:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -907,7 +898,6 @@ class MatchNote(BaseNoteLine):
         instance: BaseNoteLine,
         version: Version = LATEST_VERSION,
     ) -> MatchNote:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -915,7 +905,6 @@ class MatchNote(BaseNoteLine):
             raise ValueError("`instance` needs to be a subclass of `BaseNoteLine`")
 
         if instance.version < Version(1, 0, 0):
-
             return cls(
                 version=version,
                 id=instance.Id,
@@ -947,7 +936,6 @@ class MatchStimePtime(BaseStimePtimeLine):
         matchline: str,
         version: Version = LATEST_VERSION,
     ) -> MatchSnoteNote:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -968,7 +956,6 @@ class MatchSnoteNote(BaseSnoteNoteLine):
         snote: BaseSnoteLine,
         note: BaseNoteLine,
     ) -> None:
-
         super().__init__(
             version=version,
             snote=snote,
@@ -981,7 +968,6 @@ class MatchSnoteNote(BaseSnoteNoteLine):
         matchline: str,
         version: Version = LATEST_VERSION,
     ) -> MatchSnoteNote:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -998,7 +984,6 @@ class MatchSnoteNote(BaseSnoteNoteLine):
     def from_instance(
         cls, instance: BaseSnoteNoteLine, version: Version
     ) -> MatchSnoteNote:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -1014,7 +999,6 @@ class MatchSnoteNote(BaseSnoteNoteLine):
 
 class MatchSnoteDeletion(BaseDeletionLine):
     def __init__(self, version: Version, snote: MatchSnote) -> None:
-
         super().__init__(
             version=version,
             snote=snote,
@@ -1026,7 +1010,6 @@ class MatchSnoteDeletion(BaseDeletionLine):
         matchline: str,
         version: Version = LATEST_VERSION,
     ) -> MatchSnoteDeletion:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -1042,7 +1025,6 @@ class MatchSnoteDeletion(BaseDeletionLine):
     def from_instance(
         cls, instance: BaseDeletionLine, version: Version
     ) -> MatchSnoteNote:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -1057,7 +1039,6 @@ class MatchSnoteDeletion(BaseDeletionLine):
 
 class MatchInsertionNote(BaseInsertionLine):
     def __init__(self, version: Version, note: MatchNote) -> None:
-
         super().__init__(
             version=version,
             note=note,
@@ -1069,7 +1050,6 @@ class MatchInsertionNote(BaseInsertionLine):
         matchline: str,
         version: Version = LATEST_VERSION,
     ) -> MatchInsertionNote:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -1085,7 +1065,6 @@ class MatchInsertionNote(BaseInsertionLine):
     def from_instance(
         cls, instance: BaseInsertionLine, version: Version
     ) -> MatchInsertionNote:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -1099,7 +1078,6 @@ class MatchInsertionNote(BaseInsertionLine):
 
 
 class MatchOrnamentNote(BaseOrnamentLine):
-
     field_names = (
         "Anchor",
         "OrnamentType",
@@ -1142,7 +1120,6 @@ class MatchOrnamentNote(BaseOrnamentLine):
         matchline: str,
         version: Version = LATEST_VERSION,
     ) -> MatchOrnamentNote:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -1163,7 +1140,6 @@ class MatchOrnamentNote(BaseOrnamentLine):
     def from_instance(
         cls, instance: BaseOrnamentLine, version: Version
     ) -> MatchOrnamentNote:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -1187,7 +1163,6 @@ class MatchSustainPedal(BaseSustainPedalLine):
         time: int,
         value: int,
     ) -> None:
-
         super().__init__(
             version=version,
             time=time,
@@ -1201,7 +1176,6 @@ class MatchSustainPedal(BaseSustainPedalLine):
         version: Version = LATEST_VERSION,
         pos: int = 0,
     ) -> MatchSustainPedal:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -1220,7 +1194,6 @@ class MatchSustainPedal(BaseSustainPedalLine):
     def from_instance(
         cls, instance: BaseSustainPedalLine, version: Version
     ) -> MatchOrnamentNote:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -1243,7 +1216,6 @@ class MatchSoftPedal(BaseSoftPedalLine):
         time: int,
         value: int,
     ) -> None:
-
         super().__init__(
             version=version,
             time=time,
@@ -1257,7 +1229,6 @@ class MatchSoftPedal(BaseSoftPedalLine):
         version: Version = LATEST_VERSION,
         pos: int = 0,
     ) -> MatchSoftPedal:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -1278,7 +1249,6 @@ class MatchSoftPedal(BaseSoftPedalLine):
         instance: BaseSoftPedalLine,
         version: Version,
     ) -> MatchOrnamentNote:
-
         if version < Version(1, 0, 0):
             raise ValueError(f"{version} < Version(1, 0, 0)")
 
@@ -1344,7 +1314,6 @@ def make_scoreprop(
     offset: FractionalSymbolicDuration,
     time_in_beats: float,
 ) -> MatchScoreProp:
-
     class_dict = SCOREPROP_LINE[version]
 
     _, format_fun, dtype = class_dict[attribute]
@@ -1372,7 +1341,6 @@ def make_section(
     end_in_beats_original: float,
     repeat_end_type: Union[str, List[str]],
 ) -> MatchSection:
-
     ml = MatchSection(
         version=version,
         start_in_beats_unfolded=start_in_beats_unfolded,
@@ -1406,7 +1374,6 @@ def to_v1(matchline: MatchLine, version: Version = LATEST_VERSION) -> MatchLine:
     from partitura.io.matchlines_v0 import MatchMeta
 
     if isinstance(matchline, BaseInfoLine):
-
         if (
             matchline.Attribute in INFO_LINE[version]
             or matchline.Attribute in INFO_ATTRIBUTE_EQUIVALENCES
@@ -1417,7 +1384,6 @@ def to_v1(matchline: MatchLine, version: Version = LATEST_VERSION) -> MatchLine:
             matchline.Attribute in SCOREPROP_LINE[version]
             or matchline.Attribute in SCOREPROP_ATTRIBUTE_EQUIVALENCES
         ):
-
             return MatchScoreProp.from_instance(instance=matchline, version=version)
 
     if isinstance(matchline, MatchMeta):

partitura/io/musescore.py

@@ -36,39 +36,70 @@ class FileImportException(Exception):
     pass
 
 
-def find_musescore3():
-    # # possible way to detect MuseScore... executable
-    # for p in os.environ['PATH'].split(':'):
-    #     c = glob.glob(os.path.join(p, 'MuseScore*'))
-    #     if c:
-    #         print(c)
-    #         break
-
-    result = shutil.which("musescore")
-
-    if result is None:
-        result = shutil.which("musescore3")
-
-    if result is None:
-        result = shutil.which("mscore")
-
+def find_musescore_version(version=4):
+    """Find the path to the MuseScore executable for a specific version.
+    If version is a empty string it tries to find an unspecified version of
+    MuseScore which is used in some systems.
+    """
+    result = shutil.which(f"musescore{version}")
     if result is None:
-        result = shutil.which("mscore3")
-
+        result = shutil.which(f"mscore{version}")
     if result is None:
         if platform.system() == "Linux":
             pass
-
         elif platform.system() == "Darwin":
-
-            result = shutil.which("/Applications/MuseScore 3.app/Contents/MacOS/mscore")
-
+            result = shutil.which(
+                f"/Applications/MuseScore {version}.app/Contents/MacOS/mscore"
+            )
         elif platform.system() == "Windows":
-            result = shutil.which(r"C:\Program Files\MuseScore 3\bin\MuseScore3.exe")
+            result = shutil.which(
+                rf"C:\Program Files\MuseScore {version}\bin\MuseScore{version}.exe"
+            )
 
     return result
 
 
+def find_musescore():
+    """Find the path to the MuseScore executable.
+
+    This function first tries to find the executable for MuseScore 4,
+    then for MuseScore 3, and finally for any version of MuseScore.
+
+    Returns
+    -------
+    str
+        Path to the MuseScore executable
+
+    Raises
+    ------
+    MuseScoreNotFoundException
+        When no MuseScore executable was found
+    """
+
+    mscore_exec = find_musescore_version(version=4)
+    if not mscore_exec:
+        mscore_exec = find_musescore_version(version=3)
+        if mscore_exec:
+            warnings.warn(
+                "Only Musescore 3 is installed. Consider upgrading to musescore 4."
+            )
+        else:
+            mscore_exec = find_musescore_version(version="")
+            if mscore_exec:
+                warnings.warn(
+                    "A unspecified version of MuseScore was found. Consider upgrading to musescore 4."
+                )
+            else:
+                raise MuseScoreNotFoundException()
+    # check if a screen is available (only on Linux)
+    if "DISPLAY" not in os.environ and platform.system() == "Linux":
+        raise MuseScoreNotFoundException(
+            "Musescore Executable was found, but a screen is missing. Musescore needs a screen to load scores"
+        )
+
+    return mscore_exec
+
+
 @deprecated_alias(fn="filename")
 @deprecated_parameter("ensure_list")
 def load_via_musescore(
@@ -104,30 +135,33 @@ or a list of these
         One or more part or partgroup objects
 
     """
+    if filename.endswith(".mscz"):
+        pass
+    else:
+        # open the file as text and check if the first symbol is "<" to avoid
+        # further processing in case of non-XML files
+        with open(filename, "r") as f:
+            if f.read(1) != "<":
+                raise FileImportException(
+                    "File {} is not a valid XML file.".format(filename)
+                )
 
-    mscore_exec = find_musescore3()
-
-    if not mscore_exec:
-
-        raise MuseScoreNotFoundException()
+    mscore_exec = find_musescore()
 
     xml_fh = os.path.splitext(os.path.basename(filename))[0] + ".musicxml"
 
-    cmd = [mscore_exec, "-o", xml_fh, filename]
+    cmd = [mscore_exec, "-o", xml_fh, filename, "-f"]
 
     try:
-
         ps = subprocess.run(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
 
         if ps.returncode != 0:
-
             raise FileImportException(
                 (
                     "Command {} failed with code {}. MuseScore " "error messages:\n {}"
                 ).format(cmd, ps.returncode, ps.stderr.decode("UTF-8"))
             )
     except FileNotFoundError as f:
-
         raise FileImportException(
             'Executing "{}" returned  {}.'.format(" ".join(cmd), f)
         )
@@ -172,14 +206,9 @@ def render_musescore(
     out : Optional[PathLike]
        Path to the output generated image (or None if no image was generated)
     """
-    mscore_exec = find_musescore3()
-
-    if not mscore_exec:
-
-        return None
+    mscore_exec = find_musescore()
 
     if fmt not in ("png", "pdf"):
-
         warnings.warn("warning: unsupported output format")
         return None
 
@@ -200,9 +229,9 @@ def render_musescore(
             "-o",
             os.fspath(img_fh),
             os.fspath(xml_fh),
+            "-f",
         ]
         try:
-
             ps = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
             if ps.returncode != 0:
@@ -219,7 +248,6 @@ def render_musescore(
                 return None
 
         except FileNotFoundError as f:
-
             warnings.warn(
                 'Executing "{}" returned  {}.'.format(" ".join(cmd), f),
                 ImportWarning,
@@ -232,7 +260,6 @@ def render_musescore(
         #                      ps.stderr.decode('UTF-8')))
 
         if fmt == "png":
-
             if PIL_EXISTS:
                 # get all generated image files
                 img_files = glob.glob(

partitura/musicanalysis/__init__.py

@@ -39,5 +39,5 @@ __all__ = [
     "compute_note_array",
     "full_note_array",
     "make_performance_features",
-    "note_array_to_score"
+    "note_array_to_score",
 ]