sonny/newsreader
1
0
Fork 0
Code Issues 13 Pull requests 2 Projects Releases 58 Packages Wiki Activity Actions

0.2.3 #99

Merged
sonny merged 112 commits from development into master 2020-05-23 16:58:42 +02:00
Conversation 3 Commits 112 Files changed 135 +9 -9
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1b774a7208 - Show all commits

2
src/newsreader/news/collection/feed.py
View file

@ -70,7 +70,7 @@ class FeedBuilder(Builder):
value = self.truncate_text(model_field, entry[field]) value = self.truncate_text(model_field, entry[field])
if field == "published_parsed": if field == "published_parsed":
created, aware_datetime = build_publication_date(value, tz) aware_datetime, created = build_publication_date(value, tz)
data[model_field] = aware_datetime if created else None data[model_field] = aware_datetime if created else None
elif field == "summary": elif field == "summary":
summary = self.sanitize_summary(value) summary = self.sanitize_summary(value)

6
src/newsreader/news/collection/tests/feed/collector/tests.py
View file

@ -139,7 +139,7 @@ class FeedCollectorTestCase(TestCase):
self.mocked_parse.return_value = duplicate_mock self.mocked_parse.return_value = duplicate_mock
rule = CollectionRuleFactory() rule = CollectionRuleFactory()
_, aware_datetime = build_publication_date( aware_datetime, _ = build_publication_date(
struct_time((2019, 5, 20, 16, 7, 37, 0, 140, 0)), pytz.utc struct_time((2019, 5, 20, 16, 7, 37, 0, 140, 0)), pytz.utc
) )
@ -152,7 +152,7 @@ class FeedCollectorTestCase(TestCase):
rule=rule, rule=rule,
) )
_, aware_datetime = build_publication_date( aware_datetime, _ = build_publication_date(
struct_time((2019, 5, 20, 12, 19, 19, 0, 140, 0)), pytz.utc struct_time((2019, 5, 20, 12, 19, 19, 0, 140, 0)), pytz.utc
) )
@ -165,7 +165,7 @@ class FeedCollectorTestCase(TestCase):
rule=rule, rule=rule,
) )
_, aware_datetime = build_publication_date( aware_datetime, _ = build_publication_date(
struct_time((2019, 5, 20, 16, 32, 38, 0, 140, 0)), pytz.utc struct_time((2019, 5, 20, 16, 32, 38, 0, 140, 0)), pytz.utc
) )

10
src/newsreader/news/collection/utils.py
View file

@ -1,5 +1,5 @@
from datetime import datetime, tzinfo from datetime import datetime, tzinfo
from time import mktime, struct_time from time import struct_time
from typing import Tuple from typing import Tuple
from django.utils import timezone from django.utils import timezone
@ -14,11 +14,11 @@ from newsreader.news.collection.response_handler import ResponseHandler
def build_publication_date(dt: struct_time, tz: tzinfo) -> Tuple: def build_publication_date(dt: struct_time, tz: tzinfo) -> Tuple:
try: try:
naive_datetime = datetime.fromtimestamp(mktime(dt)) naive_datetime = datetime(*dt[:6])
published_parsed = timezone.make_aware(naive_datetime, timezone=tz) published_parsed = timezone.make_aware(naive_datetime, timezone=tz)
except TypeError: except (TypeError, ValueError):
return False, None return None, False
return True, published_parsed return published_parsed, True
def fetch(url: str) -> Response: def fetch(url: str) -> Response: