Skip to content

Improve distribution parsing, and fix folder and tag check for publication #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jolelievre merged 2 commits into from
Feb 25, 2025
Merged

Improve distribution parsing, and fix folder and tag check for publication #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5f4654
Improve distribution parsing, and fix folder and tag check for public…
jolelievre Feb 24, 2025
a863160
Prevent bug during generation because of branch 1.7.8.x
jolelievre Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions prestashop_docker/generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ def generate_image(self, ps_version, container_version):
use_github_url = True
# We use 1.7.8.8 as the comparison base because the 1.7.8.9 is not hosted on the .com anymore but until 1.7.8.8,
# it still works so the .com url is used
if split_version is not None and split_version['major'] == '1.7' and version.parse(ps_version) <= version.parse('1.7.8.8'):
if split_version is not None and split_version['patch'] != 'x' and split_version['major'] == '1.7' and version.parse(ps_version) <= version.parse('1.7.8.8'):
use_github_url = False

if use_github_url:
if parsed_version['flavor_versions'] == 'classic':
if parsed_version['distribution'] == 'classic':
ps_url = self.download_url_github_classic.format(ps_version, ps_version)
else:
ps_url = self.download_url_github.format(ps_version, ps_version)
Expand Down
40 changes: 26 additions & 14 deletions prestashop_docker/version_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,29 @@ def parse_version(self, version):
'''

data = self.get_version_from_string(version)
if data is None:
raise ValueError('{} is not a valid version'.format(version))

if data is not None and data['ps_version'] == self.NIGHTLY:
ps_version = self.NIGHTLY
else:
# Initial PS version(can also be a branch like 9.0.x)
split_version = self.split_prestashop_version(version)
if split_version is None or not (self.directory_path / split_version['version']).exists():
raise ValueError('{} is not a valid version'.format(version))
ps_version = split_version['version']
if split_version is not None and split_version['patch'] == 'x':
# Special case for branch versions (like 9.0.x)
ps_version = split_version['version']
else:
# Other use case we get the parsed version (stripped from container details)
ps_version = data['ps_version']

ps_version_path = self.directory_path / ps_version
if not ps_version_path.exists():
raise ValueError('{} directory not found for version {}'.format(ps_version_path, version))

if data is None or data['container_version'] is None:
containers = ('fpm', 'apache',)
else:
containers = (data['container_version'],)

ps_version_path = self.directory_path / ps_version
result = {}
for php_version in data['php_versions']:
for container in containers:
Expand All @@ -95,8 +103,8 @@ def get_version_from_string(self, version):

@param version: The version you want
@type version: str
@return: A tuple containing ('PS_VERSION', 'BRANCH_VERSION', (PHP_VERSIONS), 'CONTAINER_TYPE', 'FLAVOR_VERSION')
or ('PS_VERSION', 'BRANCH_VERSION', 'PHP_VERSION', 'CONTAINER_TYPE', 'FLAVOR_VERSION')
@return: A tuple containing ('PS_VERSION', 'BRANCH_VERSION', (PHP_VERSIONS), 'CONTAINER_TYPE', 'DISTRIBUTION')
or ('PS_VERSION', 'BRANCH_VERSION', 'PHP_VERSION', 'CONTAINER_TYPE', 'DISTRIBUTION')
@rtype: tuple
'''
matches = self.parse_version_from_string(version)
Expand All @@ -105,10 +113,10 @@ def get_version_from_string(self, version):

ps_version = matches.group('version')

flavor_versions = None
if matches.group('flavor'):
flavor_versions = matches.group('flavor')
ps_version = ps_version + '-' + flavor_versions
distribution = None
if matches.group('distribution'):
distribution = matches.group('distribution')
ps_version = ps_version + '-' + distribution

if matches.group('php'):
php_versions = (matches.group('php'),)
Expand Down Expand Up @@ -147,7 +155,7 @@ def get_version_from_string(self, version):
'branch_version': branch_version,
'php_versions': php_versions,
'container_version': container_version,
'flavor_versions': flavor_versions
'distribution': distribution
}

def get_last_patch_from_version(self, version):
Expand Down Expand Up @@ -186,19 +194,23 @@ def split_prestashop_version(self, version):
@return: Return None if no patch is found otherwise an int with the patch.
@rtpe: None|tuple
'''
regex = r"^(?P<major>(1.)?[0-9]+)\.(?P<minor>[0-9]+)\.(?P<patch>[0-9x]+)(?P<prerelease>-(alpha|beta|rc)(?:\.\d+)?(?:\+\d+)?)?"

regex = r"^(?P<major>(1.)?[0-9]+)\.(?P<minor>[0-9]+)\.(?P<patch>[0-9x]+)(?P<prerelease>-(alpha|beta|rc)(?:\.\d+)?(?:\+\d+)?)?(?:-(?P<distribution>classic))?"

matches = re.search(regex, version)

if (matches and matches.group() and matches.group('major') and matches.group('major') and matches.group('major')):
# Remove the initial matched -
prerelease = matches.group('prerelease')[1:] if matches.group('prerelease') else None
distribution = matches.group('distribution') if matches.group('distribution') else None

return {
'version': matches.group('major') + '.' + matches.group('minor') + '.' + matches.group('patch'),
'major': matches.group('major'),
'minor': matches.group('minor'),
'patch': matches.group('patch'),
'prerelease': prerelease,
'distribution': distribution
}
return None

Expand All @@ -210,7 +222,7 @@ def parse_version_from_string(self, version):
@return: Return None if no position in the string matches the pattern otherwise a Match object.
@rtpe: None|Match
'''
regex = r"^(?P<version>(?:[0-9]+\.){0,3}(?:[0-9]+|nightly|x)(?:-(?:alpha|beta|rc)(?:\.\d+)?(?:\+\d+)?)?)(?:-(?P<flavor>classic))?(?:-(?P<php>\d+\.\d+))?(?:-(?P<container>fpm|apache))?$"
regex = r"^(?P<version>(?:[0-9]+\.){0,3}(?:[0-9]+|nightly|x)(?:-(?:alpha|beta|rc)(?:\.\d+)?(?:\+\d+)?)?)(?:-(?P<distribution>classic))?(?:-(?P<php>\d+\.\d+))?(?:-(?P<container>fpm|apache))?$"
return re.search(regex, version)

def get_aliases(self):
Expand Down
Loading