espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

tools: spiffsgen.py: minor lint fixes

Browse Source 
Not squashing these since they should have gone into the commit before
adding type hints.
This commit is contained in:
Ivan Grokhotkov
2021-04-14 18:43:26 +02:00
parent a9b81341ca
commit 9af485307e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/spiffs/spiffsgen.py
View File

@@ -112,8 +112,7 @@ class SpiffsBuildConfig():
class SpiffsFullError(RuntimeError): class SpiffsFullError(RuntimeError):
def __init__(self, message=None): # type: (typing.Optional[str]) -> None pass
super(SpiffsFullError, self).__init__(message)
class SpiffsPage(): class SpiffsPage():
@@ -134,7 +133,6 @@ class SpiffsPage():
self.bix = bix self.bix = bix
def to_binary(self): # type: () -> bytes def to_binary(self): # type: () -> bytes
# Consider rewriting this using ABC
raise NotImplementedError() raise NotImplementedError()
@@ -143,6 +141,9 @@ class SpiffsObjPageWithIdx(SpiffsPage):
super(SpiffsObjPageWithIdx, self).__init__(0, build_config) super(SpiffsObjPageWithIdx, self).__init__(0, build_config)
self.obj_id = obj_id self.obj_id = obj_id
def to_binary(self): # type: () -> bytes
raise NotImplementedError()
class SpiffsObjLuPage(SpiffsPage): class SpiffsObjLuPage(SpiffsPage):
def __init__(self, bix, build_config): # type: (int, SpiffsBuildConfig) -> None def __init__(self, bix, build_config): # type: (int, SpiffsBuildConfig) -> None
@@ -152,7 +153,7 @@ class SpiffsObjLuPage(SpiffsPage):
self.obj_ids = list() # type: typing.List[ObjIdsItem] self.obj_ids = list() # type: typing.List[ObjIdsItem]
def _calc_magic(self, blocks_lim): # type: (int) -> int def _calc_magic(self, blocks_lim): # type: (int) -> int
# Calculate the magic value mirrorring computation done by the macro SPIFFS_MAGIC defined in # Calculate the magic value mirroring computation done by the macro SPIFFS_MAGIC defined in
# spiffs_nucleus.h # spiffs_nucleus.h
magic = 0x20140529 ^ self.build_config.page_size magic = 0x20140529 ^ self.build_config.page_size
if self.build_config.use_magic_len: if self.build_config.use_magic_len:
@@ -300,7 +301,7 @@ class SpiffsBlock():
self.cur_obj_id = 0 self.cur_obj_id = 0
self.cur_obj_idx_page = None # type: typing.Optional[SpiffsObjIndexPage] self.cur_obj_idx_page = None # type: typing.Optional[SpiffsObjIndexPage]
def __init__(self, bix, blocks_lim, build_config): # type: (int, int, SpiffsBuildConfig) -> None def __init__(self, bix, build_config): # type: (int, SpiffsBuildConfig) -> None
self.build_config = build_config self.build_config = build_config
self.offset = bix * self.build_config.block_size self.offset = bix * self.build_config.block_size
self.remaining_pages = self.build_config.OBJ_USABLE_PAGES_PER_BLOCK self.remaining_pages = self.build_config.OBJ_USABLE_PAGES_PER_BLOCK
@@ -408,7 +409,7 @@ class SpiffsFS():
if self.is_full(): if self.is_full():
raise SpiffsFullError('the image size has been exceeded') raise SpiffsFullError('the image size has been exceeded')
block = SpiffsBlock(len(self.blocks), self.blocks_lim, self.build_config) block = SpiffsBlock(len(self.blocks), self.build_config)
self.blocks.append(block) self.blocks.append(block)
self.remaining_blocks -= 1 self.remaining_blocks -= 1
return block return block
@@ -479,7 +480,7 @@ class SpiffsFS():
if self.build_config.use_magic: if self.build_config.use_magic:
# Create empty blocks with magic numbers # Create empty blocks with magic numbers
while self.remaining_blocks > 0: while self.remaining_blocks > 0:
block = SpiffsBlock(bix, self.blocks_lim, self.build_config) block = SpiffsBlock(bix, self.build_config)
all_blocks.append(block.to_binary(self.blocks_lim)) all_blocks.append(block.to_binary(self.blocks_lim))
self.remaining_blocks -= 1 self.remaining_blocks -= 1
bix += 1 bix += 1