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.

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

Jump to bottom

Fix proposal for special chars in files and Jotta post-params #143

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix proposal for special chars in files and Jotta post-params #143

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
13 changes: 8 additions & 5 deletions src/jottalib/jottacloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def filelist(jottapath, JFS):
return set() # folder does not exist, so pretend it is an empty folder
if not isinstance(jf, JFSFolder):
return False
return set([f.name for f in jf.files() if not f.is_deleted()]) # Only return files that aren't deleted
return set([_encode_filename_to_filesystem(f.name) for f in jf.files() if not f.is_deleted()]) # Only return files that aren't deleted

def folderlist(jottapath, JFS):
"""Get a set() of folders from a jottapath (a folder)"""
Expand All @@ -89,7 +89,7 @@ def folderlist(jottapath, JFS):
return set() # folder does not exist, so pretend it is an empty folder
if not isinstance(jf, JFSFolder):
return False
return set([f.name for f in jf.folders() if not f.is_deleted()]) # Only return files that aren't deleted
return set([_encode_filename_to_filesystem(f.name) for f in jf.folders() if not f.is_deleted()]) # Only return files that aren't deleted

def compare(localtopdir, jottamountpoint, JFS, followlinks=False, exclude_patterns=None):
"""Make a tree of local files and folders and compare it with what's currently on JottaCloud.
Expand Down Expand Up @@ -234,19 +234,22 @@ def replace_if_changed(localfile, jottapath, JFS):
def deleteDir(jottapath, JFS):
"""Remove folder from JottaCloud because it is no longer present on local disk.
Returns boolean"""
jf = JFS.post('%s?dlDir=true' % jottapath)
params = {'dlDir':'true'}
jf = JFS.post(jottapath,params)
return jf.is_deleted()

def delete(jottapath, JFS):
"""Remove file from JottaCloud because it is no longer present on local disk.
Returns boolean"""
jf = JFS.post('%s?dl=true' % jottapath)
params = {'dl':'true'}
jf = JFS.post(jottapath,params)
return jf.is_deleted()

def mkdir(jottapath, JFS):
"""Make a new directory (a.k.a. folder) on JottaCloud.
Returns boolean"""
jf = JFS.post('%s?mkDir=true' % jottapath)
params = {'mkDir':'true'}
jf = JFS.post(jottapath,params)
return instanceof(jf, JFSFolder)

def iter_tree(jottapath, JFS):
Expand Down