Github/guess-filename.py
2
0
Fork 1
mirror of https://github.com/novoid/guess-filename.py.git synced 2026-02-16 13:24:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

added multi-line-support for get_euro_charge_from_context

Browse source
This commit is contained in:
Karl Voit 2016-03-08 16:51:19 +01:00
parent a409d91c04
commit 45797a0414
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
guessfilename.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Time-stamp: <2016-03-07 14:50:14 vk>
# Time-stamp: <2016-03-08 16:50:42 vk>
# TODO:
# * fix parts marked with «FIXXME»
@ -230,7 +230,7 @@ class GuessFilename(object):
def has_euro_charge(self, string):
"""
Returns true, if the string contains a number with a €-currency
Returns true, if the single-line string contains a number with a €-currency
"""
assert(type(string) == unicode or type(string) == str)
@ -245,7 +245,7 @@ class GuessFilename(object):
def get_euro_charge(self, string):
"""
Returns the first included €-currency or False
Returns the first included €-currency within single-line "string" or False
"""
assert(type(string) == unicode or type(string) == str)
@ -269,14 +269,16 @@ class GuessFilename(object):
assert(len(string) > 0)
context_range = '5' # range of characters where before/after is valid
components = re.match(before + r"\D{0," + context_range + "}((\d{1,6})[,.](\d{2}))\D{0," + context_range + "}" + after, string)
# for testing: re.search(".*" + before + r"\D{0,6}(\d{1,6}[,.]\d{2})\D{0,6}" + after + ".*", string).groups()
components = re.search(".*" + before + r"\D{0," + context_range + "}((\d{1,6})[,.](\d{2}))\D{0," + context_range + "}" + after + ".*", string)
if components:
floatstring = components.group(2) + ',' + components.group(3)
#logging.debug("get_euro_charge_from_context extracted float: [%s]" % floatstring)
return floatstring
else:
logging.debug("get_euro_charge_from_context was not able to extract a float: [%s] + [%s] + [%s]" % (before, string[:30] + u"...", after))
logging.debug(u"get_euro_charge_from_context was not able to extract a float: [%s] + [%s] + [%s]" % (before, string[:30] + u"...", after))
return False
def rename_file(self, dirname, oldbasename, newbasename, dryrun=False, quiet=False):
@ -381,7 +383,7 @@ class GuessFilename(object):
floatstr = 'FIXXME'
logging.warning(u"Could not parse the charge from file %s - please fix manually" % basename)
return datetimestr + \
u" Kirchenbeitrag " + floatstr + "€ -- " + \
u" Kirchenbeitrag " + floatstr + u"€ -- " + \
' '.join(self.adding_tags(tags, ['scan', 'taxes', 'bill'])) + \
u".pdf"
@ -421,13 +423,13 @@ class GuessFilename(object):
if not newfilename:
newfilename = self.derive_new_filename_from_content(dirname, basename)
logging.debug("derive_new_filename_from_content returned new filename: %s" % str(newfilename))
logging.debug(u"derive_new_filename_from_content returned new filename: %s" % newfilename)
if newfilename:
self.rename_file(dirname, basename, newfilename, dryrun)
return newfilename
else:
logging.debug("FAILED to derive new filename: not enough cues in file name or PDF file content")
logging.debug(u"FAILED to derive new filename: not enough cues in file name or PDF file content")
return False
def main():

6
guessfilename_test.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8; mode: python; -*-
# Time-stamp: <2016-03-07 14:49:04 vk>
# Time-stamp: <2016-03-07 14:58:28 vk>
import unittest
import logging
@ -194,6 +194,7 @@ class TestGuessFilename(unittest.TestCase):
def test_get_euro_charge_from_context(self):
self.assertEquals(self.guess_filename.get_euro_charge_from_context(u"xyz foo12,34EURbar xyz", "foo", "bar"), u"12,34")
self.assertEquals(self.guess_filename.get_euro_charge_from_context(u"foo12,34EURbar", "foo", "bar"), u"12,34")
self.assertEquals(self.guess_filename.get_euro_charge_from_context(u"foo12.34EURbar", "foo", "bar"), u"12,34")
self.assertEquals(self.guess_filename.get_euro_charge_from_context(u"foo12,34€bar", "foo", "bar"), u"12,34")
@ -219,6 +220,9 @@ class TestGuessFilename(unittest.TestCase):
self.assertEquals(self.guess_filename.get_euro_charge_from_context(u"foo ba 12,34 ba bar", "foo", "bar"), u"12,34")
self.assertEquals(self.guess_filename.get_euro_charge_from_context(u"foo xxx 12.34 xxx bar", "foo", "bar"), u"12,34")
self.assertFalse(self.guess_filename.get_euro_charge_from_context(u"foo xxxx 12.34 xxxx bar", "foo", "bar"))
self.assertEquals(self.guess_filename.get_euro_charge_from_context(u"DasinsteinTest2015:EURJahresbeitrag123,45Offen678,90Zahlungenbis03.11.2015sindber",
"Offen", "Zahlungen"), u"678,90")
def test_get_euro_charge(self):