Skip to content
Merged
Changes from all commits
Commits
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
18 changes: 10 additions & 8 deletions server/dive_server/views_configuration.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import csv
from datetime import datetime, timedelta, timezone
import os
from pathlib import Path
from typing import Dict, List
from urllib.parse import urlparse

from girder.api import access
from girder.api.describe import Description, autoDescribeRoute
Expand Down Expand Up @@ -239,14 +239,16 @@ def get_addons(self):
download = s.get(constants.AddonsListURL)
decoded_content = download.content.decode('utf-8')
cr = csv.reader(decoded_content.splitlines(), delimiter=',', skipinitialspace=True)
my_list = [
item for item in cr if len(item) >= 5 and item[4].strip() != 'ALL-EXCEPT-DIVE'
rows = [item for item in cr if len(item) >= 5 and item[4].strip() != 'ALL-EXCEPT-DIVE']
return [
[
name,
url,
description,
tasks._addon_zip_path_for_url(url, Path()).name in installed_addons,
]
for name, url, description, *_ in rows
]
for item in my_list:
addon = item[1]
download_name = urlparse(addon).path.replace(os.path.sep, '_')
item.append(f'{download_name}.zip' in installed_addons)
return my_list

@access.admin
@autoDescribeRoute(
Expand Down
Loading