nova-trame 0.19.0.dev1__py3-none-any.whl → 0.19.0.dev2__py3-none-any.whl

nova/trame/model/data_selector.py

@@ -2,7 +2,7 @@
 
 import os
 from pathlib import Path
-from typing import List, Optional
+from typing import Any, List, Optional
 from warnings import warn
 
 from pydantic import BaseModel, Field, field_validator, model_validator
@@ -68,6 +68,8 @@ class DataSelectorState(BaseModel, validate_assignment=True):
     facility: str = Field(default="", title="Facility")
     instrument: str = Field(default="", title="Instrument")
     experiment: str = Field(default="", title="Experiment")
+    directory: str = Field(default="")
+    prefix: str = Field(default="")
 
     @field_validator("experiment", mode="after")
     @classmethod
@@ -99,19 +101,20 @@ class DataSelectorState(BaseModel, validate_assignment=True):
 class DataSelectorModel:
     """Manages file system interactions for the DataSelector widget."""
 
-    def __init__(self, facility: str, instrument: str) -> None:
+    def __init__(self, facility: str, instrument: str, prefix: str) -> None:
         self.state = DataSelectorState()
         self.state.facility = facility
         self.state.instrument = instrument
+        self.state.prefix = prefix
 
     def get_facilities(self) -> List[str]:
-        return get_facilities()
+        return sorted(get_facilities())
 
     def get_instrument_dir(self) -> str:
         return INSTRUMENTS.get(self.state.facility, {}).get(self.state.instrument, "")
 
     def get_instruments(self) -> List[str]:
-        return get_instruments(self.state.facility)
+        return sorted(get_instruments(self.state.facility))
 
     def get_experiments(self) -> List[str]:
         experiments = []
@@ -126,18 +129,67 @@ class DataSelectorModel:
 
         return sorted(experiments)
 
+    def get_directories(self) -> List[Any]:
+        if not self.state.experiment:
+            return []
+
+        directories = []
+
+        experiment_path = Path("/") / self.state.facility / self.get_instrument_dir() / self.state.experiment
+        try:
+            for dirpath, _, _ in os.walk(experiment_path):
+                # Get the relative path from the start path
+                path_parts = os.path.relpath(dirpath, experiment_path).split(os.sep)
+
+                # Only create a new entry for top-level directories
+                if len(path_parts) == 1 and path_parts[0] != ".":  # This indicates a top-level directory
+                    current_dir = {"path": dirpath, "title": path_parts[0]}
+                    directories.append(current_dir)
+
+                # Add subdirectories to the corresponding parent directory
+                elif len(path_parts) > 1:
+                    current_level: Any = directories
+                    for part in path_parts[:-1]:  # Parent directories
+                        for item in current_level:
+                            if item["title"] == part:
+                                if "children" not in item:
+                                    item["children"] = []
+                                current_level = item["children"]
+                                break
+
+                    # Add the last part (current directory) as a child
+                    current_level.append({"path": dirpath, "title": path_parts[-1]})
+        except OSError:
+            pass
+
+        return directories
+
     def get_datafiles(self) -> List[str]:
         datafiles = []
 
-        experiment_path = Path("/") / self.state.facility / self.get_instrument_dir() / self.state.experiment / "nexus"
         try:
-            for fname in os.listdir(experiment_path):
-                datafiles.append(str(experiment_path / fname))
+            if self.state.prefix:
+                datafile_path = str(
+                    Path("/")
+                    / self.state.facility
+                    / self.get_instrument_dir()
+                    / self.state.experiment
+                    / self.state.prefix
+                )
+            else:
+                datafile_path = self.state.directory
+
+            for entry in os.scandir(datafile_path):
+                if entry.is_file():
+                    datafiles.append(entry.path)
         except OSError:
             pass
 
         return sorted(datafiles)
 
+    def set_directory(self, directory_path: str) -> None:
+        self.state.directory = directory_path
+
     def set_state(self, facility: Optional[str], instrument: Optional[str], experiment: Optional[str]) -> None:
         if facility is not None:
             self.state.facility = facility

nova/trame/view/components/data_selector.py

@@ -1,8 +1,9 @@
 """View Implementation for DataSelector."""
 
-from typing import Any, Optional
+from typing import Any, Optional, cast
 
 from trame.app import get_server
+from trame.widgets import html
 from trame.widgets import vuetify3 as vuetify
 
 from nova.mvvm.trame_binding import TrameBinding
@@ -12,11 +13,21 @@ from nova.trame.view_model.data_selector import DataSelectorViewModel
 
 from .input_field import InputField
 
+vuetify.enable_lab()
+
 
 class DataSelector(vuetify.VDataTable):
     """Allows the user to select datafiles from an IPTS experiment."""
 
-    def __init__(self, v_model: str, facility: str = "", instrument: str = "", **kwargs: Any) -> None:
+    def __init__(
+        self,
+        v_model: str,
+        facility: str = "",
+        instrument: str = "",
+        prefix: str = "",
+        select_strategy: str = "all",
+        **kwargs: Any,
+    ) -> None:
         """Constructor for DataSelector.
 
         Parameters
@@ -28,6 +39,12 @@ class DataSelector(vuetify.VDataTable):
             The facility to restrict data selection to. Options: HFIR, SNS
         instrument : str, optional
             The instrument to restrict data selection to. Please use the instrument acronym (e.g. CG-2).
+        prefix : str, optional
+            A subdirectory within the user's chosen experiment to show files. If not specified, the user will be shown a
+            folder browser and will be able to see all files in the experiment that they have access to.
+        select_strategy : str, optional
+            The selection strategy to pass to the `VDataTable component <https://trame.readthedocs.io/en/latest/trame.widgets.vuetify3.html#trame.widgets.vuetify3.VDataTable>`__.
+            If unset, the `all` strategy will be used.
         **kwargs
             All other arguments will be passed to the underlying
             `VDataTable component <https://trame.readthedocs.io/en/latest/trame.widgets.vuetify3.html#trame.widgets.vuetify3.VDataTable>`_.
@@ -39,11 +56,20 @@ class DataSelector(vuetify.VDataTable):
         if "items" in kwargs:
             raise AttributeError("The items parameter is not allowed on DataSelector widget.")
 
+        if "label" in kwargs:
+            self._label = kwargs["label"]
+        else:
+            self._label = None
+
         self._v_model = v_model
+        self._prefix = prefix
+        self._select_strategy = select_strategy
+
         self._state_name = f"nova__dataselector_{self._next_id}_state"
         self._facilities_name = f"nova__dataselector_{self._next_id}_facilities"
         self._instruments_name = f"nova__dataselector_{self._next_id}_instruments"
         self._experiments_name = f"nova__dataselector_{self._next_id}_experiments"
+        self._directories_name = f"nova__dataselector_{self._next_id}_directories"
         self._datafiles_name = f"nova__dataselector_{self._next_id}_datafiles"
 
         self.create_model(facility, instrument)
@@ -69,22 +95,52 @@ class DataSelector(vuetify.VDataTable):
                 type="autocomplete",
             )
 
+        with GridLayout(columns=3, valign="start"):
+            if not self._prefix:
+                with html.Div():
+                    vuetify.VListSubheader("Available Directories", classes="justify-center px-0")
+                    vuetify.VTreeview(
+                        v_if=(f"{self._directories_name}.length > 0",),
+                        activatable=True,
+                        active_strategy="single-independent",
+                        item_value="path",
+                        items=(self._directories_name,),
+                        update_activated=(self._vm.set_directory, "$event"),
+                    )
+                    vuetify.VListItem("No directories found", v_else=True)
+
             super().__init__(
                 v_model=self._v_model,
-                column_span=3,
-                headers=("[{ align: 'center', key: 'file', title: 'Available Datafiles' }]",),
-                item_value="file",
-                select_strategy="all",
+                column_span=3 if self._prefix else 2,
+                headers=("[{ align: 'center', key: 'title', title: 'Available Datafiles' }]",),
+                item_title="title",
+                item_value="path",
+                select_strategy=self._select_strategy,
                 show_select=True,
                 **kwargs,
             )
             self.items = (self._datafiles_name,)
-
             if "update_modelValue" not in kwargs:
                 self.update_modelValue = f"flushState('{self._v_model.split('.')[0]}')"
 
+        with cast(
+            vuetify.VSelect,
+            InputField(
+                v_if=f"{self._v_model}.length > 0",
+                v_model=self._v_model,
+                classes="nova-readonly",
+                clearable=True,
+                label=self._label,
+                readonly=True,
+                type="select",
+            ),
+        ):
+            with vuetify.Template(raw_attrs=['v-slot:selection="{ item, index }"']):
+                vuetify.VChip("{{ item.title }}", v_if="index < 2")
+                html.Span(f"(+{{{{ {self._v_model}.length - 2 }}}} others)", v_if="index === 2", classes="text-caption")
+
     def create_model(self, facility: str, instrument: str) -> None:
-        self._model = DataSelectorModel(facility, instrument)
+        self._model = DataSelectorModel(facility, instrument, self._prefix)
 
     def create_viewmodel(self) -> None:
         server = get_server(None, client_type="vue3")
@@ -95,6 +151,7 @@ class DataSelector(vuetify.VDataTable):
         self._vm.facilities_bind.connect(self._facilities_name)
         self._vm.instruments_bind.connect(self._instruments_name)
         self._vm.experiments_bind.connect(self._experiments_name)
+        self._vm.directories_bind.connect(self._directories_name)
         self._vm.datafiles_bind.connect(self._datafiles_name)
 
         self._vm.update_view()

nova/trame/view/components/file_upload.py

@@ -10,17 +10,14 @@ from .remote_file_input import RemoteFileInput
 class FileUpload(vuetify.VBtn):
     """Component for uploading a file from either the user's filesystem or the server filesystem."""
 
-    def __init__(
-        self, v_model: Optional[str] = None, base_paths: Optional[List[str]] = None, label: str = "", **kwargs: Any
-    ) -> None:
+    def __init__(self, v_model: str, base_paths: Optional[List[str]] = None, label: str = "", **kwargs: Any) -> None:
         """Constructor for FileUpload.
 
         Parameters
         ----------
-        v_model : str, optional
+        v_model : str
             The state variable to set when the user uploads their file. If uploaded from the user's machine, then the
-            state variable will contain a dictionary with the file contents and metadata. If uploaded from the server
-            filesystem, then the state variable will contain a path to the file.
+            state variable will contain the file contents.
         base_paths: list[str], optional
             Passed to :ref:`RemoteFileInput <api_remotefileinput>`.
         label : str, optional
@@ -44,20 +41,22 @@ class FileUpload(vuetify.VBtn):
         self.create_ui()
 
     def create_ui(self) -> None:
-        self.local_file_input = vuetify.VFileInput(v_model=(self._v_model, None), classes="d-none", ref=self._ref_name)
-        if self._v_model:
+        self.local_file_input = vuetify.VFileInput(
+            v_model=(self._v_model, None),
+            classes="d-none",
+            ref=self._ref_name,
             # Serialize the content in a way that will work with nova-mvvm and then push it to the server.
-            self.local_file_input.update_modelValue = (
-                f"{self._v_model}.text().then((contents) => {{ "
-                f"  {self._v_model} = {{ contents: contents }};"
+            update_modelValue=(
+                f"{self._v_model}.text().then((contents) => {{"
+                f"  {self._v_model} = contents;"
                 f"  flushState('{self._v_model.split('.')[0]}');"
                 "});"
-            )
+            ),
+        )
         self.remote_file_input = RemoteFileInput(
-            v_model=self._v_model,
-            base_paths=self._base_paths,
-            input_props={"classes": "d-none"},
+            v_model=self._v_model, base_paths=self._base_paths, input_props={"classes": "d-none"}, return_contents=True
         )
+
         with self:
             with vuetify.VMenu(activator="parent"):
                 with vuetify.VList():

nova/trame/view/components/remote_file_input.py

@@ -31,6 +31,7 @@ class RemoteFileInput:
         dialog_props: Optional[dict[str, Any]] = None,
         extensions: Optional[list[str]] = None,
         input_props: Optional[dict[str, Any]] = None,
+        return_contents: bool = False,
     ) -> None:
         """Constructor for RemoteFileInput.
 
@@ -53,6 +54,9 @@ class RemoteFileInput:
             Only files with these extensions will be shown by default. The user can still choose to view all files.
         input_props : dict[str, typing.Any], optional
             Props to be passed to InputField.
+        return_contents : bool
+            If true, then the v_model will contain the contents of the file. If false, then the v_model will contain the
+            path of the file.
 
         Raises
         ------
@@ -74,6 +78,7 @@ class RemoteFileInput:
         self.dialog_props = dict(dialog_props) if dialog_props else {}
         self.extensions = extensions if extensions else []
         self.input_props = dict(input_props) if input_props else {}
+        self.return_contents = return_contents
 
         if "__events" not in self.input_props:
             self.input_props["__events"] = []
@@ -179,18 +184,27 @@ class RemoteFileInput:
         else:
             model_name = self.v_model
 
+        self.set_v_model = client.JSEval(
+            exec=f"{model_name} = $event; flushState('{model_name.split('.')[0].split('[')[0]}');"
+        ).exec
+
         self.vm = RemoteFileInputViewModel(self.model, binding)
 
         self.vm.dialog_bind.connect(self.vm.get_dialog_state_name())
         self.vm.file_list_bind.connect(self.vm.get_file_list_state_name())
         self.vm.filter_bind.connect(self.vm.get_filter_state_name())
         self.vm.on_close_bind.connect(client.JSEval(exec=f"{self.vm.get_dialog_state_name()} = false;").exec)
-        self.vm.on_update_bind.connect(
-            client.JSEval(exec=f"{model_name} = $event; flushState('{model_name.split('.')[0].split('[')[0]}');").exec
-        )
+        if self.return_contents:
+            self.vm.on_update_bind.connect(self.read_file)
+        else:
+            self.vm.on_update_bind.connect(self.set_v_model)
         self.vm.showing_all_bind.connect(self.vm.get_showing_all_state_name())
         self.vm.valid_selection_bind.connect(self.vm.get_valid_selection_state_name())
 
+    def read_file(self, file_path: str) -> None:
+        with open(file_path, mode="r") as file:
+            self.set_v_model(file.read())
+
     def select_file(self, value: str) -> None:
         """Programmatically set the v_model value."""
         self.vm.select_file(value)

nova/trame/view/theme/assets/core_style.scss

@@ -20,6 +20,12 @@ html {
     resize: none !important;
 }
 
+.nova-readonly {
+    .v-select__menu-icon {
+        display: none;
+    }
+}
+
 @media only screen and (max-width: 959px) {
     .d-grid {
         grid-template-columns: repeat(1, 1fr) !important;
@@ -42,6 +48,16 @@ html {
         border-radius: 4px;
     }
 
+    .v-data-table {
+        td {
+            vertical-align: middle;
+        }
+
+        .v-divider {
+            margin: 0;
+        }
+    }
+
     .v-tab.v-btn {
         height: 30px !important;
         min-width: fit-content !important;
@@ -85,4 +101,23 @@ html {
     .d-grid {
         align-items:center;
     }
+
+    .v-treeview {
+        .v-list-item {
+            text-align: left;
+
+            .v-list-item__prepend {
+                width: 40px;
+            }
+
+            .v-btn {
+                height: 24px;
+                width: 24px;
+
+                .v-icon {
+                    font-size: 16px;
+                }
+            }
+        }
+    }
 }

nova/trame/view/theme/assets/vuetify_config.json

@@ -178,10 +178,13 @@
                     },
                     "VTextField": {
                         "VBtn": {
-                            "size": "small",
+                            "size": "default",
                             "variant": "outlined"
                         },
                         "variant": "outlined"
+                    },
+                    "VTreeview": {
+                        "density": "compact"
                     }
                 },
                 "title": "Compact",

nova/trame/view_model/data_selector.py

@@ -1,5 +1,6 @@
 """View model implementation for the DataSelector widget."""
 
+import os
 from typing import Any, Optional
 
 from nova.mvvm.interface import BindingInterface
@@ -16,8 +17,13 @@ class DataSelectorViewModel:
         self.facilities_bind = binding.new_bind()
         self.instruments_bind = binding.new_bind()
         self.experiments_bind = binding.new_bind()
+        self.directories_bind = binding.new_bind()
         self.datafiles_bind = binding.new_bind()
 
+    def set_directory(self, directory_path: str) -> None:
+        self.model.set_directory(directory_path)
+        self.update_view()
+
     def set_state(self, facility: Optional[str], instrument: Optional[str], experiment: Optional[str]) -> None:
         self.model.set_state(facility, instrument, experiment)
         self.update_view()
@@ -27,7 +33,8 @@ class DataSelectorViewModel:
         self.facilities_bind.update_in_view(self.model.get_facilities())
         self.instruments_bind.update_in_view(self.model.get_instruments())
         self.experiments_bind.update_in_view(self.model.get_experiments())
+        self.directories_bind.update_in_view(self.model.get_directories())
 
         datafile_paths = self.model.get_datafiles()
-        datafile_options = [{"file": datafile} for datafile in datafile_paths]
+        datafile_options = [{"path": datafile, "title": os.path.basename(datafile)} for datafile in datafile_paths]
         self.datafiles_bind.update_in_view(datafile_options)

{nova_trame-0.19.0.dev1.dist-info → nova_trame-0.19.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nova-trame
-Version: 0.19.0.dev1
+Version: 0.19.0.dev2
 Summary: A Python Package for injecting curated themes and custom components into Trame applications
 License: MIT
 Keywords: NDIP,Python,Trame,Vuetify

{nova_trame-0.19.0.dev1.dist-info → nova_trame-0.19.0.dev2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 nova/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
 nova/trame/__init__.py,sha256=gFrAg1qva5PIqR5TjvPzAxLx103IKipJLqp3XXvrQL8,59
-nova/trame/model/data_selector.py,sha256=xM4j_BrKXClRbeDjfcCQEAnWWYuUod7GxiF1WXDpfls,4620
+nova/trame/model/data_selector.py,sha256=8BnnPvdYZTmCOJFuWOs_RhQ1NvYqWFdPmWP09WWP5oA,6689
 nova/trame/model/remote_file_input.py,sha256=9KAf31ZHzpsh_aXUrNcF81Q5jvUZDWCzW1QATKls-Jk,3675
 nova/trame/view/components/__init__.py,sha256=u8yzshFp_TmuC1g9TRxKjy_BdGWMIzPQouI52hzcr2U,234
-nova/trame/view/components/data_selector.py,sha256=-u73LayMwepOVLsWx6P_z5tBTPGX0ekzlI9fFVv2sNk,5107
-nova/trame/view/components/file_upload.py,sha256=MafxZQE9fIuDFoizW2I4jAb7n82DPNaOvVhrrPEMbq8,3029
+nova/trame/view/components/data_selector.py,sha256=vRbN2FlcfnUWpmL4MFfRqrbhXQWip2_QLMoMg9KFXCs,7584
+nova/trame/view/components/file_upload.py,sha256=XbiSx2txpdohwxGyP-ecTbIgMPv6siUARJ7nXhXaiAc,2827
 nova/trame/view/components/input_field.py,sha256=ncVVSzdJwH_-KP24I2rCqcb6v3J2hPhNTXr8Lb1EZ_U,15931
-nova/trame/view/components/remote_file_input.py,sha256=0qi4PnmqUBIdUv36dUqYsTWRQ4fHUJ0nlg9oXzA3Qfs,8929
+nova/trame/view/components/remote_file_input.py,sha256=lFchhhoMo9EgSr7pSlh2LEm8NZO1XXrBcfh_BLGZBV0,9492
 nova/trame/view/components/visualization/__init__.py,sha256=reqkkbhD5uSksHHlhVMy1qNUCwSekS5HlXk6wCREYxU,152
 nova/trame/view/components/visualization/interactive_2d_plot.py,sha256=foZCMoqbuahT5dtqIQvm8C4ZJcY9P211eJEcpQJltmM,3421
 nova/trame/view/components/visualization/matplotlib_figure.py,sha256=yop7Kd_MylUiCwEial2jOYESbvchrYhrpSmRowUhePY,12003
@@ -15,18 +15,18 @@ nova/trame/view/layouts/grid.py,sha256=k-QHuH31XeAVDuMKUMoAMVnAM-Yavq7kdLYOC1ZrG
 nova/trame/view/layouts/hbox.py,sha256=r5irhFX6YWTWN4V4NwNQx6mheyM8p6PVcJbrbhvOAwo,2625
 nova/trame/view/layouts/vbox.py,sha256=Q4EvrtGJORyNF6AnCLGXToy8XU6yofiO5_kt7hK-AYs,2626
 nova/trame/view/theme/__init__.py,sha256=70_marDlTigIcPEOGiJb2JTs-8b2sGM5SlY7XBPtBDM,54
-nova/trame/view/theme/assets/core_style.scss,sha256=zZj7klB_iieNNTdh3WADpRbCA6WII0-nG86MKFEBYWY,1533
+nova/trame/view/theme/assets/core_style.scss,sha256=bP9tv5B3vivjEMXFPTGJ7rXc1aXjnOXsvnkaBUyRmUs,2095
 nova/trame/view/theme/assets/favicon.png,sha256=Xbp1nUmhcBDeObjsebEbEAraPDZ_M163M_ZLtm5AbQc,1927
 nova/trame/view/theme/assets/js/delay_manager.js,sha256=vmb34DZ5YCQIlRW9Tf2M_uvJW6HFCmtlKZ5e_TPR8yg,536
 nova/trame/view/theme/assets/js/lodash.debounce.min.js,sha256=GLzlQH04WDUNYN7i39ttHHejSdu-CpAvfWgDgKDn-OY,4448
 nova/trame/view/theme/assets/js/lodash.throttle.min.js,sha256=9csqjX-M-LVGJnF3z4ha1R_36O5AfkFE8rPHkxmt3tE,4677
-nova/trame/view/theme/assets/vuetify_config.json,sha256=_8NSthN18SXPlPr6bU--W8ktoYN6rUkhhcHv15egz8E,5462
+nova/trame/view/theme/assets/vuetify_config.json,sha256=HuR23Ds1dATt5fFUFMolFoLRjINLzg7AiLgQpQvuabc,5567
 nova/trame/view/theme/theme.py,sha256=OFUtq1IWriFcDu-346J67ZrSES8IOI9PTY_4Vwg7bZQ,11820
 nova/trame/view/utilities/local_storage.py,sha256=vD8f2VZIpxhIKjZwEaD7siiPCTZO4cw9AfhwdawwYLY,3218
-nova/trame/view_model/data_selector.py,sha256=baijpcbKCUk0BITPpbhHR6nAG-SF5ho2EyEfARTvDAo,1441
+nova/trame/view_model/data_selector.py,sha256=Bpkfjd78ZIkexHNF_aA9PfizRBzkeOuoSE7ZsBFcSOs,1749
 nova/trame/view_model/remote_file_input.py,sha256=ojEOJ8ZPkajpbAaZi9VLj7g-uBjhb8BMrTdMmwf_J6A,3367
-nova_trame-0.19.0.dev1.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
-nova_trame-0.19.0.dev1.dist-info/METADATA,sha256=HgDywkkcsOCZfKqRpASo7tJ_uJYn7TA_ld48eXXWmao,1451
-nova_trame-0.19.0.dev1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-nova_trame-0.19.0.dev1.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
-nova_trame-0.19.0.dev1.dist-info/RECORD,,
+nova_trame-0.19.0.dev2.dist-info/LICENSE,sha256=Iu5QiDbwNbREg75iYaxIJ_V-zppuv4QFuBhAW-qiAlM,1061
+nova_trame-0.19.0.dev2.dist-info/METADATA,sha256=7HZZEW7-Vs_z1Oo0T1AUeIUOodsk5Z0sE60yloyGXns,1451
+nova_trame-0.19.0.dev2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+nova_trame-0.19.0.dev2.dist-info/entry_points.txt,sha256=J2AmeSwiTYZ4ZqHHp9HO6v4MaYQTTBPbNh6WtoqOT58,42
+nova_trame-0.19.0.dev2.dist-info/RECORD,,