]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Merge pull request #721 from paperless-ngx/bug-fix-date-ignore
authorshamoon <4887959+shamoon@users.noreply.github.com>
Tue, 10 May 2022 23:45:58 +0000 (16:45 -0700)
committerGitHub <noreply@github.com>
Tue, 10 May 2022 23:45:58 +0000 (16:45 -0700)
Fix Ignore Date Parsing

1  2 
src/documents/consumer.py
src/documents/models.py
src/documents/parsers.py
src/documents/tests/test_consumer.py
src/documents/tests/test_date_parsing.py

Simple merge
index fcb4be382a503061d7ea7a66990ee8a7ad50fd20,c7bd3767ea8e2d3b1f3f7fa55ef1322be9bd3ba2..ecabe085c335023fd64a5969629c4e3141e9fce6
@@@ -424,10 -428,10 +427,10 @@@ class FileInfo
      @classmethod
      def _mangle_property(cls, properties, name):
          if name in properties:
 -            properties[name] = getattr(cls, "_get_{}".format(name))(properties[name])
 +            properties[name] = getattr(cls, f"_get_{name}")(properties[name])
  
      @classmethod
-     def from_filename(cls, filename):
+     def from_filename(cls, filename) -> "FileInfo":
          # Mutate filename in-place before parsing its components
          # by applying at most one of the configured transformations.
          for (pattern, repl) in settings.FILENAME_PARSE_TRANSFORMS:
index be4db1e71198e02c885d0fc7cc4a4898de1ad739,b910778bde642a834a7a573124799788e81f919e..469ec2f1e8701a275948b2bf12eb568387158bf0
@@@ -143,10 -146,10 +146,10 @@@ def run_convert
      logger.debug("Execute: " + " ".join(args), extra={"group": logging_group})
  
      if not subprocess.Popen(args, env=environment).wait() == 0:
 -        raise ParseError("Convert failed at {}".format(args))
 +        raise ParseError(f"Convert failed at {args}")
  
  
- def get_default_thumbnail():
+ def get_default_thumbnail() -> str:
      return os.path.join(os.path.dirname(__file__), "resources", "document.png")
  
  
Simple merge