Skip to content

Refactored classes GenericPush,PublicanPush,PoPush,GenericPull. #10

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

Merged
gnuman merged 1 commit into from
Nov 19, 2014
Merged

Refactored classes GenericPush,PublicanPush,PoPush,GenericPull. #10

Show file tree
Hide file tree
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
53 changes: 23 additions & 30 deletions zanataclient/pullcmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
log = Logger()

class GenericPull(Push):
def __init__(self,*args,**kargs):
super(GenericPull,self).__init__(*args,**kargs)

def process_transdir(self, command_options, src_folder):
trans_folder = ""

Expand Down Expand Up @@ -57,66 +60,56 @@ def create_outpath(self, command_options, output_folder):

return output

def run(self, command_options, args, project_type,http_header=None):
def run(self):
dir_option = False
skeletons = True
filelist = []
output_folder = None

url, project_id, version_id, project_config = self.get_projectinfo(command_options)
zanatacmd, username, client_version, server_version = self.create_zanatacmd(url, command_options,http_header)
version_info = self.create_versioninfo(client_version, server_version)
log.info("zanata server: %s" % url)
log.info(version_info)
log.info("Project: %s" % project_id)
log.info("Version: %s" % version_id)
log.info("Username: %s" % username)
zanatacmd.verify_project(project_id, version_id)

lang_list = self.get_lang_list(command_options, project_config)
lang_list = self.get_lang_list(self.command_options, self.project_config)

#list the files in project
try:
filelist = zanatacmd.get_file_list(project_id, version_id)
filelist = self.zanatacmd.get_file_list(self.project_id, self.version_id)
except Exception, e:
log.error(str(e))
sys.exit(1)

if project_config.has_key('locale_map'):
locale_map = project_config['locale_map']
if self.project_config.has_key('locale_map'):
locale_map = self.project_config['locale_map']
else:
locale_map = None

if project_type:
if self.project_type:
command_type = project_type
dir_option = True
elif command_options.has_key('project_type'):
command_type = command_options['project_type'][0]['value']
elif project_config['project_type']:
command_type = project_config['project_type']
elif self.command_options.has_key('project_type'):
command_type = self.command_options['project_type'][0]['value']
elif self.project_config['project_type']:
command_type = self.project_config['project_type']
else:
log.error("The project type is unknown")
sys.exit(1)

if dir_option:
#Keep dir option for publican/po pull
if command_options.has_key('dir'):
output_folder = command_options['dir'][0]['value']
if self.command_options.has_key('dir'):
output_folder = self.command_options['dir'][0]['value']

if command_options.has_key('dstdir'):
output_folder = command_options['dstdir'][0]['value']
if self.command_options.has_key('dstdir'):
output_folder = self.command_options['dstdir'][0]['value']
else:
#Disable dir option for generic pull command
if command_options.has_key('dir'):
if self.command_options.has_key('dir'):
log.warn("dir option is disabled in pull command, please use --transdir, or specify value in zanata.xml")

if command_options.has_key('dstdir'):
if self.command_options.has_key('dstdir'):
log.warn("dstdir option is changed to transdir option for generic pull command")
output_folder = command_options['dstdir'][0]['value']
output_folder = self.command_options['dstdir'][0]['value']

if command_options.has_key('noskeletons'):
if self.command_options.has_key('noskeletons'):
skeletons = False

outpath = self.create_outpath(command_options, output_folder)
outpath = self.create_outpath(self.command_options, output_folder)

zanatacmd.pull_command(locale_map, project_id, version_id, filelist, lang_list, outpath, command_type, skeletons)
self.zanatacmd.pull_command(locale_map, self.project_id, self.version_id, filelist, lang_list, outpath, command_type, skeletons)
Loading