Skip to content

Pilot 3546: add folder merging feature - #89

Merged
colorzzr merged 8 commits into
developfrom
PILOT-3546
Sep 6, 2023
Merged

Pilot 3546: add folder merging feature#89
colorzzr merged 8 commits into
developfrom
PILOT-3546

Conversation

@colorzzr

Copy link
Copy Markdown
Member

Summary

now frontend supports to merge the folder when uploading. It is also a desired feature with cli.

  • when upload folder with same name, cli will perform a duplication check on selected files.
  • list the duplicated files for user.
  • provide options to allow user to skip duplicates or abort uploading.

JIRA Issues

Pilot 3546

Type of Change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • Refactor or reformatting

Testing

Are there any new or updated tests to validate the changes?

  • Yes
  • No

Test Directions

new test cases for folder merging output and behavior

@colorzzr colorzzr self-assigned this Aug 29, 2023
@github-actions

github-actions Bot commented Aug 29, 2023

Copy link
Copy Markdown
Contributor

Coverage

Coverage Report
FileStmtsMissCoverMissing
__init__.py00100% 
pilotcli.py0290%5–6, 8–12, 15–19, 21–26, 29–37, 40–41
commands
   __init__.py00100% 
   container_registry.py01959%16, 22–24, 31–33, 41–44, 50–53, 62–65
   dataset.py04844%19, 36–38, 41–48, 50–60, 78–80, 83–91, 93–103, 123, 127
   entry_point.py01084%37, 43, 85–87, 89–93
   file.py06169%36, 133, 137, 155–156, 198, 280–287, 289, 291, 305–311, 313, 342, 344, 347, 383–389, 392–393, 395–396, 398–410, 412–414, 416, 419–421, 423–425
   project.py0197%17
   user.py0685%23, 40, 48, 56, 72–73
configs
   __init__.py00100% 
   app_config.py00100% 
   config.py00100% 
   user_config.py01784%61, 70, 114, 124, 131, 135, 139, 143, 147, 151, 155, 159, 163, 167, 171, 175, 179
models
   __init__.py00100% 
   enums.py00100% 
   service_meta_class.py0180%9
   singleton.py00100% 
   upload_form.py0625%30, 42–46
resources
   custom_error.py00100% 
   custom_help.py00100% 
services
   __init__.py00100% 
services/container_registry_manager
   container_registry_manager.py010817%19–20, 23–26, 29–33, 36–44, 48–60, 62–64, 68–82, 84–86, 90–99, 101–103, 107–110, 125–136, 140–143, 147–162, 164, 166–169
services/crypto
   __init__.py00100% 
   crypto.py01940%35, 43–47, 49, 59–61, 69–75, 77, 79
services/dataset_manager
   dataset_detail.py02370%42, 44, 61, 68–73, 75–77, 79–88, 90
   dataset_download.py01983%56, 72–73, 84, 96, 98–99, 101–102, 104, 106–108, 116–119, 153, 165
   dataset_list.py0683%37, 43–44, 46–48
   model.py00100% 
services/file_manager
   __init__.py00100% 
   file_list.py01971%29, 48, 50, 57–58, 63–65, 73–76, 78, 84–89
   file_manifests.py09525%19–24, 39–43, 47–48, 51–59, 61, 65–68, 71–75, 77, 81–82, 85–87, 91–92, 95–102, 104, 107, 109–110, 112–113, 115–118, 123–129, 134–139, 142–148, 150–152, 155–161, 163–165, 167–170
   file_tag.py03931%23, 27–31, 33, 36–48, 50–52, 54–55, 59–61, 64–68, 70–73, 75–76
services/file_manager/file_download
   __init__.py00100% 
   download_client.py018717%29–41, 44–45, 47–53, 56–57, 59–60, 69, 71–72, 76–79, 86, 91–94, 96, 98–106, 108, 110, 114–119, 121, 124–125, 128–130, 132–134, 136–137, 139–141, 145–153, 156–161, 165–174, 182–184, 186–193, 195–199, 204–214, 216–217, 220–221, 226–227, 231–236, 240–241, 244–246, 248–259, 263–266, 269–273, 275–277, 279–281, 283–284, 286, 290–292, 294–307, 309
   model.py0187%15
services/file_manager/file_upload
   __init__.py00100% 
   exception.py0175%10
   file_upload.py02386%33–40, 74, 104, 135–136, 140, 145, 182, 239–240, 242–244, 318, 321, 325
   models.py0591%23, 41, 147–149
   upload_client.py07560%101–104, 200–202, 216–222, 224–228, 230–242, 244, 288, 291, 295, 297–301, 305–309, 311, 315, 317, 319, 321, 340, 369–370, 375, 379–382, 386, 402, 404–406, 413, 418–419, 421, 423–424, 426–429, 431
   upload_validator.py02452%26–28, 31–36, 39–48, 51–52, 57, 59, 61
services/logger_services
   __init__.py00100% 
   log_functions.py00100% 
services/output_manager
   __init__.py00100% 
   error_handler.py00100% 
   help_page.py00100% 
   message_handler.py05568%23, 45, 50, 65–67, 72, 82, 87, 100, 105, 112, 117, 122, 126, 142, 177, 187, 197, 216, 238–249, 260–265, 267–273, 284, 288–289, 293–294, 296–297, 301, 305, 309
services/project_manager
   __init__.py00100% 
   project.py0683%38, 44–45, 47–49
services/user_authentication
   __init__.py00100% 
   decorator.py0293%27, 30
   token_manager.py01576%25, 40–41, 72, 75, 82–83, 89–90, 92–95, 97, 102
   user_login_logout.py04266%30–31, 41, 122, 126–132, 134–136, 140–141, 145–152, 154–156, 160–161, 168–173, 175–177, 181–184
utils
   __init__.py00100% 
   aggregated.py03565%72–74, 76–77, 84–85, 87, 91–94, 96–97, 111–118, 120–121, 125–132, 134–136
TOTAL280899764% 

@colorzzr
colorzzr requested a review from erikdvlp August 29, 2023 22:01
@colorzzr
colorzzr merged commit ff45df7 into develop Sep 6, 2023
@colorzzr
colorzzr deleted the PILOT-3546 branch March 4, 2024 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants