aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElisa Sohier <elisa.sohier@art-software.fr>2019-08-01 16:08:59 +0200
committerElisa Sohier <elisa.sohier@art-software.fr>2019-08-01 16:08:59 +0200
commit0eab07c0cc5d8403c142d98e197f8c1724469224 (patch)
treee803bfddaed9edc401d32e67261caa4abb8eaba5
parent914e7f72c0edb708637d06335da830f1f2b0c3da (diff)
Use @default tabname for default file
-rw-r--r--autosync/__init__.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/autosync/__init__.py b/autosync/__init__.py
index c627537..6415880 100644
--- a/autosync/__init__.py
+++ b/autosync/__init__.py
@@ -24,7 +24,7 @@ def sync(source, dest, ignoreFile=None, verbose=False):
def getTab(name="", elements=[]):
"""Get entries"""
tabData = {}
- if name == "":
+ if name in ["", "default"]:
tabFile = os.path.join(os.environ["HOME"], ".autoSync.tab")
else:
tabFile = os.path.join(os.environ["HOME"], ".autoSync.{}.tab".format(name))
@@ -60,7 +60,7 @@ def run():
global server
args = deque(sys.argv[1:])
if len(args) < 1:
- print("{0} @ – list available tab names\n{0} @@tabname – list available entries under tabname\n{0}[ @tabname] entry1 entry2 – synchronizes entry1 and entry2 from tabname (or default)\n{0} @tabname – synchronizes every entry found in tabname\n{0} -s [@tabname][ entry1[ entry2[ …]]] – synchronizes in server mode (ie don't refresh timestamp)\n\nIf tabname is omitted, will use default file located at ~/.autoSync.tab".format(os.path.basename(sys.argv[0])))
+ print("{0} @ – list available tab names\n{0} @@tabname – list available entries under tabname\n{0}[ @tabname] entry1 entry2 – synchronizes entry1 and entry2 from tabname (or default)\n{0} @tabname – synchronizes every entry found in tabname\n{0} -s [@tabname][ entry1[ entry2[ …]]] – synchronizes in server mode (ie don't refresh timestamp)\n\nIf tabname is omitted, will use default file located at ~/.autoSync.tab (also available through the @default tabname)".format(os.path.basename(sys.argv[0])))
return
firstArg = args.popleft()
@@ -78,7 +78,7 @@ def run():
maxLenSrc = max(len(line[1]) for line in elts)
maxLenDst = max(len(line[1]) for line in elts)
- msg("Available entries for tabfile {}:".format((lambda i: ["(default)", i][len(i)>0])(firstArg.lstrip("@"))))
+ msg("Available entries for tabfile {}:".format((lambda i: ["default", i][len(i)>0])(firstArg.lstrip("@"))))
print("\n\033[1;37m%-*s %-*s %-*s\033[0m" % (maxLenName, "Name", maxLenSrc, "Source", maxLenDst, "Target"))
for ename, esrc, edst in elts:
print("%-*s %-*s %-*s" % (maxLenName, ename, maxLenSrc, esrc, maxLenDst, edst))
@@ -87,6 +87,8 @@ def run():
elif firstArg == "@": # lists all available tabFiles
files = glob.glob(os.path.join(os.environ["HOME"], ".autoSync.*.tab"))
msg("Available tables:")
+ if os.path.exists(os.path.join(os.environ["HOME"], ".autoSync.tab")):
+ print("– default")
print("\n".join("– " + os.path.basename(fileName).split(".", 2)[2][:-4] for fileName in files))
return
@@ -101,7 +103,7 @@ def run():
if not os.path.exists(ignoreFile):
ignoreFile = None
if tabname == "":
- tabname = "(default)"
+ tabname = "default"
if srcT >= dstT:
msg("[{} @ {}] sending data to destination".format(name, tabname))
if not server: