v.licheni.net
/
stack
/
code
/
dboxswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get dropbox directory in an os dependant way in ProfHandler
[stack/code/dboxswitch.git]
/
profhandler.py
diff --git
a/profhandler.py
b/profhandler.py
index
1008c4b
..
5ef71e5
100755
(executable)
--- a/
profhandler.py
+++ b/
profhandler.py
@@
-1,4
+1,3
@@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
"""
# -*- coding: utf-8 -*-
"""
@@
-94,7
+93,7
@@
class ProfHandler():
if self.isValidProfileName(profileName):
os.makedirs(os.path.join(self.getProfileFolder(), profileName))
else:
if self.isValidProfileName(profileName):
os.makedirs(os.path.join(self.getProfileFolder(), profileName))
else:
- raise AppError('Profile Name not valid')
+ raise AppError('Profile Name not valid
.\nAllowed only ascii characters.
')
print("Profile "+profileName+" created.")
def delProfile(self, profileName):
print("Profile "+profileName+" created.")
def delProfile(self, profileName):
@@
-117,26
+116,27
@@
class ProfHandler():
else:
return False
else:
return False
- def activateProfile(self, p
name
):
- if p
name
in self.getProfilesList():
+ def activateProfile(self, p
path
):
+ if p
path
in self.getProfilesList():
self.stopDropbox()
try:
self.stopDropbox()
try:
- with open(
os.path.join(self.getProfileFolder(), pname)
) as pdir:
+ with open(
ppath
) as pdir:
os.unlink(self.getDropboxDirectory())
os.unlink(self.getDropboxDirectory())
- os.symlink(
os.path.join(self.getProfileFolder(), pname)
, self.getDropboxDirectory())
+ os.symlink(
ppath
, self.getDropboxDirectory())
except IOError as e:
except IOError as e:
- raise AppError('Error on activating Profile: '+p
name
)
+ raise AppError('Error on activating Profile: '+p
path
)
self.startDropbox()
else:
raise AppError("Trying to acrivate non existant profile")
def getDropboxDirectory(self):
pl = platform.system()
self.startDropbox()
else:
raise AppError("Trying to acrivate non existant profile")
def getDropboxDirectory(self):
pl = platform.system()
- if pl
== 'Linux'
:
+ if pl
in ('Linux', 'Darwin')
:
return os.path.join(os.path.expanduser('~'),".dropbox")
elif pl == 'Windows':
return os.path.join(os.path.expanduser('~'),".dropbox")
elif pl == 'Windows':
- raise NotImplementedError, "Not implemented yet."
- elif pl == 'Darwin':
+ assert os.environ.has_key('APPDATA'), Exception('APPDATA env variable not found')
+ return os.path.join(os.environ['APPDATA'],'Dropbox')
+ else:
raise NotImplementedError, "Not implemented yet."
raise NotImplementedError, "Not implemented yet."