weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

force timestamp conversion in tumblr importer to be UTC with offset and adjust tests

Browse source
This commit is contained in:
Deniz Turgut 2023-10-28 15:55:02 +03:00
commit 83a8059d02
No known key found for this signature in database
GPG key ID: 87B7168D7AB3ED2F
2 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pelican/tests/test_importer.py
View file

@ -1,12 +1,9 @@
import datetime
import locale import locale
import os import os
import re import re
from posixpath import join as posix_join from posixpath import join as posix_join
from unittest.mock import patch from unittest.mock import patch
import dateutil.tz
from pelican.settings import DEFAULT_CONFIG from pelican.settings import DEFAULT_CONFIG
from pelican.tests.support import (mute, skipIfNoExecutable, temporary_folder, from pelican.tests.support import (mute, skipIfNoExecutable, temporary_folder,
unittest) unittest)
@ -46,12 +43,9 @@ class TestWithOsDefaults(unittest.TestCase):
def setUp(self): def setUp(self):
self.old_locale = locale.setlocale(locale.LC_ALL) self.old_locale = locale.setlocale(locale.LC_ALL)
locale.setlocale(locale.LC_ALL, 'C') locale.setlocale(locale.LC_ALL, 'C')
self.old_timezone = datetime.datetime.now(dateutil.tz.tzlocal()).tzname()
os.environ['TZ'] = 'UTC'
def tearDown(self): def tearDown(self):
locale.setlocale(locale.LC_ALL, self.old_locale) locale.setlocale(locale.LC_ALL, self.old_locale)
os.environ['TZ'] = self.old_timezone
@skipIfNoExecutable(['pandoc', '--version']) @skipIfNoExecutable(['pandoc', '--version'])
@ -502,7 +496,7 @@ class TestTumblrImporter(TestWithOsDefaults):
{ {
"type": "photo", "type": "photo",
"blog_name": "testy", "blog_name": "testy",
"date": "2019-11-07 21:26:40 GMT", "date": "2019-11-07 21:26:40 UTC",
"timestamp": 1573162000, "timestamp": 1573162000,
"format": "html", "format": "html",
"slug": "a-slug", "slug": "a-slug",
@ -528,7 +522,7 @@ class TestTumblrImporter(TestWithOsDefaults):
self.assertEqual( self.assertEqual(
[('Photo', [('Photo',
'<img alt="" src="https://..fccdc2360ba7182a.jpg" />\n', '<img alt="" src="https://..fccdc2360ba7182a.jpg" />\n',
'2019-11-07-a-slug', '2019-11-07 21:26:40', 'testy', ['photo'], '2019-11-07-a-slug', '2019-11-07 21:26:40+0000', 'testy', ['photo'],
['economics'], 'published', 'article', 'html')], ['economics'], 'published', 'article', 'html')],
posts, posts,
posts) posts)
@ -544,7 +538,7 @@ class TestTumblrImporter(TestWithOsDefaults):
"type": "video", "type": "video",
"blog_name": "testy", "blog_name": "testy",
"slug": "the-slug", "slug": "the-slug",
"date": "2017-07-07 20:31:41 GMT", "date": "2017-07-07 20:31:41 UTC",
"timestamp": 1499459501, "timestamp": 1499459501,
"state": "published", "state": "published",
"format": "html", "format": "html",
@ -583,7 +577,7 @@ class TestTumblrImporter(TestWithOsDefaults):
'<iframe>2</iframe>\n' '<iframe>2</iframe>\n'
'<iframe>3</iframe>\n', '<iframe>3</iframe>\n',
'2017-07-07-the-slug', '2017-07-07-the-slug',
'2017-07-07 20:31:41', 'testy', ['video'], [], 'published', '2017-07-07 20:31:41+0000', 'testy', ['video'], [], 'published',
'article', 'html')], 'article', 'html')],
posts, posts,
posts) posts)
@ -599,7 +593,7 @@ class TestTumblrImporter(TestWithOsDefaults):
"type": "video", "type": "video",
"blog_name": "testy", "blog_name": "testy",
"slug": "the-slug", "slug": "the-slug",
"date": "2016-08-14 16:37:35 GMT", "date": "2016-08-14 16:37:35 UTC",
"timestamp": 1471192655, "timestamp": 1471192655,
"state": "published", "state": "published",
"format": "html", "format": "html",
@ -638,7 +632,7 @@ class TestTumblrImporter(TestWithOsDefaults):
'v=b">via</a></p>\n<p>Caption</p>' 'v=b">via</a></p>\n<p>Caption</p>'
'<p>(This video isn\'t available anymore.)</p>\n', '<p>(This video isn\'t available anymore.)</p>\n',
'2016-08-14-the-slug', '2016-08-14-the-slug',
'2016-08-14 16:37:35', 'testy', ['video'], ['interviews'], '2016-08-14 16:37:35+0000', 'testy', ['video'], ['interviews'],
'published', 'article', 'html')], 'published', 'article', 'html')],
posts, posts,
posts) posts)

11
pelican/tools/pelican_import.py
View file

@ -1,6 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
import argparse import argparse
import datetime
import logging import logging
import os import os
import re import re
@ -416,10 +417,12 @@ def tumblr2fields(api_key, blogname):
slug = post.get('slug') or slugify(title, regex_subs=subs) slug = post.get('slug') or slugify(title, regex_subs=subs)
tags = post.get('tags') tags = post.get('tags')
timestamp = post.get('timestamp') timestamp = post.get('timestamp')
date = SafeDatetime.fromtimestamp(int(timestamp)).strftime( date = SafeDatetime.fromtimestamp(
"%Y-%m-%d %H:%M:%S") int(timestamp), tz=datetime.timezone.utc
slug = SafeDatetime.fromtimestamp(int(timestamp)).strftime( ).strftime("%Y-%m-%d %H:%M:%S%z")
"%Y-%m-%d-") + slug slug = SafeDatetime.fromtimestamp(
int(timestamp), tz=datetime.timezone.utc
).strftime("%Y-%m-%d-") + slug
format = post.get('format') format = post.get('format')
content = post.get('body') content = post.get('body')
type = post.get('type') type = post.get('type')