phyks/flatisfy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adapt to latest updates in Weboob

Browse Source
This commit is contained in:
Lucas Verney 2017-11-29 15:27:49 +01:00
parent d7960e4651
commit 0a1cac0e37
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flatisfy/fetch.py
View File

@ -18,7 +18,7 @@ LOGGER = logging.getLogger(__name__)
try: try:
from weboob.capabilities.housing import Query from weboob.capabilities.housing import Query, HOUSE_TYPES, POSTS_TYPES
from weboob.core.bcall import CallErrors from weboob.core.bcall import CallErrors
from weboob.core.ouiboube import WebNip from weboob.core.ouiboube import WebNip
from weboob.tools.json import WeboobEncoder from weboob.tools.json import WeboobEncoder
@ -145,7 +145,7 @@ class WeboobProxy(object):
try: try:
query.house_types = [ query.house_types = [
getattr( getattr(
Query.HOUSE_TYPES, HOUSE_TYPES,
house_type.upper() house_type.upper()
) )
for house_type in constraints_dict["house_types"] for house_type in constraints_dict["house_types"]
@ -156,8 +156,8 @@ class WeboobProxy(object):
try: try:
query.type = getattr( query.type = getattr(
Query, POSTS_TYPES,
"TYPE_{}".format(constraints_dict["type"].upper()) constraints_dict["type"].upper()
) )
except AttributeError: except AttributeError:
LOGGER.error("Invalid post type constraint.") LOGGER.error("Invalid post type constraint.")
@ -224,10 +224,16 @@ class WeboobProxy(object):
try: try:
housing = backend.get_housing(flat_id) housing = backend.get_housing(flat_id)
fields = [x[0] for x in housing.iter_fields()]
# TODO: Only laod phone in the end, after filtering
if not store_personal_data:
# Avoid making unwanted requests
fields = [x for x in fields if x != "phone"]
housing = backend.fillobj(housing, fields=fields)
# Otherwise, we miss the @backend afterwards # Otherwise, we miss the @backend afterwards
housing.id = full_flat_id housing.id = full_flat_id
# Eventually clear personal data
if not store_personal_data: if not store_personal_data:
# Ensure personal data is cleared
housing.phone = None housing.phone = None
return json.dumps(housing, cls=WeboobEncoder) return json.dumps(housing, cls=WeboobEncoder)