From 748495dcc9b29ecd339827cff1e99a479f07d1de Mon Sep 17 00:00:00 2001
From: P0psicles <rogier@headshots.nl>
Date: Tue, 4 Sep 2018 13:54:59 +0200
Subject: [PATCH 01/11] Added the new hd-space pubdate formats to the
 unittests.

---
 tests/providers/test_generic_provider.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tests/providers/test_generic_provider.py b/tests/providers/test_generic_provider.py
index 075693de36..a34cfe99ff 100644
--- a/tests/providers/test_generic_provider.py
+++ b/tests/providers/test_generic_provider.py
@@ -2,9 +2,10 @@
 """Provider test code for Generic Provider."""
 from __future__ import unicode_literals
 
-from datetime import date, datetime
+from datetime import date, datetime, timedelta
 
 from dateutil import tz
+from tzlocal import get_localzone
 
 from medusa.providers.generic_provider import GenericProvider
 
@@ -127,6 +128,18 @@
         'timezone': 'US/Eastern',
         'fromtimestamp': True
     },
+    {  # p22: hd-space test human date like yesterdat at 12:00:00
+        'pubdate': 'yesterday at {0}'.format((datetime.now() - timedelta(minutes=10, seconds=25)).strftime('%H:%M:%S')),
+        'expected': datetime.now().replace(microsecond=0, tzinfo=tz.gettz('UTC')) - timedelta(days=1, minutes=10, seconds=25),
+        'human_time': False,
+        'calculate_delta': True
+    },
+    {  # p22: hd-space test human date like today at 12:00:00
+        'pubdate': 'today at {0}'.format((datetime.now() - timedelta(minutes=10, seconds=25)).strftime('%H:%M:%S')),
+        'expected': datetime.now().replace(microsecond=0, tzinfo=tz.gettz('UTC')) - timedelta(days=0, minutes=10, seconds=25),
+        'human_time': False,
+        'calculate_delta': True
+    },
 ])
 def test_parse_pubdate(p):
     # Given
@@ -137,6 +150,7 @@ def test_parse_pubdate(p):
     df = p.get('dayfirst', False)
     yf = p.get('yearfirst', False)
     ft = p.get('fromtimestamp', False)
+    calculate_delta = p.get('calculate_delta', False)
 
     # When
     actual = sut.parse_pubdate(parsed_date, human_time=ht, timezone=tzone,

From 20b0100f68e12269a5fe2bdc55dbd869413543ba Mon Sep 17 00:00:00 2001
From: P0psicles <rogier@headshots.nl>
Date: Tue, 4 Sep 2018 13:57:59 +0200
Subject: [PATCH 02/11] Make changes to parse_pubdate() and hdspace. So it will
 handle date times like: yesterday at 12:00:00

---
 medusa/providers/generic_provider.py     | 18 +++++++++++++++++-
 medusa/providers/torrent/html/hdspace.py |  9 ++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/medusa/providers/generic_provider.py b/medusa/providers/generic_provider.py
index 5c3cf21431..7109f8411b 100644
--- a/medusa/providers/generic_provider.py
+++ b/medusa/providers/generic_provider.py
@@ -574,12 +574,28 @@ def parse_pubdate(pubdate, human_time=False, timezone=None, **kwargs):
                         matched_time = int(round(float(matched_time.strip())))
 
                     seconds = parse('{0} {1}'.format(matched_time, matched_granularity))
+                    if seconds is None:
+                        log.exception('Failed parsing human time: {0} {1}', matched_time, matched_granularity)
+                        raise ValueError('Failed parsing human time: {0} {1}'.format(matched_time, matched_granularity))
                 return datetime.now(tz.tzlocal()) - timedelta(seconds=seconds)
 
             if fromtimestamp:
                 dt = datetime.fromtimestamp(int(pubdate), tz=tz.gettz('UTC'))
             else:
-                dt = parser.parse(pubdate, dayfirst=df, yearfirst=yf, fuzzy=True)
+                from tzlocal import get_localzone
+                day_offset = 0
+                if 'yesterday at' in pubdate.lower() or 'today at' in pubdate.lower():
+                    # Strip yesterday including any other words
+                    time = re.search(r'(?P<time>[0-9:]+)', pubdate)
+                    print('use pubdate: ' + pubdate)
+                    print('regex time: %r' % time)
+                    if time:
+                        if 'yesterday' in pubdate:
+                            day_offset = 1
+                        pubdate = time.group('time')
+                        print('use pubdate: ' + pubdate)
+
+                dt = parser.parse(pubdate.strip(), dayfirst=df, yearfirst=yf, fuzzy=True) - timedelta(days=day_offset)
 
             # Always make UTC aware if naive
             if dt.tzinfo is None or dt.tzinfo.utcoffset(dt) is None:
diff --git a/medusa/providers/torrent/html/hdspace.py b/medusa/providers/torrent/html/hdspace.py
index e9c857f17f..3eb20d5ad2 100644
--- a/medusa/providers/torrent/html/hdspace.py
+++ b/medusa/providers/torrent/html/hdspace.py
@@ -155,7 +155,14 @@ def parse(self, data, mode):
                     torrent_size = row.find('td', class_='lista222', attrs={'width': '100%'}).get_text()
                     size = convert_size(torrent_size) or -1
 
-                    pubdate_raw = row.find_all('td', class_='lista', attrs={'align': 'center'})[3].get_text()
+                    pubdate_td = row.find_all('td', class_='lista', attrs={'align': 'center'})[3]
+                    pubdate_human_offset = pubdate_td.find('b').get_text()
+                    time_search = re.search('([0-9:]+)', pubdate_td.get_text())
+                    if pubdate_human_offset:
+                        pubdate_raw = pubdate_human_offset + ' at ' + time_search.group(1)
+                    else:
+                        pubdate_raw = time_search.group(1)
+
                     pubdate = self.parse_pubdate(pubdate_raw)
 
                     item = {

From 6156571c3c9fc3165a86321e080449fe602b7c05 Mon Sep 17 00:00:00 2001
From: P0psicles <rogier@headshots.nl>
Date: Tue, 4 Sep 2018 15:07:33 +0200
Subject: [PATCH 03/11] Fixed parsing.

---
 medusa/providers/torrent/html/hdspace.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/medusa/providers/torrent/html/hdspace.py b/medusa/providers/torrent/html/hdspace.py
index 3eb20d5ad2..d7178fcecd 100644
--- a/medusa/providers/torrent/html/hdspace.py
+++ b/medusa/providers/torrent/html/hdspace.py
@@ -156,12 +156,12 @@ def parse(self, data, mode):
                     size = convert_size(torrent_size) or -1
 
                     pubdate_td = row.find_all('td', class_='lista', attrs={'align': 'center'})[3]
-                    pubdate_human_offset = pubdate_td.find('b').get_text()
-                    time_search = re.search('([0-9:]+)', pubdate_td.get_text())
+                    pubdate_human_offset = pubdate_td.find('b')
                     if pubdate_human_offset:
-                        pubdate_raw = pubdate_human_offset + ' at ' + time_search.group(1)
+                        time_search = re.search('([0-9:]+)', pubdate_td.get_text())
+                        pubdate_raw = pubdate_human_offset.get_text() + ' at ' + time_search.group(1)
                     else:
-                        pubdate_raw = time_search.group(1)
+                        pubdate_raw = pubdate_td.get_text()
 
                     pubdate = self.parse_pubdate(pubdate_raw)
 

From e1a1e3f4f64123e6aed25a9bc26852a953b331c7 Mon Sep 17 00:00:00 2001
From: P0psicles <rogier@headshots.nl>
Date: Tue, 4 Sep 2018 15:08:25 +0200
Subject: [PATCH 04/11] Removed unused import.

---
 tests/providers/test_generic_provider.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/providers/test_generic_provider.py b/tests/providers/test_generic_provider.py
index a34cfe99ff..78cce3f5a3 100644
--- a/tests/providers/test_generic_provider.py
+++ b/tests/providers/test_generic_provider.py
@@ -5,7 +5,6 @@
 from datetime import date, datetime, timedelta
 
 from dateutil import tz
-from tzlocal import get_localzone
 
 from medusa.providers.generic_provider import GenericProvider
 

From 57ad8d71d3aa585cd172bd47d9b1f4c9b632258d Mon Sep 17 00:00:00 2001
From: P0psicles <rogier@headshots.nl>
Date: Tue, 4 Sep 2018 15:10:29 +0200
Subject: [PATCH 05/11] Remove prints.

---
 medusa/providers/generic_provider.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/medusa/providers/generic_provider.py b/medusa/providers/generic_provider.py
index 7109f8411b..5063571d60 100644
--- a/medusa/providers/generic_provider.py
+++ b/medusa/providers/generic_provider.py
@@ -587,13 +587,10 @@ def parse_pubdate(pubdate, human_time=False, timezone=None, **kwargs):
                 if 'yesterday at' in pubdate.lower() or 'today at' in pubdate.lower():
                     # Strip yesterday including any other words
                     time = re.search(r'(?P<time>[0-9:]+)', pubdate)
-                    print('use pubdate: ' + pubdate)
-                    print('regex time: %r' % time)
                     if time:
                         if 'yesterday' in pubdate:
                             day_offset = 1
                         pubdate = time.group('time')
-                        print('use pubdate: ' + pubdate)
 
                 dt = parser.parse(pubdate.strip(), dayfirst=df, yearfirst=yf, fuzzy=True) - timedelta(days=day_offset)
 

From c8dfb86300a79f6751f3af3460694184d7bd387e Mon Sep 17 00:00:00 2001
From: p0ps <p0psicles@users.noreply.github.com>
Date: Tue, 4 Sep 2018 15:12:01 +0200
Subject: [PATCH 06/11] Update generic_provider.py

no need for log.exception here.
---
 medusa/providers/generic_provider.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/medusa/providers/generic_provider.py b/medusa/providers/generic_provider.py
index 5063571d60..7ee7a5893a 100644
--- a/medusa/providers/generic_provider.py
+++ b/medusa/providers/generic_provider.py
@@ -575,7 +575,7 @@ def parse_pubdate(pubdate, human_time=False, timezone=None, **kwargs):
 
                     seconds = parse('{0} {1}'.format(matched_time, matched_granularity))
                     if seconds is None:
-                        log.exception('Failed parsing human time: {0} {1}', matched_time, matched_granularity)
+                        log.warning('Failed parsing human time: {0} {1}', matched_time, matched_granularity)
                         raise ValueError('Failed parsing human time: {0} {1}'.format(matched_time, matched_granularity))
                 return datetime.now(tz.tzlocal()) - timedelta(seconds=seconds)
 

From d54dd3763670429146fb53976234c41a1315c2ad Mon Sep 17 00:00:00 2001
From: p0ps <p0psicles@users.noreply.github.com>
Date: Tue, 4 Sep 2018 15:12:53 +0200
Subject: [PATCH 07/11] Update generic_provider.py

Cleanup the log.
---
 medusa/providers/generic_provider.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/medusa/providers/generic_provider.py b/medusa/providers/generic_provider.py
index 7ee7a5893a..3816a3e242 100644
--- a/medusa/providers/generic_provider.py
+++ b/medusa/providers/generic_provider.py
@@ -585,7 +585,7 @@ def parse_pubdate(pubdate, human_time=False, timezone=None, **kwargs):
                 from tzlocal import get_localzone
                 day_offset = 0
                 if 'yesterday at' in pubdate.lower() or 'today at' in pubdate.lower():
-                    # Strip yesterday including any other words
+                    # Extract a time
                     time = re.search(r'(?P<time>[0-9:]+)', pubdate)
                     if time:
                         if 'yesterday' in pubdate:

From 97f4d66944651c92865661083ddd1817bc946bba Mon Sep 17 00:00:00 2001
From: p0ps <p0psicles@users.noreply.github.com>
Date: Tue, 4 Sep 2018 15:14:03 +0200
Subject: [PATCH 08/11] Update test_generic_provider.py

calculate_date is not used anymore.
---
 tests/providers/test_generic_provider.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/providers/test_generic_provider.py b/tests/providers/test_generic_provider.py
index 78cce3f5a3..51a4f3043a 100644
--- a/tests/providers/test_generic_provider.py
+++ b/tests/providers/test_generic_provider.py
@@ -130,14 +130,12 @@
     {  # p22: hd-space test human date like yesterdat at 12:00:00
         'pubdate': 'yesterday at {0}'.format((datetime.now() - timedelta(minutes=10, seconds=25)).strftime('%H:%M:%S')),
         'expected': datetime.now().replace(microsecond=0, tzinfo=tz.gettz('UTC')) - timedelta(days=1, minutes=10, seconds=25),
-        'human_time': False,
-        'calculate_delta': True
+        'human_time': False
     },
     {  # p22: hd-space test human date like today at 12:00:00
         'pubdate': 'today at {0}'.format((datetime.now() - timedelta(minutes=10, seconds=25)).strftime('%H:%M:%S')),
         'expected': datetime.now().replace(microsecond=0, tzinfo=tz.gettz('UTC')) - timedelta(days=0, minutes=10, seconds=25),
-        'human_time': False,
-        'calculate_delta': True
+        'human_time': False
     },
 ])
 def test_parse_pubdate(p):
@@ -149,7 +147,6 @@ def test_parse_pubdate(p):
     df = p.get('dayfirst', False)
     yf = p.get('yearfirst', False)
     ft = p.get('fromtimestamp', False)
-    calculate_delta = p.get('calculate_delta', False)
 
     # When
     actual = sut.parse_pubdate(parsed_date, human_time=ht, timezone=tzone,

From d3caa6252ea6d6edfad6422e2a31eecc58db6ed1 Mon Sep 17 00:00:00 2001
From: P0psicles <rogier@headshots.nl>
Date: Tue, 4 Sep 2018 17:43:35 +0200
Subject: [PATCH 09/11] Fixed comments.

---
 tests/providers/test_generic_provider.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/providers/test_generic_provider.py b/tests/providers/test_generic_provider.py
index 78cce3f5a3..c4990dcda6 100644
--- a/tests/providers/test_generic_provider.py
+++ b/tests/providers/test_generic_provider.py
@@ -127,13 +127,13 @@
         'timezone': 'US/Eastern',
         'fromtimestamp': True
     },
-    {  # p22: hd-space test human date like yesterdat at 12:00:00
+    {  # p22: hd-space test human date like 'yesterday at 12:00:00'
         'pubdate': 'yesterday at {0}'.format((datetime.now() - timedelta(minutes=10, seconds=25)).strftime('%H:%M:%S')),
         'expected': datetime.now().replace(microsecond=0, tzinfo=tz.gettz('UTC')) - timedelta(days=1, minutes=10, seconds=25),
         'human_time': False,
         'calculate_delta': True
     },
-    {  # p22: hd-space test human date like today at 12:00:00
+    {  # p23: hd-space test human date like 'today at 12:00:00'
         'pubdate': 'today at {0}'.format((datetime.now() - timedelta(minutes=10, seconds=25)).strftime('%H:%M:%S')),
         'expected': datetime.now().replace(microsecond=0, tzinfo=tz.gettz('UTC')) - timedelta(days=0, minutes=10, seconds=25),
         'human_time': False,

From 5e544be275e90f756237253e429e4b6e5ef3e82a Mon Sep 17 00:00:00 2001
From: P0psicles <rogier@headshots.nl>
Date: Tue, 4 Sep 2018 17:48:50 +0200
Subject: [PATCH 10/11] updated CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9f6af8804..655ee92235 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - Fixed episode lookup with conflicting show IDs ([#4933](https://github.com/pymedusa/Medusa/pull/4933))
 - Fixed error getting season scene exceptions on show page [#4964](https://github.com/pymedusa/Medusa/pull/4964)
 - Fixed testing email notification with TLS ([#4972](https://github.com/pymedusa/Medusa/pull/4972))
+- Fixed provider hd-space parsing pubdate like 'yesterday at 12:00:00' ([#5111](https://github.com/pymedusa/Medusa/pull/5111))
 
 -----
 

From 377fe6590743ccb7756eea973078d403458d653b Mon Sep 17 00:00:00 2001
From: Dario <medariox@users.noreply.github.com>
Date: Tue, 4 Sep 2018 22:31:12 +0200
Subject: [PATCH 11/11] Remove unused import

---
 medusa/providers/generic_provider.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/medusa/providers/generic_provider.py b/medusa/providers/generic_provider.py
index 3816a3e242..47ea94b180 100644
--- a/medusa/providers/generic_provider.py
+++ b/medusa/providers/generic_provider.py
@@ -577,12 +577,12 @@ def parse_pubdate(pubdate, human_time=False, timezone=None, **kwargs):
                     if seconds is None:
                         log.warning('Failed parsing human time: {0} {1}', matched_time, matched_granularity)
                         raise ValueError('Failed parsing human time: {0} {1}'.format(matched_time, matched_granularity))
+
                 return datetime.now(tz.tzlocal()) - timedelta(seconds=seconds)
 
             if fromtimestamp:
                 dt = datetime.fromtimestamp(int(pubdate), tz=tz.gettz('UTC'))
             else:
-                from tzlocal import get_localzone
                 day_offset = 0
                 if 'yesterday at' in pubdate.lower() or 'today at' in pubdate.lower():
                     # Extract a time
@@ -590,9 +590,9 @@ def parse_pubdate(pubdate, human_time=False, timezone=None, **kwargs):
                     if time:
                         if 'yesterday' in pubdate:
                             day_offset = 1
-                        pubdate = time.group('time')
+                        pubdate = time.group('time').strip()
 
-                dt = parser.parse(pubdate.strip(), dayfirst=df, yearfirst=yf, fuzzy=True) - timedelta(days=day_offset)
+                dt = parser.parse(pubdate, dayfirst=df, yearfirst=yf, fuzzy=True) - timedelta(days=day_offset)
 
             # Always make UTC aware if naive
             if dt.tzinfo is None or dt.tzinfo.utcoffset(dt) is None: