Merge branch '222-update-import' into 'develop' (2182227f) · Commits · Zwordi / funkwhale · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

funkwhale
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

2182227f

Commit 2182227f authored 6 years ago by R En

Downloads
- Plain Diff

Merge branch '222-update-import' into 'develop'

Resolve "Add flag during import to replace already present tracks with new version"

Closes #222

See merge request funkwhale/funkwhale!264

parents 0df0110d 61eb8e4d

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

api/funkwhale_api/music/factories.py 1 addition, 0 deletions

api/funkwhale_api/music/factories.py
api/funkwhale_api/music/migrations/0028_importjob_replace_if_duplicate.py 18 additions, 0 deletions

...i/music/migrations/0028_importjob_replace_if_duplicate.py
api/funkwhale_api/music/models.py 1 addition, 0 deletions

api/funkwhale_api/music/models.py
api/funkwhale_api/music/tasks.py 7 additions, 6 deletions

api/funkwhale_api/music/tasks.py
api/funkwhale_api/providers/audiofile/management/commands/import_files.py 27 additions, 7 deletions

...i/providers/audiofile/management/commands/import_files.py
api/tests/music/test_tasks.py 20 additions, 3 deletions

api/tests/music/test_tasks.py
api/tests/test_import_audio_file.py 14 additions, 0 deletions

api/tests/test_import_audio_file.py
changes/changelog.d/222.feature 1 addition, 0 deletions

changes/changelog.d/222.feature

with 89 additions and 16 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment