Compare commits
No commits in common. "822daed43ebd5169bbaa38e76a8380213ff7b472" and "11684b6fd7d1cc8d501070ef84899ae93f22ff94" have entirely different histories.
822daed43e
...
11684b6fd7
|
|
@ -88,8 +88,6 @@ DEFAULT_CONFIG = {
|
|||
"send_email": False,
|
||||
"smtp_server": 'localhost',
|
||||
"smtp_port": 25,
|
||||
"smtp_username": None,
|
||||
"smtp_password": None,
|
||||
"smtp_from": "noreply@flatisfy.org",
|
||||
"smtp_to": [],
|
||||
# The web site url, to be used in email notifications. (doesn't matter
|
||||
|
|
@ -151,8 +149,6 @@ def validate_config(config, check_with_data):
|
|||
assert isinstance(config["send_email"], bool)
|
||||
assert config["smtp_server"] is None or isinstance(config["smtp_server"], str) # noqa: E501
|
||||
assert config["smtp_port"] is None or isinstance(config["smtp_port"], int) # noqa: E501
|
||||
assert config["smtp_username"] is None or isinstance(config["smtp_username"], str) # noqa: E501
|
||||
assert config["smtp_password"] is None or isinstance(config["smtp_password"], str) # noqa: E501
|
||||
assert config["smtp_to"] is None or isinstance(config["smtp_to"], list)
|
||||
|
||||
assert isinstance(config["store_personal_data"], bool)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ from email.utils import formatdate, make_msgid
|
|||
LOGGER = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def send_email(server, port, subject, _from, _to, txt, html, username=None, password=None):
|
||||
def send_email(server, port, subject, _from, _to, txt, html):
|
||||
"""
|
||||
Send an email
|
||||
|
||||
|
|
@ -33,8 +33,6 @@ def send_email(server, port, subject, _from, _to, txt, html, username=None, pass
|
|||
return
|
||||
|
||||
server = smtplib.SMTP(server, port)
|
||||
if username or password:
|
||||
server.login(username or "", password or "")
|
||||
|
||||
msg = MIMEMultipart('alternative')
|
||||
msg['Subject'] = subject
|
||||
|
|
@ -112,6 +110,4 @@ def send_notification(config, flats):
|
|||
config["smtp_from"],
|
||||
config["smtp_to"],
|
||||
txt,
|
||||
html,
|
||||
config.get("smtp_username"),
|
||||
config.get("smtp_password"))
|
||||
html)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,42 @@
|
|||
"photos": [
|
||||
{
|
||||
"id": "0an3yarge9y446j653dewxu0jwy33pmwar47k2qym.jpg",
|
||||
"url": "flatisfy/test_files/127028739@seloger.jpg",
|
||||
"url": "https://v.seloger.com/s/width/800/visuels/0/a/n/3/0an3yarge9y446j653dewxu0jwy33pmwar47k2qym.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "1qnz6hpffcrd1c71htbooubgb7s57d82ie1v0zyf2.jpg",
|
||||
"url": "https://v.seloger.com/s/width/800/visuels/1/q/n/z/1qnz6hpffcrd1c71htbooubgb7s57d82ie1v0zyf2.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "16bv8yqgytefa1fq57hyk6e0y6ox8t2mh8wj2dgxq.jpg",
|
||||
"url": "https://v.seloger.com/s/width/800/visuels/1/6/b/v/16bv8yqgytefa1fq57hyk6e0y6ox8t2mh8wj2dgxq.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "1o23blwk87ew95e3vcq5ygyk10z2hy82fzo5j6hha.jpg",
|
||||
"url": "https://v.seloger.com/s/width/800/visuels/1/o/2/3/1o23blwk87ew95e3vcq5ygyk10z2hy82fzo5j6hha.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "20vuxbdp160sot4ccryf6g7g4rwxrkhz3b3tmq7zy.jpg",
|
||||
"url": "https://v.seloger.com/s/width/800/visuels/2/0/v/u/20vuxbdp160sot4ccryf6g7g4rwxrkhz3b3tmq7zy.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "00d9bpezie95lqtfmoccqg1ddrld2m64c2mcod5ha.jpg",
|
||||
"url": "https://v.seloger.com/s/width/800/visuels/0/0/d/9/00d9bpezie95lqtfmoccqg1ddrld2m64c2mcod5ha.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "0lhqf881qm2j03hz5581d8ggplp1xwwchb2rtoqgu.jpg",
|
||||
"url": "https://v.seloger.com/s/width/800/visuels/0/l/h/q/0lhqf881qm2j03hz5581d8ggplp1xwwchb2rtoqgu.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "0chwbagbf8tc0qf9sd3wryzl4gm7hkswcnrtnx2bi.jpg",
|
||||
"url": "https://v.seloger.com/s/width/800/visuels/0/c/h/w/0chwbagbf8tc0qf9sd3wryzl4gm7hkswcnrtnx2bi.jpg",
|
||||
"data": null
|
||||
}
|
||||
],
|
||||
|
|
@ -34,8 +69,5 @@
|
|||
"Etages": "30",
|
||||
"Parking": "1",
|
||||
"Salle de Séjour": ""
|
||||
},
|
||||
"flatisfy": {
|
||||
"postal_code": "35000"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,42 @@
|
|||
"photos": [
|
||||
{
|
||||
"id": "f9b2da6dfa184759aa0c349edb1cd037.jpg",
|
||||
"url": "flatisfy/test_files/14428129@explorimmo.jpg",
|
||||
"url": "http://thbr.figarocms.net/images/2qEDBqRV-QNlp4fHVNhSCWlt6rU=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/f9b2da6dfa184759aa0c349edb1cd037.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "3f2cc9dc429d4e3dbb9f4216f109d224.jpg",
|
||||
"url": "http://thbr.figarocms.net/images/DulZQyZkkwa0ZFBT1nYD9rUD0A4=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/3f2cc9dc429d4e3dbb9f4216f109d224.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "56ae1db620f44af6b860df10eba55870.jpg",
|
||||
"url": "http://thbr.figarocms.net/images/EpvEffLcFbBT7spEZB2dcOHaZwA=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/56ae1db620f44af6b860df10eba55870.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "5acdef1f05314fe19111a0c3d92b8fe5.jpg",
|
||||
"url": "http://thbr.figarocms.net/images/wHtDlJMwIrMC3cWXi8ASN4I6Zl4=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/5acdef1f05314fe19111a0c3d92b8fe5.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "16c686ea91b248129fe60011d61e060b.jpg",
|
||||
"url": "http://thbr.figarocms.net/images/SD5VT1gxRSXSlt3pAz8r_SI3rqw=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/16c686ea91b248129fe60011d61e060b.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "e6a67d42709d443481da0feb9a7e11a1.jpg",
|
||||
"url": "http://thbr.figarocms.net/images/u8PGKXqC0CL9AyEOI5T9TFeGs-Y=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/e6a67d42709d443481da0feb9a7e11a1.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "6888cc7bc823402198205e480c8cab6c.jpg",
|
||||
"url": "http://thbr.figarocms.net/images/-3AseFCRaleidG2vsDJpA5BLBa4=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/6888cc7bc823402198205e480c8cab6c.jpg",
|
||||
"data": null
|
||||
},
|
||||
{
|
||||
"id": "d40dbeea9e424ea2a846f5683746ea9e.jpg",
|
||||
"url": "http://thbr.figarocms.net/images/TMKBtBuucYge-BgCoUGRjxZjdBE=/560x420/filters:fill(f6f6f6):quality(80):strip_icc()/d40dbeea9e424ea2a846f5683746ea9e.jpg",
|
||||
"data": null
|
||||
}
|
||||
],
|
||||
|
|
@ -38,8 +73,5 @@
|
|||
"agencyFees": 0,
|
||||
"availabilityDate": null,
|
||||
"guarantee": 0
|
||||
},
|
||||
"flatisfy": {
|
||||
"postal_code": "35000"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -306,7 +306,7 @@ class TestDuplicates(unittest.TestCase):
|
|||
HASH_THRESHOLD = 10 # pylint: disable=invalid-name
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
self.IMAGE_CACHE = LocalImageCache( # pylint: disable=invalid-name
|
||||
self.IMAGE_CACHE = ImageCache( # pylint: disable=invalid-name
|
||||
storage_dir=tempfile.mkdtemp(prefix="flatisfy-")
|
||||
)
|
||||
super(TestDuplicates, self).__init__(*args, **kwargs)
|
||||
|
|
@ -446,54 +446,53 @@ class TestDuplicates(unittest.TestCase):
|
|||
)
|
||||
self.assertGreaterEqual(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS)
|
||||
|
||||
# TODO: fixme, find new testing examples
|
||||
# flats = self.load_files(
|
||||
# "128358415@seloger",
|
||||
# "14818297@explorimmo"
|
||||
# )
|
||||
flats = self.load_files(
|
||||
"128358415@seloger",
|
||||
"14818297@explorimmo"
|
||||
)
|
||||
|
||||
# score = duplicates.get_duplicate_score(
|
||||
# flats[0], flats[1],
|
||||
# self.IMAGE_CACHE, 20
|
||||
# )
|
||||
# self.assertGreaterEqual(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS)
|
||||
score = duplicates.get_duplicate_score(
|
||||
flats[0], flats[1],
|
||||
self.IMAGE_CACHE, 20
|
||||
)
|
||||
self.assertGreaterEqual(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS)
|
||||
|
||||
# # Different number of photos, and some are cropped
|
||||
# flats = self.load_files(
|
||||
# "124910113@seloger",
|
||||
# "13783671@explorimmo"
|
||||
# )
|
||||
# Different number of photos, and some are cropped
|
||||
flats = self.load_files(
|
||||
"124910113@seloger",
|
||||
"13783671@explorimmo"
|
||||
)
|
||||
|
||||
# score = duplicates.get_duplicate_score(
|
||||
# flats[0], flats[1],
|
||||
# self.IMAGE_CACHE, 20
|
||||
# )
|
||||
# self.assertGreaterEqual(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS)
|
||||
score = duplicates.get_duplicate_score(
|
||||
flats[0], flats[1],
|
||||
self.IMAGE_CACHE, 20
|
||||
)
|
||||
self.assertGreaterEqual(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS)
|
||||
|
||||
# # Same flat, different agencies, texts and photos
|
||||
# flats = self.load_files(
|
||||
# "122509451@seloger",
|
||||
# "127963747@seloger"
|
||||
# )
|
||||
# Same flat, different agencies, texts and photos
|
||||
flats = self.load_files(
|
||||
"122509451@seloger",
|
||||
"127963747@seloger"
|
||||
)
|
||||
|
||||
# score = duplicates.get_duplicate_score(
|
||||
# flats[0], flats[1],
|
||||
# self.IMAGE_CACHE, self.HASH_THRESHOLD
|
||||
# )
|
||||
# # Fix me : should be TestDuplicates.DUPLICATES_MIN_SCORE_WITH_PHOTOS
|
||||
# self.assertGreaterEqual(score, 4)
|
||||
score = duplicates.get_duplicate_score(
|
||||
flats[0], flats[1],
|
||||
self.IMAGE_CACHE, self.HASH_THRESHOLD
|
||||
)
|
||||
# Fix me : should be TestDuplicates.DUPLICATES_MIN_SCORE_WITH_PHOTOS
|
||||
self.assertGreaterEqual(score, 4)
|
||||
|
||||
# # Really similar flats, but different
|
||||
# flats = self.load_files(
|
||||
# "123312807@seloger",
|
||||
# "123314207@seloger"
|
||||
# )
|
||||
# Really similar flats, but different
|
||||
flats = self.load_files(
|
||||
"123312807@seloger",
|
||||
"123314207@seloger"
|
||||
)
|
||||
|
||||
# score = duplicates.get_duplicate_score(
|
||||
# flats[0], flats[1],
|
||||
# self.IMAGE_CACHE, self.HASH_THRESHOLD
|
||||
# )
|
||||
# self.assertLess(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS)
|
||||
score = duplicates.get_duplicate_score(
|
||||
flats[0], flats[1],
|
||||
self.IMAGE_CACHE, self.HASH_THRESHOLD
|
||||
)
|
||||
self.assertLess(score, self.DUPLICATES_MIN_SCORE_WITH_PHOTOS)
|
||||
|
||||
|
||||
def run():
|
||||
|
|
|
|||
Loading…
Reference in New Issue