Skip to content

Commit

Permalink
default extension
Browse files Browse the repository at this point in the history
  • Loading branch information
chrizzFTD committed Mar 13, 2021
1 parent e0850fd commit b1a29ab
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 4 deletions.
17 changes: 13 additions & 4 deletions grill/names/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,17 @@ def get_default(cls, **kwargs) -> DefaultName:
return name


class DateTimeFile(DefaultName, naming.File):
class DefaultFile(DefaultName, naming.File):
DEFAULT_SUFFIX = 'ext'

@property
def _defaults(self):
result = super()._defaults
result['suffix'] = type(self).DEFAULT_SUFFIX
return result


class DateTimeFile(DefaultFile):
"""Time based file names respecting iso standard.
============= ================
Expand Down Expand Up @@ -114,7 +124,6 @@ def _defaults(self):
time_field = {'year', 'month', 'day', 'hour', 'minute', 'second', 'microsecond'}
now = datetime.now()
result.update({f: getattr(now, f) for f in time_field})
result['suffix'] = 'ext'
return result

def get_pattern_list(self) -> typing.List[str]:
Expand Down Expand Up @@ -176,7 +185,7 @@ def _defaults(self):
return result


class CGAssetFile(CGAsset, naming.PipeFile):
class CGAssetFile(CGAsset, DefaultFile, naming.PipeFile):
"""Versioned files in the pipeline for a CGAsset.
Example:
Expand All @@ -191,7 +200,7 @@ class CGAssetFile(CGAsset, naming.PipeFile):
@property
def _defaults(self):
result = super()._defaults
result.update(version=1, suffix='ext')
result.update(version=1)
return result

def get_path_pattern_list(self) -> typing.List[str]:
Expand Down
15 changes: 15 additions & 0 deletions tests/test_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,18 @@ def _defaults(self):

ta = TimedAsset.get_default(area='test')
self.assertEqual(ta.suffix, SUFFIX)

def test_default_suffix(self):
suf1 = 'abc'
class TimedAssetFile(DateTimeFile, CGAssetFile):
DEFAULT_SUFFIX = suf1

ta = TimedAssetFile.get_default(area='test')
self.assertEqual(ta.suffix, suf1)

suf2 = 'xyz'
class TimedAssetFile2(CGAssetFile):
DEFAULT_SUFFIX = suf2

ta = TimedAssetFile2.get_default(area='test')
self.assertEqual(ta.suffix, suf2)

0 comments on commit b1a29ab

Please sign in to comment.