From cbcb62048a16ef076d61ceb01148915c84affdb8 Mon Sep 17 00:00:00 2001
From: "kirill.sizov" <kirill.sizov@intel.com>
Date: Fri, 16 Apr 2021 10:24:16 +0300
Subject: [PATCH] fix incorrect solution

---
 cvat/apps/dataset_manager/bindings.py     | 10 +++++-----
 cvat/apps/dataset_manager/formats/cvat.py |  2 +-
 cvat/apps/dataset_manager/formats/mots.py |  4 ++--
 cvat/apps/dataset_manager/formats/yolo.py |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cvat/apps/dataset_manager/bindings.py b/cvat/apps/dataset_manager/bindings.py
index a03adb21..b800e18c 100644
--- a/cvat/apps/dataset_manager/bindings.py
+++ b/cvat/apps/dataset_manager/bindings.py
@@ -14,7 +14,6 @@ from cvat.apps.engine.frame_provider import FrameProvider
 from cvat.apps.engine.models import AttributeType, ShapeType
 from datumaro.util import cast
 from datumaro.util.image import ByteImage, Image
-from datumaro.components.extractor import DatasetItem
 
 from .annotation import AnnotationManager, TrackManager
 
@@ -436,8 +435,9 @@ class TaskData:
     def _get_filename(path):
         return osp.splitext(path)[0]
 
-    def match_frame(self, path, root_hint=None):
-        path = self._get_filename(path)
+    def match_frame(self, path, root_hint=None, path_has_ext=True):
+        if path_has_ext:
+            path = self._get_filename(path)
         match = self._frame_mapping.get(path)
         if not match and root_hint and not path.startswith(root_hint):
             path = osp.join(root_hint, path)
@@ -612,7 +612,7 @@ def match_dm_item(item, task_data, root_hint=None):
     if frame_number is None and item.has_image:
         frame_number = task_data.match_frame(item.id + item.image.ext, root_hint)
     if frame_number is None:
-        frame_number = task_data.match_frame(item.id, root_hint)
+        frame_number = task_data.match_frame(item.id, root_hint, path_has_ext=False)
     if frame_number is None:
         frame_number = cast(item.attributes.get('frame', item.id), int)
     if frame_number is None and is_video:
@@ -652,7 +652,7 @@ def import_dm_annotations(dm_dataset, task_data):
 
     for item in dm_dataset:
         frame_number = task_data.abs_frame_id(
-            match_dm_item(DatasetItem(id=item.id + '.'), task_data, root_hint=root_hint))
+            match_dm_item(item, task_data, root_hint=root_hint))
 
         # do not store one-item groups
         group_map = {0: 0}
diff --git a/cvat/apps/dataset_manager/formats/cvat.py b/cvat/apps/dataset_manager/formats/cvat.py
index 02025afc..aa1a0a5a 100644
--- a/cvat/apps/dataset_manager/formats/cvat.py
+++ b/cvat/apps/dataset_manager/formats/cvat.py
@@ -441,7 +441,7 @@ def load(file_object, annotations):
             elif el.tag == 'image':
                 image_is_opened = True
                 frame_id = annotations.abs_frame_id(match_dm_item(
-                    DatasetItem(id=el.attrib['name'],
+                    DatasetItem(id=osp.splitext(el.attrib['name'])[0],
                         attributes={'frame': el.attrib['id']}
                     ),
                     task_data=annotations
diff --git a/cvat/apps/dataset_manager/formats/mots.py b/cvat/apps/dataset_manager/formats/mots.py
index a4a14e44..22b9dd08 100644
--- a/cvat/apps/dataset_manager/formats/mots.py
+++ b/cvat/apps/dataset_manager/formats/mots.py
@@ -5,7 +5,7 @@
 from tempfile import TemporaryDirectory
 
 from datumaro.components.dataset import Dataset
-from datumaro.components.extractor import AnnotationType, Transform, DatasetItem
+from datumaro.components.extractor import AnnotationType, Transform
 from pyunpack import Archive
 
 from cvat.apps.dataset_manager.bindings import (CvatTaskDataExtractor,
@@ -48,7 +48,7 @@ def _import(src_file, task_data):
 
         for item in dataset:
             frame_number = task_data.abs_frame_id(
-                match_dm_item(DatasetItem(id=item.id + '.'), task_data, root_hint=root_hint))
+                match_dm_item(item, task_data, root_hint=root_hint))
 
             for ann in item.annotations:
                 if ann.type != AnnotationType.polygon:
diff --git a/cvat/apps/dataset_manager/formats/yolo.py b/cvat/apps/dataset_manager/formats/yolo.py
index c0994774..0df6f5fe 100644
--- a/cvat/apps/dataset_manager/formats/yolo.py
+++ b/cvat/apps/dataset_manager/formats/yolo.py
@@ -40,7 +40,7 @@ def _import(src_file, task_data):
         for frame in frames:
             frame_info = None
             try:
-                frame_id = match_dm_item(DatasetItem(id=frame + '.'), task_data,
+                frame_id = match_dm_item(DatasetItem(id=frame), task_data,
                     root_hint=root_hint)
                 frame_info = task_data.frame_info[frame_id]
             except Exception: # nosec