github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2725 from getpelican/slugify-preserve-case

Browse source 
Preserve category case in importer
This commit is contained in:
Justin Mayer 2020-04-15 21:43:15 +02:00 • committed by GitHub
commit 592517dea9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pelican/tests/test_importer.py
View file

@ -1,4 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import locale import locale
import os import os
@ -138,7 +138,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
index = 0 index = 0
for post in test_posts: for post in test_posts:
name = post[2] name = post[2]
category = slugify(post[5][0], regex_subs=subs) category = slugify(post[5][0], regex_subs=subs, preserve_case=True)
name += '.md' name += '.md'
filename = os.path.join(category, name) filename = os.path.join(category, name)
out_name = fnames[index] out_name = fnames[index]
@ -215,7 +215,7 @@ class TestWordpressXmlImporter(unittest.TestCase):
for post in test_posts: for post in test_posts:
name = post[2] name = post[2]
kind = post[8] kind = post[8]
category = slugify(post[5][0], regex_subs=subs) category = slugify(post[5][0], regex_subs=subs, preserve_case=True)
name += '.md' name += '.md'
filename = os.path.join(kind, category, name) filename = os.path.join(kind, category, name)
out_name = fnames[index] out_name = fnames[index]

6
pelican/tests/test_utils.py
View file

@ -122,6 +122,12 @@ class TestUtils(LoggedTestCase):
for value, expected in samples: for value, expected in samples:
self.assertEqual(utils.slugify(value, regex_subs=subs), expected) self.assertEqual(utils.slugify(value, regex_subs=subs), expected)
self.assertEqual(utils.slugify('Cat', regex_subs=subs), 'cat')
self.assertEqual(
utils.slugify('Cat', regex_subs=subs, preserve_case=False), 'cat')
self.assertEqual(
utils.slugify('Cat', regex_subs=subs, preserve_case=True), 'Cat')
def test_slugify_substitute(self): def test_slugify_substitute(self):
samples = (('C++ is based on C', 'cpp-is-based-on-c'), samples = (('C++ is based on C', 'cpp-is-based-on-c'),

6
pelican/tools/pelican_import.py
View file

@ -634,7 +634,8 @@ def get_out_filename(output_path, filename, ext, kind,
typename = '' typename = ''
kind = 'article' kind = 'article'
if dircat and (len(categories) > 0): if dircat and (len(categories) > 0):
catname = slugify(categories[0], regex_subs=slug_subs) catname = slugify(
categories[0], regex_subs=slug_subs, preserve_case=True)
else: else:
catname = '' catname = ''
out_filename = os.path.join(output_path, typename, out_filename = os.path.join(output_path, typename,
@ -643,7 +644,8 @@ def get_out_filename(output_path, filename, ext, kind,
os.makedirs(os.path.join(output_path, typename, catname)) os.makedirs(os.path.join(output_path, typename, catname))
# option to put files in directories with categories names # option to put files in directories with categories names
elif dircat and (len(categories) > 0): elif dircat and (len(categories) > 0):
catname = slugify(categories[0], regex_subs=slug_subs) catname = slugify(
categories[0], regex_subs=slug_subs, preserve_case=True)
out_filename = os.path.join(output_path, catname, filename + ext) out_filename = os.path.join(output_path, catname, filename + ext)
if not os.path.isdir(os.path.join(output_path, catname)): if not os.path.isdir(os.path.join(output_path, catname)):
os.mkdir(os.path.join(output_path, catname)) os.mkdir(os.path.join(output_path, catname))

5
pelican/utils.py
View file

@ -222,7 +222,7 @@ def pelican_open(filename, mode='r', strip_crs=(sys.platform == 'win32')):
yield content yield content
def slugify(value, regex_subs=()): def slugify(value, regex_subs=(), preserve_case=False):
""" """
Normalizes string, converts to lowercase, removes non-alpha characters, Normalizes string, converts to lowercase, removes non-alpha characters,
and converts spaces to hyphens. and converts spaces to hyphens.
@ -245,7 +245,8 @@ def slugify(value, regex_subs=()):
value = re.sub(src, dst, value, flags=re.IGNORECASE) value = re.sub(src, dst, value, flags=re.IGNORECASE)
# convert to lowercase # convert to lowercase
value = value.lower() if not preserve_case:
value = value.lower()
# we want only ASCII chars # we want only ASCII chars
value = value.encode('ascii', 'ignore').strip() value = value.encode('ascii', 'ignore').strip()