Add commands module. Move list command inside.

master
Lertsenem 2015-12-07 16:36:07 +01:00
parent 7a8215ae16
commit 1749d0706d
3 changed files with 62 additions and 47 deletions

View File

View File

@ -0,0 +1,58 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
import os.path
# --------------------------------------
def init(parser):
parser.add_argument( "apps" ,
type=str ,
nargs="*" ,
default=[] ,
help="The apps to list ; defaults to all " \
"apps" )
parser.add_argument( "--show-files", "-f" ,
action="store_true" ,
help="Show the files for each app ; it is " \
"automatically set if you specify the " \
"apps to list." )
# --------------------------------------
def run(args, persoconf, logger):
app_list = persoconf.list_apps(logger=logger)
# If no app is given: list all apps
if args.apps == []:
logger.info("Listing all apps")
for app in app_list:
# Print the app name
print(app)
# Print the files too if asked so
if args.show_files:
for f in app_list[app].files:
if os.path.isdir(persoconf.path + "/" + app + "/" + f):
print("\t%s/" % f)
else:
print("\t%s" % f)
# Some apps were specified, so we list them with their files
else:
for app in args.apps:
if app not in app_list:
logger.warning("No such app: %s" % app)
continue
# Print the app name
print(app)
# Print the app files
for f in app_list[app].files:
if os.path.isdir(persoconf.path + "/" + app + "/" + f):
print("\t%s/" % f)
else:
print("\t%s" % f)

View File

@ -15,6 +15,8 @@ from metafile import Metafile, MalformedMetafileError, NoPathDefinedError
from persoconf import Persoconf, FileInsteadOfDirError, \ from persoconf import Persoconf, FileInsteadOfDirError, \
PersoconfRootDoesNotExistError PersoconfRootDoesNotExistError
import commands.list
# ARGPARSE # ARGPARSE
@ -47,19 +49,7 @@ parser_help = subparsers.add_parser( "help" ,
# List # List
parser_list = subparsers.add_parser( "list" , parser_list = subparsers.add_parser( "list" ,
help="List backuped apps" ) help="List backuped apps" )
commands.list.init(parser_list)
parser_list.add_argument( "apps" ,
type=str ,
nargs="*" ,
default=[] ,
help="The apps to list ; defaults to all " \
"apps" )
parser_list.add_argument( "--show-files", "-f" ,
action="store_true" ,
help="Show the files for each app ; it is " \
"automatically set if you specify the apps " \
"to list." )
# Package # Package
parser_package = subparsers.add_parser( "package" , parser_package = subparsers.add_parser( "package" ,
@ -215,40 +205,7 @@ except PersoconfRootDoesNotExistError:
# LIST COMMAND # LIST COMMAND
######################################## ########################################
if args.command == "list": if args.command == "list":
commands.list.run(args, persoconf, log)
app_list = persoconf.list_apps(logger=log)
# If no app is given: list all apps
if args.apps == []:
log.info("Listing all apps")
for app in app_list:
# Print the app name
print(app)
# Print the files too if asked so
if args.show_files:
for f in app_list[app].files:
if os.path.isdir(persoconf.path + "/" + app + "/" + f):
print("\t%s/" % f)
else:
print("\t%s" % f)
# Some apps were specified, so we list them with their files
else:
for app in args.apps:
if app not in app_list:
log.warning("No such app: %s" % app)
continue
# Print the app name
print(app)
# Print the app files
for f in app_list[app].files:
if os.path.isdir(persoconf.path + "/" + app + "/" + f):
print("\t%s/" % f)
else:
print("\t%s" % f)
# DELETE COMMAND # DELETE COMMAND