-
Notifications
You must be signed in to change notification settings - Fork 0
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
Fix unarchived episodes published #976
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -106,20 +106,30 @@ def poll!(eps = episodes_to_sync) | |
end | ||
end | ||
|
||
def publish!(eps = episodes_to_sync) | ||
def publish! | ||
show.sync! | ||
raise "Missing Show!" unless show.apple_id.present? | ||
|
||
# delete or unpublished episodes | ||
# Archive deleted or unpublished episodes. | ||
# These episodes are no longer in the private feed. | ||
poll_episodes!(episodes_to_archive) | ||
archive!(episodes_to_archive) | ||
show.reload | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These calls are only needed when episodes move from |
||
|
||
# Un-archive episodes that are re-published. | ||
# These episodes are in the private feed. | ||
# Unarchived episodes are converted to "DRAFTING" state. | ||
poll_episodes!(episodes_to_unarchive) | ||
unarchive!(episodes_to_unarchive) | ||
show.reload | ||
|
||
Rails.logger.tagged("Apple::Publisher#publish!") do | ||
# Calculate the episodes_to_sync based on the current state of the private feed | ||
deliver_and_publish!(episodes_to_sync) | ||
|
||
# success | ||
SyncLog.log!(feeder_id: public_feed.id, feeder_type: :feeds, external_id: show.apple_id, api_response: {success: true}) | ||
end | ||
|
||
def deliver_and_publish!(eps) | ||
Rails.logger.tagged("Apple::Publisher#deliver_and_publish!") do | ||
eps.each_slice(PUBLISH_CHUNK_LEN) do |eps| | ||
# Soft delete any existing delivery and delivery files | ||
prepare_for_delivery!(eps) | ||
|
@@ -145,9 +155,6 @@ def publish!(eps = episodes_to_sync) | |
raise_delivery_processing_errors(eps) | ||
end | ||
end | ||
|
||
# success | ||
SyncLog.log!(feeder_id: public_feed.id, feeder_type: :feeds, external_id: show.apple_id, api_response: {success: true}) | ||
end | ||
|
||
def prepare_for_delivery!(eps) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removing this default parameter fixes up the caching of episode state. So when we un-archive the episode, the subsequent call to
episodes_to_sync
then freshly filters episode state (derived from the private feed).