sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move status name generation in own func

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-05-03 00:04:44 +02:00
parent 0c8eba1cd3
commit 798bcf384c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
vdirsyncer/cli.py
View file

@ -32,6 +32,12 @@ cli_logger = log.get(__name__)
PROJECT_HOME = 'https://github.com/untitaker/vdirsyncer' PROJECT_HOME = 'https://github.com/untitaker/vdirsyncer'
def get_status_name(pair, collection):
if collection is None:
return pair
return pair + '/' + collection
def load_config(fname, pair_options=('collections', 'conflict_resolution')): def load_config(fname, pair_options=('collections', 'conflict_resolution')):
c = RawConfigParser() c = RawConfigParser()
try: try:
@ -282,8 +288,7 @@ def _sync_collection(x):
def sync_collection(config_a, config_b, pair_name, collection, pair_options, def sync_collection(config_a, config_b, pair_name, collection, pair_options,
general, force_delete): general, force_delete):
status_name = pair_name if collection is None \ status_name = get_status_name(pair_name, collection)
else '{}/{}'.format(pair_name, collection)
collection_description = pair_name if collection is None \ collection_description = pair_name if collection is None \
else '{} from {}'.format(collection, pair_name) else '{} from {}'.format(collection, pair_name)