remove duplicate parse_size method
This commit is contained in:
parent
d624e2a638
commit
6b69ddd17a
|
@ -406,7 +406,6 @@ def setup(config_options):
|
||||||
redirect_root_to_web_client=True,
|
redirect_root_to_web_client=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
logger.info("Preparing database: %r...", config.database_config)
|
logger.info("Preparing database: %r...", config.database_config)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -22,15 +22,6 @@ class ContentRepositoryConfig(Config):
|
||||||
self.max_image_pixels = self.parse_size(config["max_image_pixels"])
|
self.max_image_pixels = self.parse_size(config["max_image_pixels"])
|
||||||
self.media_store_path = self.ensure_directory(config["media_store_path"])
|
self.media_store_path = self.ensure_directory(config["media_store_path"])
|
||||||
|
|
||||||
def parse_size(self, string):
|
|
||||||
sizes = {"K": 1024, "M": 1024 * 1024}
|
|
||||||
size = 1
|
|
||||||
suffix = string[-1]
|
|
||||||
if suffix in sizes:
|
|
||||||
string = string[:-1]
|
|
||||||
size = sizes[suffix]
|
|
||||||
return int(string) * size
|
|
||||||
|
|
||||||
def default_config(self, config_dir_path, server_name):
|
def default_config(self, config_dir_path, server_name):
|
||||||
media_store = self.default_path("media_store")
|
media_store = self.default_path("media_store")
|
||||||
return """
|
return """
|
||||||
|
|
Loading…
Reference in New Issue