Merge pull request #76 from firstof9/dev

Properly unload sensor entities

custom_components/mail_and_packages/__init__.py

@@ -31,7 +31,7 @@ async def async_setup_entry(hass, config_entry):
     return True
 
 
-async def async_remove_entry(hass, config_entry):
+async def async_unload_entry(hass, config_entry):
     """Handle removal of an entry."""
     try:
         await hass.config_entries.async_forward_entry_unload(config_entry,
@@ -41,6 +41,7 @@ async def async_remove_entry(hass, config_entry):
         )
     except ValueError:
         pass
+    return True
 
 
 async def update_listener(hass, entry):

custom_components/mail_and_packages/config_flow.py

@@ -283,7 +283,7 @@ async def _show_step_options_2(self, user_input):
                 gif_duration = user_input["gif_duration"]
             if "scan_interval" in user_input:
                 scan_interval = user_input["scan_interval"]
-                
+
         data_schema = OrderedDict()
         data_schema[vol.Required("folder",
                                  default=folder)] = vol.In(mailboxes)

custom_components/mail_and_packages/const.py

@@ -1,5 +1,5 @@
 DOMAIN = "mail_and_packages"
-VERSION = "0.1.3-b7"
+VERSION = "0.1.3-b8"
 ISSUE_URL = "http://github.com/moralmunky/Home-Assistant-Mail-And-Packages"
 
 CONF_FOLDER = "folder"
@@ -32,5 +32,4 @@
 
 GIF_FILE_NAME = 'mail_today.gif'
 GIF_DURATION = 5
-
-SCAN_INTERVAL = 5
+SCAN_INTERVAL = 5

custom_components/mail_and_packages/sensor.py

@@ -47,6 +47,7 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+
 async def async_setup_entry(hass, entry, async_add_entities):
 
     config = {
@@ -105,7 +106,7 @@ def __init__(self, hass, config):
         self._amazon_packages = None
         self._amazon_items = None
         _LOGGER.debug("Config scan interval: %s", self._scan_interval)
-        
+
         self.update = Throttle(self._scan_interval)(self.update)
 
     def update(self):
@@ -160,7 +161,7 @@ def update(self):
 
         else:
             _LOGGER.debug("Host was left blank not attempting connection")
-        
+
         self._scan_time = update_time()
         _LOGGER.debug("Updated scan time: %s", self._scan_time)
 
@@ -907,8 +908,10 @@ def selectfolder(account, folder):
 
 def get_formatted_date():
     today = datetime.datetime.today().strftime('%d-%b-%Y')
-    #for testing
-    #today = '18-Mar-2020'
+    """
+    # for testing
+    # today = '18-Mar-2020'
+    """
     return today
 
 
@@ -938,6 +941,14 @@ def get_mails(account, image_output_path, gif_duration):
                                 '(FROM "' + USPS_Mail_Email + '" SUBJECT "' +
                                 USPS_Mail_Subject + '" ON "' + today + '")')
 
+    # Check to see if the path exists, if not make it
+    pathcheck = os.path.isdir(image_output_path)
+    if not pathcheck:
+        try:
+            os.makedirs(image_output_path)
+        except Exception as err:
+            _LOGGER.critical("Error creating directory: %s", str(err))
+
     if rv == 'OK':
         _LOGGER.debug("Informed Delivery email found processing...")
         for num in data[0].split():
@@ -954,15 +965,6 @@ def get_mails(account, image_output_path, gif_duration):
                 _LOGGER.debug("Extracting image from email")
                 filepath = image_output_path + part.get_filename()
 
-                # Check to see if the path exists, if not make it
-                pathcheck = os.path.isdir(image_output_path)
-                if not pathcheck:
-                    try:
-                        os.mkdir(image_output_path)
-                    except Exception as err:
-                        _LOGGER.critical("Error creating directory: %s",
-                                         str(err))
-
                 # Log error message if we are unable to open the filepath for
                 # some reason
                 try:
@@ -1029,11 +1031,15 @@ def get_mails(account, image_output_path, gif_duration):
 
         elif image_count == 0:
             _LOGGER.info("No mail found.")
-            try:
-                _LOGGER.debug("Removing " + image_output_path + GIF_FILE_NAME)
-                os.remove(image_output_path + GIF_FILE_NAME)
-            except Exception as err:
-                _LOGGER.error("Error attempting to remove image: %s", str(err))
+            filecheck = os.path.isfile(image_output_path + GIF_FILE_NAME)
+            if filecheck:
+                try:
+                    _LOGGER.debug("Removing " + image_output_path +
+                                  GIF_FILE_NAME)
+                    os.remove(image_output_path + GIF_FILE_NAME)
+                except Exception as err:
+                    _LOGGER.error("Error attempting to remove image: %s",
+                                  str(err))
             try:
                 _LOGGER.debug("Copying nomail gif")
                 copyfile(os.path.dirname(__file__) + '/mail_none.gif',