Skip to content

Add an edit command #76

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

Open
apetresc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add an edit command #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9649e8
Add an `edit` command
apetresc Jul 20, 2016
58fa849
Merge branch 'master' into edit-command
apetresc Jan 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
35 changes: 34 additions & 1 deletion s4cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"""

import sys, os, re, optparse, multiprocessing, fnmatch, time, hashlib, errno, pytz
import logging, traceback, types, threading, random, socket, shlex, datetime, json
import logging, tempfile, traceback, types, threading, random, socket, shlex, datetime, json
from subprocess import call

IS_PYTHON2 = sys.version_info[0] == 2

Expand Down Expand Up @@ -64,6 +65,7 @@ def cmp(a, b):
S3_SECRET_KEY_NAME = "S3_SECRET_KEY"
S4CMD_ENV_KEY = "S4CMD_OPTS"

EDITOR = os.environ.get('EDITOR', 'vim')

##
## Utility classes
Expand Down Expand Up @@ -240,6 +242,10 @@ def get_fixed_path(self):
fi.append(p)
return PATH_SEP.join(fi)

def get_file_name(self):
'''Get the final path component, without the directory'''
return self.path.split(PATH_SEP)[-1]

@staticmethod
def combine(proto, bucket, path):
'''Combine each component and general a S3 url string, no path normalization
Expand Down Expand Up @@ -1676,6 +1682,33 @@ def cat_handler(self, args):

self.s3handler().print_files(source)

@log_calls
def edit_handler(self, args):
'''Handler for edit command'''
self.opt.force = True
self.opt.ignore_empty_source = True

self.validate('cmd|s3', args)
source = args[1]
# We append the old filename so that the editor can apply things like syntax highlighting if appropriate
target = os.path.join(tempfile.gettempdir(), hashlib.md5(source).hexdigest() + '-' + S3URL(source).get_file_name())

TEMP_FILES.add(target)

self.s3handler().get_files(source, target)
# In case the file doesn't already exist on S3, just create an empty file to fill in.
open(target, 'a').close()

old_content_hash = LocalMD5Cache(target).get_md5()
call([EDITOR, target])
new_content_hash = LocalMD5Cache(target).get_md5()

if old_content_hash == new_content_hash:
message('No changes detected')
else:
self.s3handler().put_files(target, source)


@log_calls
def dsync_handler(self, args):
'''Handler for dsync command.'''
Expand Down