From 60ba8308faed5afea9996c4c70d86b6499ed18ef Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Wed, 4 Jul 2018 12:25:41 +0200
Subject: xhtml: Simplify tmp_dir/extract_images into a single Option<str>
 parameter.

---
 poezio/core/handlers.py | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'poezio/core/handlers.py')

diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index d950491d..380715fc 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -274,13 +274,13 @@ class HandlerCore:
 
         use_xhtml = config.get_by_tabname('enable_xhtml_im',
                                           message['from'].bare)
-        tmp_dir = config.get('tmp_image_dir') or path.join(CACHE_DIR, 'images')
-        extract_images = config.get('extract_inline_images')
+        tmp_dir = None
+        if config.get('extract_inline_images'):
+            tmp_dir = config.get('tmp_image_dir') or path.join(CACHE_DIR, 'images')
         body = xhtml.get_body_from_message_stanza(
             message,
             use_xhtml=use_xhtml,
-            tmp_dir=tmp_dir,
-            extract_images=extract_images)
+            extract_images_to=tmp_dir)
         if not body:
             if not self.core.xmpp.plugin['xep_0380'].has_eme(message):
                 return
@@ -336,8 +336,7 @@ class HandlerCore:
         body = xhtml.get_body_from_message_stanza(
             message,
             use_xhtml=use_xhtml,
-            tmp_dir=tmp_dir,
-            extract_images=extract_images)
+            extract_images_to=tmp_dir)
         delayed, date = common.find_delayed_tag(message)
 
         def try_modify():
@@ -669,13 +668,13 @@ class HandlerCore:
 
         self.core.events.trigger('muc_msg', message, tab)
         use_xhtml = config.get_by_tabname('enable_xhtml_im', room_from)
-        tmp_dir = config.get('tmp_image_dir') or path.join(CACHE_DIR, 'images')
-        extract_images = config.get('extract_inline_images')
+        tmp_dir = None
+        if config.get('extract_inline_images'):
+            tmp_dir = config.get('tmp_image_dir') or path.join(CACHE_DIR, 'images')
         body = xhtml.get_body_from_message_stanza(
             message,
             use_xhtml=use_xhtml,
-            tmp_dir=tmp_dir,
-            extract_images=extract_images)
+            extract_images_to=tmp_dir)
         if not body:
             return
 
@@ -747,13 +746,13 @@ class HandlerCore:
 
         room_from = jid.bare
         use_xhtml = config.get_by_tabname('enable_xhtml_im', jid.bare)
-        tmp_dir = config.get('tmp_image_dir') or path.join(CACHE_DIR, 'images')
-        extract_images = config.get('extract_inline_images')
+        tmp_dir = None
+        if config.get('extract_inline_images'):
+            tmp_dir = config.get('tmp_image_dir') or path.join(CACHE_DIR, 'images')
         body = xhtml.get_body_from_message_stanza(
             message,
             use_xhtml=use_xhtml,
-            tmp_dir=tmp_dir,
-            extract_images=extract_images)
+            extract_images_to=tmp_dir)
         tab = self.core.get_tab_by_name(
             jid.full,
             tabs.PrivateTab)  # get the tab with the private conversation
@@ -774,8 +773,7 @@ class HandlerCore:
         body = xhtml.get_body_from_message_stanza(
             message,
             use_xhtml=use_xhtml,
-            tmp_dir=tmp_dir,
-            extract_images=extract_images)
+            extract_images_to=tmp_dir)
         if not body or not tab:
             return
         replaced = False
-- 
cgit v1.2.3