phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactoring in NewsSlag parser

Browse Source
This commit is contained in:
Dmitry Borzenin 2020-02-07 16:51:22 +03:00
parent 2fa6df0af8
commit 73a5f9dc09
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/utils/parsers.py
View File

@ -1,9 +1,9 @@
class NewsSlug:
def __init__(self, value=None, locale=None, count=0):
def __init__(self, value=None, country_code=None, count=0):
self.value = value
self.locale = locale
self.country_code = country_code
self.count = count
@classmethod
@ -13,10 +13,10 @@ class NewsSlug:
if len(rest) >= 1 and rest[-1] in country_codes:
instance.value = '-'.join([slug, *rest[:-1]])
instance.locale = rest[-1]
instance.country_code = rest[-1]
elif len(rest) >= 2 and rest[-1].isdigit() and rest[-2] in country_codes:
instance.value = '-'.join([slug, *rest[:-2]])
instance.locale = rest[-2]
instance.country_code = rest[-2]
instance.count = int(rest[-1])
else:
instance.value = '-'.join([slug, *rest])
@ -31,8 +31,8 @@ class NewsSlug:
raise ValueError('No value for slug')
slug_parts = [self.value]
if self.locale is not None:
slug_parts.append(self.locale)
if self.country_code is not None:
slug_parts.append(self.country_code)
if self.count != 0:
slug_parts.append(str(self.count))
@ -40,4 +40,4 @@ class NewsSlug:
return '-'.join(slug_parts)
def __repr__(self):
return f'<{self.__class__.__name__} {self.value}, {self.locale}, {self.count}>'
return f'<{self.__class__.__name__} {self.value}, {self.country_code}, {self.count}>'