Skip to content

Commit 0af56c0

Browse files
committed
use string rather than bool
1 parent d848f50 commit 0af56c0

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

xcube/core/store/fs/store.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ def _set_infos_from_extensions(cls, find_extensions, protocol=None) -> (
469469
extensions = ext.metadata.get("extensions", [])
470470
for extension in extensions:
471471
filename_ext_to_format[extension] = frmat
472-
if ext.metadata.get("preferred", False):
472+
if ext.metadata.get("suitability", "primary"):
473473
format_to_data_type_aliases[frmat] = (
474474
(data_type, ) + format_to_data_type_aliases.get(frmat, ())
475475
)

xcube/plugin.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,20 +91,21 @@ def _register_dataset_ios(ext_registry: extension.ExtensionRegistry):
9191
)
9292

9393
_FS_DATA_WRITER_ITEMS = (
94-
("dataset", "netcdf", "xarray.Dataset in NetCDF format", [".nc"], True),
95-
("dataset", "zarr", "xarray.Dataset in Zarr format", [".zarr"], True),
96-
("dataset", "levels", "xarray.Dataset in leveled Zarr format", [".levels"], False),
94+
("dataset", "netcdf", "xarray.Dataset in NetCDF format", [".nc"], "primary"),
95+
("dataset", "zarr", "xarray.Dataset in Zarr format", [".zarr"], "primary"),
96+
("dataset", "levels", "xarray.Dataset in leveled Zarr format",
97+
[".levels"], "secondary"),
9798
(
9899
"mldataset",
99100
"levels",
100101
"xcube.core.mldataset.MultiLevelDataset in leveled Zarr format",
101102
[".levels"],
102-
True
103+
"primary"
103104
),
104105
("geodataframe", "shapefile", "gpd.GeoDataFrame in ESRI Shapefile format",
105-
[".shp"], True),
106+
[".shp"], "primary"),
106107
("geodataframe", "geojson", "gpd.GeoDataFrame in GeoJSON format",
107-
[".geojson"], True),
108+
[".geojson"], "primary"),
108109
)
109110

110111
_FS_DATA_OPENER_ITEMS = _FS_DATA_WRITER_ITEMS + (
@@ -113,14 +114,14 @@ def _register_dataset_ios(ext_registry: extension.ExtensionRegistry):
113114
"geotiff",
114115
"xarray.Dataset in GeoTIFF or COG format",
115116
[".tif", ".tiff", ".geotiff"],
116-
False
117+
"secondary"
117118
),
118119
(
119120
"mldataset",
120121
"geotiff",
121122
"xcube.core.mldataset.MultiLevelDataset in GeoTIFF or COG format",
122123
[".tif", ".tiff", ".geotiff"],
123-
True
124+
"primary"
124125
)
125126
)
126127

@@ -156,7 +157,7 @@ def _register_data_accessors(ext_registry: extension.ExtensionRegistry):
156157
# noinspection PyShadowingNames
157158
def _add_fs_data_accessor_ext(
158159
point: str, ext_type: str, protocol: str, data_type: str, format_id: str,
159-
file_extensions: List[str], preferred: bool
160+
file_extensions: List[str], suitability: str
160161
):
161162
factory_args = (protocol, data_type, format_id)
162163
loader = extension.import_component(factory, call_args=factory_args)
@@ -168,21 +169,21 @@ def _add_fs_data_accessor_ext(
168169
f" a {data_accessor_description}"
169170
f" in {storage_description}",
170171
extensions=file_extensions,
171-
preferred=preferred
172+
suitability=suitability
172173
)
173174

174175
for protocol, storage_description in _FS_STORAGE_ITEMS:
175176
for (data_type, format_id, data_accessor_description,
176-
file_extensions, preferred) in _FS_DATA_OPENER_ITEMS:
177+
file_extensions, suitability) in _FS_DATA_OPENER_ITEMS:
177178
_add_fs_data_accessor_ext(
178179
EXTENSION_POINT_DATA_OPENERS, "opener", protocol, data_type,
179-
format_id, file_extensions, preferred
180+
format_id, file_extensions, suitability
180181
)
181182
for (data_type, format_id, data_accessor_description,
182-
file_extensions, preferred) in _FS_DATA_WRITER_ITEMS:
183+
file_extensions, suitability) in _FS_DATA_WRITER_ITEMS:
183184
_add_fs_data_accessor_ext(
184185
EXTENSION_POINT_DATA_WRITERS, "writer", protocol, data_type,
185-
format_id, file_extensions, preferred
186+
format_id, file_extensions, suitability
186187
)
187188
ref_ds_cls = "xcube.core.store.ref.store:ReferenceDataStore"
188189
ref_ds_cls_loader = extension.import_component(ref_ds_cls)

0 commit comments

Comments
 (0)