Sudo-JHare/FHIRFLARE-IG-Toolkit
Sudo-JHare/FHIRFLARE-IG-Toolkit
1
0
Fork 0
mirror of https://github.com/Sudo-JHare/FHIRFLARE-IG-Toolkit.git synced 2025-06-15 00:40:00 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

v.0.02

Browse Source 
update to fix  caused 500 internal error
This commit is contained in:
Joshua Hare 2025-04-10 17:06:02 +10:00
parent 86a2718dea
commit 9fba23c83b
2 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app.py
View File

@ -154,23 +154,22 @@ def view_igs():
if os.path.exists(packages_dir):
for filename in os.listdir(packages_dir):
if filename.endswith('.tgz'):
# Remove .tgz and split on the last segment that looks like a version
name_version = filename[:-4] # Remove .tgz
parts = name_version.split('-')
# Assume version starts with a digit or common version keywords
version_idx = -1
for i, part in enumerate(parts[::-1]):
version_start = -1
for i, part in enumerate(parts):
if part[0].isdigit() or part in ('preview', 'current', 'latest'):
version_idx = len(parts) - i - 1
version_start = i
break
if version_idx >= 0:
name = '-'.join(parts[:version_idx + 1])
version = '-'.join(parts[version_idx + 1:])
if version_start > 0: # Ensure there's a name before version
name = '.'.join(parts[:version_start])
version = '-'.join(parts[version_start:])
packages.append({'name': name, 'version': version, 'filename': filename})
else:
# Fallback: treat last part as version
name = '-'.join(parts[:-1])
version = parts[-1]
# Fallback: treat as name only, log warning
name = name_version
version = ''
logger.warning(f"Could not parse version from {filename}, treating as name only")
packages.append({'name': name, 'version': version, 'filename': filename})
logger.debug(f"Found packages: {packages}")
else:
@ -186,11 +185,18 @@ def view_igs():
else:
duplicate_names[name] = [pkg]
# Precompute group colors
colors = ['bg-warning', 'bg-info', 'bg-success', 'bg-danger']
group_colors = {}
for i, name in enumerate(duplicate_groups):
if len(duplicate_groups[name]) > 1: # Only color duplicates
group_colors[name] = colors[i % len(colors)]
return render_template('cp_downloaded_igs.html', packages=packages, processed_list=igs,
processed_ids=processed_ids, duplicate_names=duplicate_names,
duplicate_groups=duplicate_groups)
duplicate_groups=duplicate_groups, group_colors=group_colors)
@app.route('/process-ig', methods=['POST'])
@app.route('/process-igs', methods=['POST'])
def process_ig():
filename = request.form.get('filename')
if not filename or not filename.endswith('.tgz'):
@ -203,14 +209,20 @@ def process_ig():
return redirect(url_for('view_igs'))
try:
parts = filename[:-4].split('-')
version_idx = -1
for i, part in enumerate(parts[::-1]):
name_version = filename[:-4]
parts = name_version.split('-')
version_start = -1
for i, part in enumerate(parts):
if part[0].isdigit() or part in ('preview', 'current', 'latest'):
version_idx = len(parts) - i - 1
version_start = i
break
name = '-'.join(parts[:version_idx + 1]) if version_idx >= 0 else '-'.join(parts[:-1])
version = '-'.join(parts[version_idx + 1:]) if version_idx >= 0 else parts[-1]
if version_start > 0:
name = '.'.join(parts[:version_start])
version = '-'.join(parts[version_start:])
else:
name = name_version
version = ''
logger.warning(f"Could not parse version from {filename} during processing")
package_info = services.process_package_file(tgz_path)
processed_ig = ProcessedIg(
package_name=name,

11
templates/cp_downloaded_igs.html
View File

@ -39,17 +39,10 @@
<tr><th>Package Name</th><th>Version</th><th>Actions</th></tr>
</thead>
<tbody>
{% set colors = ['bg-warning', 'bg-info', 'bg-success', 'bg-danger'] %}
{% set group_idx = {} %}
{% for name in duplicate_groups %}
{% if duplicate_groups[name]|length > 1 %}
{% set group_idx[name] = loop.index0 % colors|length %}
{% endif %}
{% endfor %}
{% for pkg in packages %}
{% set is_processed = (pkg.name, pkg.version) in processed_ids %}
{% set is_duplicate = pkg.name in duplicate_names and duplicate_names[pkg.name]|length > 1 %}
{% set group_color = colors[group_idx[pkg.name]] if is_duplicate and duplicate_groups|length > 1 else 'bg-warning' %}
{% set group_color = group_colors[pkg.name] if is_duplicate else 'bg-warning' %}
<tr {% if is_duplicate %}class="{{ group_color }} text-dark"{% endif %}>
<td>
<code>{{ pkg.name }}</code>
@ -83,7 +76,7 @@
<p class="mt-2 small text-muted">Duplicates detected:
{% for name, versions in duplicate_groups.items() %}
{% if versions|length > 1 %}
<span class="badge {{ colors[group_idx[name] if duplicate_groups|length > 1 else 0] }} text-dark">{{ name }} ({{ versions|join(', ') }})</span>
<span class="badge {{ group_colors[name] }} text-dark">{{ name }} ({{ versions|join(', ') }})</span>
{% endif %}
{% endfor %}
</p>