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.

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

Keep generated SMIL for partial tracks #1153

Merged
merged 1 commit into from
Dec 11, 2019

Conversation

lwillmann
Copy link
Contributor

If one uses the IngestService and adds so called "partial"-tracks to a media package, the ingest service generates a SMIL-Catalog for these partial tracks. Unfortunately this generated SMIL-Catalog is removed if the option "skip.catalogs.for.existing.events" is set to true, which is the default. This pull request fixes this behaviour.

@lkiesow lkiesow added bug elan e.V. Pull requests originating from elan e.V. labels Oct 21, 2019
@lkiesow lkiesow self-assigned this Nov 23, 2019
@lkiesow
Copy link
Member

lkiesow commented Nov 23, 2019

@lwillmann, looks good. Just wondering if we don't want this in r/8.x since it's a bug fix.

@lwillmann
Copy link
Contributor Author

@lkiesow yes, I think it would be good to have this in r/8.x. Is there something I have to do?

@lkiesow
Copy link
Member

lkiesow commented Dec 6, 2019

Yes, you would probably have to rebase your branch, push this again and then update this pull request to point towards r/8.x (“Edit” right of the pull requests title).

For the rebase, it's more or less:

git fetch upstream  ← assuming `upstream` is the remote pointing to the community repo
git checkout keep-generated-smil
git rebase -i upstream/r/8.x  ← remove all commits except yours
git push --force-with-lease origin keep-generated-smil

We can take a short look at this together on Tuesday if you want

@lwillmann lwillmann changed the base branch from develop to r/8.x December 10, 2019 08:48
@lwillmann
Copy link
Contributor Author

lwillmann commented Dec 10, 2019

Ok, thanks for the guidance @lkiesow. Rebased to r/8.x

@lkiesow lkiesow merged commit 5c0235b into opencast:r/8.x Dec 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug elan e.V. Pull requests originating from elan e.V.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants