Skip to content

Added [-o,--overwrite] option #2

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
nkiesel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added [-o,--overwrite] option #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 15 additions & 7 deletions droopy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ Options:
--chmod MODE set the file permissions (octal value)
--save-config save options in a configuration file
--delete-config delete the configuration file and exit
-o, --overwrite overwrite existing files

Example:
droopy -m "Hi, this is Bob. You can send me a file." -p avatar.png
Expand All @@ -111,6 +112,7 @@ publish_files = False
auth = None
certfile = None
file_mode = None
overwrite = False

# -- HTML templates

Expand Down Expand Up @@ -737,10 +739,11 @@ class HTTPUploadHandler(BaseHTTPServer.BaseHTTPRequestHandler):
root, ext = os.path.splitext(localpath)
i = 1

# race condition, but hey...
while (os.path.exists(localpath)):
localpath = "%s-%d%s" % (root, i, ext)
i = i + 1
if not overwrite:
# race condition, but hey...
while (os.path.exists(localpath)):
localpath = "%s-%d%s" % (root, i, ext)
i = i + 1
if hasattr(item, 'tmpfile'):
# DroopyFieldStorage.make_file() has been called
item.tmpfile.close()
Expand Down Expand Up @@ -872,6 +875,8 @@ def save_options():
opt.append('--dl')
if port:
opt.append('%d' % port)
if overwrite:
opt.append('--overwrite')
f = open(configfile(), 'w')
f.write('\n'.join(opt).encode('utf8'))
f.close()
Expand All @@ -894,7 +899,7 @@ def parse_args(cmd=None):

Parse sys.argv[1:] if no argument is passed.
"""
global picture, message, port, directory, must_save_options, publish_files
global picture, message, port, directory, must_save_options, publish_files, overwrite
global auth, certfile, file_mode

if cmd == None:
Expand All @@ -905,9 +910,9 @@ def parse_args(cmd=None):

opts, args = None, None
try:
opts, args = getopt.gnu_getopt(cmd, "p:m:d:a:h",
opts, args = getopt.gnu_getopt(cmd, "p:m:d:a:h:o",
["picture=","message=", "directory=",
"auth=", "ssl=", "chmod=", "help",
"auth=", "ssl=", "chmod=", "help", "overwrite",
"save-config", "delete-config", "dl"])
except Exception, e:
print e
Expand Down Expand Up @@ -961,6 +966,9 @@ def parse_args(cmd=None):
print "Invalid octal value passed to chmod option: '%s'" % a
sys.exit(1)

elif o in ['-o', '--overwrite']:
overwrite = True


elif o in ['-h', '--help']:
print USAGE
Expand Down