ciocore 8.0.0b23__py2.py3-none-any.whl → 8.0.0b24__py2.py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of ciocore might be problematic. Click here for more details.
- ciocore/VERSION +1 -1
- ciocore/docsite/sitemap.xml.gz +0 -0
- ciocore/downloader/base_downloader.py +2 -2
- ciocore/downloader/log.py +2 -1
- ciocore/downloader/logging_download_runner.py +1 -1
- ciocore/downloader/reporter.py +0 -12
- {ciocore-8.0.0b23.dist-info → ciocore-8.0.0b24.dist-info}/METADATA +1 -1
- {ciocore-8.0.0b23.dist-info → ciocore-8.0.0b24.dist-info}/RECORD +11 -11
- {ciocore-8.0.0b23.dist-info → ciocore-8.0.0b24.dist-info}/WHEEL +0 -0
- {ciocore-8.0.0b23.dist-info → ciocore-8.0.0b24.dist-info}/entry_points.txt +0 -0
- {ciocore-8.0.0b23.dist-info → ciocore-8.0.0b24.dist-info}/top_level.txt +0 -0
ciocore/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
8.0.0-beta.
|
|
1
|
+
8.0.0-beta.24
|
ciocore/docsite/sitemap.xml.gz
CHANGED
|
Binary file
|
|
@@ -155,7 +155,6 @@ class BaseDownloader(object):
|
|
|
155
155
|
client=api_client.ApiClient(),
|
|
156
156
|
):
|
|
157
157
|
"""Initialize the downloader."""
|
|
158
|
-
logger.debug("Initializing paged downloader")
|
|
159
158
|
self.destination = destination
|
|
160
159
|
self.force = force
|
|
161
160
|
self.num_threads = num_threads
|
|
@@ -194,6 +193,7 @@ class BaseDownloader(object):
|
|
|
194
193
|
logger.debug("Max attempts: %s", self.max_attempts)
|
|
195
194
|
logger.debug("Delay: %s", self.delay)
|
|
196
195
|
logger.debug("Jitter: %s", self.jitter)
|
|
196
|
+
logger.debug("Regex: %s", self.regex)
|
|
197
197
|
|
|
198
198
|
def handle_interrupt(self, *args):
|
|
199
199
|
"""
|
|
@@ -294,7 +294,7 @@ class BaseDownloader(object):
|
|
|
294
294
|
- file_info (dict): A dictionary containing information about the file to be downloaded.
|
|
295
295
|
|
|
296
296
|
Returns:
|
|
297
|
-
- file_done_event:
|
|
297
|
+
- file_done_event: A dictionary indicating the completion status of the download.
|
|
298
298
|
"""
|
|
299
299
|
filepath = file_info["filepath"]
|
|
300
300
|
attempts_remaining = self.max_attempts
|
ciocore/downloader/log.py
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import logging
|
|
2
2
|
import colorlog
|
|
3
|
+
import sys
|
|
3
4
|
LOGGER_NAME = "conductor.download"
|
|
4
5
|
|
|
5
6
|
LOG_COLORS ={
|
|
@@ -69,7 +70,7 @@ class GracefulStreamHandler(colorlog.StreamHandler):
|
|
|
69
70
|
|
|
70
71
|
logging.setLoggerClass(GracefulLogger)
|
|
71
72
|
logger = colorlog.getLogger(LOGGER_NAME)
|
|
72
|
-
stream_handler = GracefulStreamHandler()
|
|
73
|
+
stream_handler = GracefulStreamHandler(sys.stdout)
|
|
73
74
|
# Ensure that the handler uses the correct formatter, and only one handler is attached
|
|
74
75
|
while logger.hasHandlers():
|
|
75
76
|
logger.removeHandler(logger.handlers[0])
|
|
@@ -75,7 +75,7 @@ class LoggingDownloadRunner(DownloadRunnerBase):
|
|
|
75
75
|
for job_id, task_id, task in evt["registry"].each():
|
|
76
76
|
if task["completed_files"] < task["filecount"]:
|
|
77
77
|
logger.warning(
|
|
78
|
-
"Task not
|
|
78
|
+
"Task not fully downloaded %s:%s: %s/%s files.",
|
|
79
79
|
job_id,
|
|
80
80
|
task_id,
|
|
81
81
|
task["completed_files"],
|
ciocore/downloader/reporter.py
CHANGED
|
@@ -78,11 +78,6 @@ class Reporter(object):
|
|
|
78
78
|
Callback to run on a task-done event. Report status back to the server.
|
|
79
79
|
"""
|
|
80
80
|
if evt["preexisting"]:
|
|
81
|
-
logger.debug(
|
|
82
|
-
"Task done, but already existed locally %s:%s. Skip reporting.",
|
|
83
|
-
evt["job_id"],
|
|
84
|
-
evt["task_id"],
|
|
85
|
-
)
|
|
86
81
|
return
|
|
87
82
|
future = self.executor.submit(
|
|
88
83
|
self.report_task_status,
|
|
@@ -105,13 +100,6 @@ class Reporter(object):
|
|
|
105
100
|
logger.debug("Download done. Reporting remaining task statuses to server")
|
|
106
101
|
for job_id, task_id, task in evt["registry"].each():
|
|
107
102
|
if task["completed_files"] < task["filecount"]:
|
|
108
|
-
logger.warning(
|
|
109
|
-
"Task not completed %s:%s: %s/%s files.",
|
|
110
|
-
job_id,
|
|
111
|
-
task_id,
|
|
112
|
-
task["completed_files"],
|
|
113
|
-
task["filecount"],
|
|
114
|
-
)
|
|
115
103
|
|
|
116
104
|
future = self.executor.submit(
|
|
117
105
|
self.report_task_status,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
ciocore/VERSION,sha256=
|
|
1
|
+
ciocore/VERSION,sha256=SvZSBkgu6AHfeW_MCcfBQgBb7p4fb30DogUYWr9e_Zw,13
|
|
2
2
|
ciocore/__init__.py,sha256=aTP7LeeosQA8BZE67gDV4jgfTK5zxmwZRjiTRu_ZWj0,646
|
|
3
3
|
ciocore/api_client.py,sha256=BTDGXT-59-48SLz3BzP8OtGEhBYDiiEvyytsRUxaK9I,23555
|
|
4
4
|
ciocore/cli.py,sha256=65a74el9SA1TX1wOeCdUdWvYDSO8RONLfotKZFlVeuw,14706
|
|
@@ -27,7 +27,7 @@ ciocore/docsite/index.html,sha256=p_Dq_6_8cwZZPDI5zjahfCWUkfbSj14NJtoQFAZv0WI,20
|
|
|
27
27
|
ciocore/docsite/logo.png,sha256=gArgFFWdw8w985-0TkuGIgU_pW9sziEMZdqytXb5WLo,2825
|
|
28
28
|
ciocore/docsite/objects.inv,sha256=UhlZWOqRV8tA4CzS8HKmk322X-so5ZmIe55155t_7Ls,746
|
|
29
29
|
ciocore/docsite/sitemap.xml,sha256=M_V85zl0y2adRvzJAnoCxlZH_Hl7TLnIb1A-6l_xGmI,109
|
|
30
|
-
ciocore/docsite/sitemap.xml.gz,sha256=
|
|
30
|
+
ciocore/docsite/sitemap.xml.gz,sha256=_8sFRX3xvWcpTtJ-2B1Jtymm9ucS6_z7e0YRgXkMeJU,127
|
|
31
31
|
ciocore/docsite/apidoc/api_client/index.html,sha256=DYVIV4xZRhTEiDJoIRn-76YRjGia_ce6LDss7G2stsE,164621
|
|
32
32
|
ciocore/docsite/apidoc/apidoc/index.html,sha256=NQn8wjapxa7O2IQhsbE7Y-VMfMFL6Tby-L7qIF6K3m4,26171
|
|
33
33
|
ciocore/docsite/apidoc/config/index.html,sha256=1GWkyClM7LJlLBpx07BqCi3xDkU-SKVPjNUEeKuwbNs,72559
|
|
@@ -86,15 +86,15 @@ ciocore/docsite/search/search_index.json,sha256=t-RJBVqxWPIzkjKMY9dMfpuwzVnJIeHk
|
|
|
86
86
|
ciocore/docsite/stylesheets/extra.css,sha256=qgfcao9TEBzf6ieAWN5rPyrea7YM_YgVg5qr4NPrxoU,354
|
|
87
87
|
ciocore/docsite/stylesheets/tables.css,sha256=O2PEwlKC0RfvZCRV9UERqQRvhb6jcqO84PLew0bafF0,3279
|
|
88
88
|
ciocore/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
89
|
-
ciocore/downloader/base_downloader.py,sha256=
|
|
89
|
+
ciocore/downloader/base_downloader.py,sha256=yyfzpQy8V_W8HQVy-1o1nMoGAQaFgdMRVWD4XKZQJ2w,25273
|
|
90
90
|
ciocore/downloader/daemon_downloader.py,sha256=fZZx6P6AAPdaksW4wkdLCo3TAuJhtJWEl5K26SODeTw,1356
|
|
91
91
|
ciocore/downloader/download_runner_base.py,sha256=RHL3JTytaiHN7GvxBtQbmkgEgrUskkW7NUAIDadczJw,1419
|
|
92
92
|
ciocore/downloader/job_downloader.py,sha256=bAY6-RyNexS4hn8Gj_xMPLYFjBPzrvt6nDAxPbziUEk,5652
|
|
93
93
|
ciocore/downloader/legacy_downloader.py,sha256=1dCkagDoRYliQjGUYD2kAw49TQ-4k2AO592e--UHhf4,52087
|
|
94
|
-
ciocore/downloader/log.py,sha256=
|
|
95
|
-
ciocore/downloader/logging_download_runner.py,sha256=
|
|
94
|
+
ciocore/downloader/log.py,sha256=G5VAu56WFXD7agitpaQu3kdQpeNBcsXCRKukstzNeWM,2255
|
|
95
|
+
ciocore/downloader/logging_download_runner.py,sha256=iOuW8OvfAYW5MpP9zpUXh94qkWLC0GeG4PDGH7JSqJM,2865
|
|
96
96
|
ciocore/downloader/registry.py,sha256=_JIOuqpWkJkgJGN33nt-DCvqN9Gw3xeFhzPq4RUxIoE,2903
|
|
97
|
-
ciocore/downloader/reporter.py,sha256=
|
|
97
|
+
ciocore/downloader/reporter.py,sha256=w1rjIzykUqc0UIBCa83TXll5y7UmLLcI6Q0WwG0njDI,4427
|
|
98
98
|
ciocore/uploader/__init__.py,sha256=hxRFJf5Lo86rtRObFXSjjot8nybQd-SebSfYCbgZwow,24
|
|
99
99
|
ciocore/uploader/_uploader.py,sha256=AaCwRo1rGkdMA-XACx9k4Z73R97ndJUVMemUZNV-Ark,37353
|
|
100
100
|
ciocore/uploader/upload_stats/__init__.py,sha256=Lg1y4zq1i0cwc6Hh2K1TAQDYymLff49W-uIo1xjcvdI,5309
|
|
@@ -120,8 +120,8 @@ tests/test_uploader.py,sha256=B1llTJt_fqR6e_V_Jxfw9z73QgkFlEPU87xLYGzt-TQ,2914
|
|
|
120
120
|
tests/test_validator.py,sha256=2fY66ayNc08PGyj2vTI-V_1yeCWJDngkj2zkUM5TTCI,1526
|
|
121
121
|
tests/mocks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
122
122
|
tests/mocks/glob.py,sha256=J2MH7nqi6NJOHuGdVWxhfeBd700_Ckj6cLh_8jSNkfg,215
|
|
123
|
-
ciocore-8.0.
|
|
124
|
-
ciocore-8.0.
|
|
125
|
-
ciocore-8.0.
|
|
126
|
-
ciocore-8.0.
|
|
127
|
-
ciocore-8.0.
|
|
123
|
+
ciocore-8.0.0b24.dist-info/METADATA,sha256=nIMXVhlrSoInwWe3wpLwb4auuokjLTZ_jouP6P7Y9ww,16647
|
|
124
|
+
ciocore-8.0.0b24.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
|
|
125
|
+
ciocore-8.0.0b24.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
|
|
126
|
+
ciocore-8.0.0b24.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
|
|
127
|
+
ciocore-8.0.0b24.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|