Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Read options from a manifest file in importcontent #9467

Merged
merged 12 commits into from
Sep 8, 2022
Merged

Read options from a manifest file in importcontent #9467

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
af6d5b0
Read options from a manifest file in importcontent
dylanmccall May 31, 2022
99282c2
Detect manifest files in importcontent
dylanmccall Jun 1, 2022
34f0b2e
Handle empty node_ids in importcontent
dylanmccall Jun 29, 2022
456069f
Support manifest_file without a name attribute
dylanmccall Sep 1, 2022
19be776
Clean up repeated node ID in ImportContentTestCase
dylanmccall Sep 1, 2022
63cdc92
Add tests for network import with manifest files
dylanmccall Sep 1, 2022
5915380
Allow empty node_ids to override a manifest file
dylanmccall Sep 1, 2022
3772108
Add tests for local import with manifest files
dylanmccall Sep 1, 2022
90cff47
Use six.StringIO instead of io.StringIO in tests
dylanmccall Sep 2, 2022
15c5375
Fix Py2 unicode errors in ImportContentTestCase
dylanmccall Sep 2, 2022
f47a71b
Document new tests in ImportContentTestCase
dylanmccall Sep 2, 2022
1ca7065
In importcontent, use a set for node_ids
dylanmccall Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Support manifest_file without a name attribute 
This could be a file-like object extended from IOBase.
  • Loading branch information
@dylanmccall
dylanmccall committed Sep 1, 2022
commit 456069fb3fc73540f3572465214941dbf46ccbad
6 changes: 3 additions & 3 deletions kolibri/core/content/management/commands/importcontent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ def add_arguments(self, parser):
"""
parser.add_argument(
"--manifest",
# Split the comma separated string we get, into a list of strings
type=argparse.FileType("r"),
default=None,
required=False,
Expand Down Expand Up @@ -108,7 +107,7 @@ def add_arguments(self, parser):
"""
parser.add_argument(
"--exclude_node_ids",
# Split the comma separated string we get, into a list of string
# Split the comma separated string we get, into a list of strings
type=lambda x: x.split(",") if x else [],
default=None,
required=False,
Expand Down Expand Up @@ -285,7 +284,8 @@ def _transfer( # noqa: max-complexity=16
# If manifest_file is stdin, its name will be "<stdin>" and path
# will become "". This feels clumsy, but the resulting behaviour
# is reasonable.
manifest_dir = os.path.dirname(manifest_file.name)
manifest_file_name = getattr(manifest_file, "name", "")
manifest_dir = os.path.dirname(manifest_file_name)
path = os.path.dirname(manifest_dir)

content_manifest = ContentManifest()
Expand Down