Organize code and add wotd

Priberam/plugin.py

@@ -40,6 +40,7 @@ except ImportError:
 import urllib.parse
 import re
 import requests
+import atoma
 from bs4 import BeautifulSoup
 
 
@@ -48,44 +49,99 @@ class Priberam(callbacks.Plugin):
 
     def __clean_str(self, text, clean_number=False):
         text = re.sub(r'\s+', ' ', text)
-        text = re.sub(r'(\[.*?]) (\1)', r'\1', text)
+        #text = re.sub(r'(\[.*?]) (\1)', r'\1', text)
+        text = re.sub(r'\[.*?\]', '', text)
         text = re.sub(r'^\s+', '', text)
         if clean_number:
             text = re.sub(r'^\d+\. +', '', text)
         return text
 
-    def find(self, irc, msg, args, word, position):
-        """<word> [position]
-
-        Returns the dictionary definition of a <word>, at [position].
-        """
+    def __get_definition(self, word, position):
         response = requests.get(
             "https://dicionario.priberam.org/{}".format(urllib.parse.quote(word)),
-            headers={'User-agent': 'Mozilla/5.0'}
-            )
+            headers={'User-agent': 'Mozilla/5.0'})
         soup = BeautifulSoup(response.content.decode('utf-8'))
 
+        definition = {
+            'error': False,
+            'total': None,
+            'value': None,
+            'extra': None
+        }
+
+        # Check if word really exists
         error = soup.find('div', {'class': 'alert alert-info'})
         if error:
-            irc.reply(self.__clean_str(error.text), prefixNick=False)
-            return
+            definition['error'] = True
+            definition['value'] = self.__clean_str(error.text)
+            return definition
 
+        # Get all definitions from page
         definitions = soup.find('div', {'id': 'resultados'}).find_all('p')
 
         total = 0
+        # Only count the definitions that begin with a number
+        # Or the first is there is just one
         for idx in range(len(definitions)):
             if idx > 1 and self.__clean_str(definitions[idx].text)[:1].isdigit() is False:
                 break
             total += 1
 
         if position > total:
+            definition['error'] = True
+            return definition
+
+        extra = soup.find_all('span', {'class': 'def'})[0].text
+
+        definition['total'] = total
+        definition['value'] = self.__clean_str(definitions[position - 1].text, True)
+        if extra[0].islower():
+            definition['extra'] = extra
+
+        return definition
+
+    def find(self, irc, msg, args, word, position):
+        """<word> [position]
+
+        Returns the dictionary definition of a <word>, at [position].
+        """
+        definition = self.__get_definition(word, position)
+
+        if definition['error'] is True:
+            if definition['value'] is not None:
+                irc.reply(definition['value'], prefixNick=False)
             return
 
-        definition = self.__clean_str(definitions[position - 1].text, True)
-        
-        irc.reply("[{}/{}] {}".format(position, total, definition), prefixNick=False)
+        message = "[{}/{}] {}".format(
+            position,
+            definition['total'],
+            word)
+
+        if position is 1 and definition['extra'] is not None:
+            message = "{} ({})".format(message, definition['extra'])
+
+        message = "{} {}".format(message, definition['value'])
+        irc.reply(message, prefixNick=False)
     find = wrap(find, ['anything', optional('int', default=1)])
 
+    def wotd(self, irc, msg, args):
+        """takes no arguments
+
+        Returns the definition of the word of the day.
+        """
+        response = requests.get(
+            "https://dicionario.priberam.org/DoDiaRSS.aspx",
+            headers={'User-agent': 'Mozilla/5.0'}
+            )
+        feed = atoma.parse_rss_bytes(response.content)
+        definition = self.__get_definition(feed.items[0].title, 1)
+
+        irc.reply("Palavra do dia: {} ({}) {}".format(
+            feed.items[0].title,
+            definition['extra'],
+            definition['value']), prefixNick=False)
+    wotd = wrap(wotd)
+
 
 Class = Priberam