dotstrings 3.1.3__tar.gz → 3.1.4__tar.gz

{dotstrings-3.1.3 → dotstrings-3.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dotstrings
-Version: 3.1.3
+Version: 3.1.4
 Summary: Tools for dealing with the .strings files for iOS and macOS
 Home-page: https://github.com/Microsoft/dotstrings
 License: MIT

{dotstrings-3.1.3 → dotstrings-3.1.4}/dotstrings/dot_strings_entry.py

@@ -7,16 +7,25 @@ class DotStringsEntry:
     :param key: The key for the entry
     :param value: The value for the entry
     :param comments: Any comments associated with the entry
+    :param original_line: The original line number of the position of the key.
     """
 
     key: str
     value: str
     comments: list[str]
-
-    def __init__(self, key: str, value: str, comments: list[str]) -> None:
+    original_line: int
+
+    def __init__(
+        self,
+        key: str,
+        value: str,
+        comments: list[str],
+        original_line: int = 0,
+    ) -> None:
         self.key = key
         self.value = value
         self.comments = comments
+        self.original_line = original_line
 
     def strings_format(self) -> str:
         """Return the entry as would be formatted in a .strings file

{dotstrings-3.1.3 → dotstrings-3.1.4}/dotstrings/parser.py

@@ -12,7 +12,9 @@ from dotstrings.dot_stringsdict_entry import DotStringsDictEntry
 class Patterns:
     """The patterns used by the parser."""
 
-    comment = re.compile(r"(\'(?:[^\'\\]|\\[\s\S])*\')|//.*|/\*(?:[^*]|\*(?!/))*\*/", re.MULTILINE)
+    comment = re.compile(
+        r"(\'(?:[^\'\\]|\\[\s\S])*\')|//.*|/\*(?:[^*]|\*(?!/))*\*/", re.MULTILINE
+    )
     whitespace = re.compile(r"\s*", re.MULTILINE)
     entry = re.compile(r'"(.*)"\s*=\s*"(.*)" *;')
     quoteless_key_entry = re.compile(r'(.*?)\s*=\s*"(.*)" *;')
@@ -23,10 +25,12 @@ class Scanner:
 
     string: str
     offset: int
+    line: int
 
     def __init__(self, string: str) -> None:
         self.string = string
         self.offset = 0
+        self.line = 0
 
     def has_more(self) -> bool:
         """Check if there is more string remaining.
@@ -51,14 +55,17 @@ class Scanner:
 
         match = _pattern.match(self.string, self.offset)
 
-        if match is not None:
-            self.offset = match.end()
-            return match.group(0)
+        if match is None:
+            return None
 
-        return None
+        self.offset = match.end()
+        self.line += match.group(0).count("\n")
+        return match.group(0)
 
 
-def load(file_details: TextIO | str, encoding: str | None = None) -> list[DotStringsEntry]:
+def load(
+    file_details: TextIO | str, encoding: str | None = None
+) -> list[DotStringsEntry]:
     """Parse the contents of a .strings file from a file pointer.
 
     :param file_details: The file pointer or a file path
@@ -85,7 +92,9 @@ def load(file_details: TextIO | str, encoding: str | None = None) -> list[DotStr
         except UnicodeDecodeError:
             pass
 
-    raise DotStringsException(f"Could not determine encoding for file at path: {file_details}")
+    raise DotStringsException(
+        f"Could not determine encoding for file at path: {file_details}"
+    )
 
 
 def loads(contents: str) -> list[DotStringsEntry]:
@@ -168,7 +177,7 @@ def loads(contents: str) -> list[DotStringsEntry]:
         key = entry_matches.group(1)
         value = entry_matches.group(2)
 
-        strings.append(DotStringsEntry(key, value, comments))
+        strings.append(DotStringsEntry(key, value, comments, scanner.line))
 
     return strings
 

{dotstrings-3.1.3 → dotstrings-3.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dotstrings"
-version = "3.1.3"
+version = "3.1.4"
 description = "Tools for dealing with the .strings files for iOS and macOS"
 
 license = "MIT"