Skip to content

Refactor move_files #5418

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

Merged
merged 2 commits into from
Mar 14, 2019
Merged

Refactor move_files #5418

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4a3269
Refactor move_files
stsewd Mar 7, 2019
e565fce
Change comment
stsewd Mar 7, 2019
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
61 changes: 12 additions & 49 deletions readthedocs/projects/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,64 +998,28 @@ def move_files(
return

# This is False if we have already synced media files to blob storage
# We set `epub=False` for example so data doesn't get re-uploaded on each web,
# so we need this to protect against deleting in those cases
# We set `epub=False` for example so data doesn't get re-uploaded on each
# web, so we need this to protect against deleting in those cases
if delete_unsynced_media:

if not pdf:

remove_dirs([
version.project.get_production_media_path(
type_='pdf',
version_slug=version.slug,
include_file=False,
),
])

if getattr(storage, 'write_build_media', False):
# Remove PDF from remote storage if it exists
storage_path = version.project.get_storage_path(
type_='pdf',
version_slug=version.slug,
)
if storage.exists(storage_path):
log.info('Removing %s from media storage', storage_path)
storage.delete(storage_path)

if not epub:

remove_dirs([
version.project.get_production_media_path(
type_='epub',
version_slug=version.slug,
include_file=False,
),
])

if getattr(storage, 'write_build_media', False):
# Remove ePub from remote storage if it exists
storage_path = version.project.get_storage_path(
type_='epub',
version_slug=version.slug,
)
if storage.exists(storage_path):
log.info('Removing %s from media storage', storage_path)
storage.delete(storage_path)

if not localmedia:

downloads = {
'pdf': pdf,
'epub': epub,
'htmlzip': localmedia,
}
unsync_downloads = (k for k, v in downloads.items() if not v)
for media_type in unsync_downloads:
remove_dirs([
version.project.get_production_media_path(
type_='htmlzip',
type_=media_type,
version_slug=version.slug,
include_file=False,
),
])

if getattr(storage, 'write_build_media', False):
# Remove ePub from remote storage if it exists
# Remove the media from remote storage if it exists
storage_path = version.project.get_storage_path(
type_='htmlzip',
type_=media_type,
version_slug=version.slug,
)
if storage.exists(storage_path):
Expand Down Expand Up @@ -1104,7 +1068,6 @@ def move_files(
include_file=True,
)
Syncer.copy(from_path, to_path, host=hostname, is_file=True)
# Always move PDF's because the return code lies.
if pdf:
from_path = os.path.join(
version.project.artifact_path(
Expand Down