8000 refactoring · egabancho/server-client-python@56424f5 · GitHub
[go: up one dir, main page]

8000 Skip to content

Commit 56424f5

Browse files
author
bzhang
committed
refactoring
1 parent e903161 commit 56424f5

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

samples/materialize_workbooks.py

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,20 @@ def main():
4444
return
4545

4646
if args.type == 'site':
47-
update_site(args, enable_materialized_views, password, site_content_url)
47+
if not update_site(args, enable_materialized_views, password, site_content_url):
48+
return
4849

4950
elif args.type == 'workbook':
50-
update_workbook(args, enable_materialized_views, password, site_content_url)
51+
if not update_workbook(args, enable_materialized_views, password, site_content_url):
52+
return
5153

5254
elif args.type == 'project_name':
53-
update_project_by_name(args, enable_materialized_views, password, site_content_url)
55+
if not update_project_by_name(args, enable_materialized_views, password, site_content_url):
56+
return
5457

5558
elif args.type == 'project_path':
56-
update_project_by_path(args, enable_materialized_views, password, site_content_url)
59+
if not update_project_by_path(args, enable_materialized_views, password, site_content_url):
60+
return
5761

5862
if args.status:
5963
show_materialized_views_status(args, password, site_content_url)
@@ -110,7 +114,7 @@ def show_materialized_views_status(args, password, site_content_url):
110114
def update_project_by_path(args, enable_materialized_views, password, site_content_url):
111115
if args.project_path is None:
112116
print("Use --project_path <project path> to specify the path of the project")
113-
return
117+
return False
114118
tableau_auth = TSC.TableauAuth(args.username, password, site_content_url)
115119
server = TSC.Server(args.server, use_server_version=True)
116120
project_name = args.project_path.split('/')[-1]
@@ -119,12 +123,13 @@ def update_project_by_path(args, enable_materialized_views, password, site_conte
119123

120124
possible_paths = get_project_paths(server, projects)
121125
update_project(possible_paths[args.project_path], server, enable_materialized_views)
126+
return True
122127

123128

124129
def update_project_by_name(args, enable_materialized_views, password, site_content_url):
125130
if args.project_name is None:
126131
print("Use --project-name <project name> to specify the name of the project")
127-
return
132+
return False
128133
tableau_auth = TSC.TableauAuth(args.username, password, site_content_url)
129134
server = TSC.Server(args.server, use_server_version=True)
130135
with server.auth.sign_in(tableau_auth):
@@ -137,9 +142,10 @@ def update_project_by_name(args, enable_materialized_views, password, site_conte
137142
print("Possible project paths:")
138143
print_paths(possible_paths)
139144
print('\n')
140-
return
145+
return False
141146
else:
142147
update_project(projects[0], server, enable_materialized_views)
148+
return True
143149

144150

145151
def update_project(project, server, enable_materialized_views):
@@ -165,14 +171,14 @@ def update_workbook(args, enable_materialized_views, password, site_content_url)
165171
if args.file_path is None:
166172
print("Use '--file-path <file path>' to specify the path of a list of workbooks")
167173
print('\n')
168-
return
169-
174+
return False
170175
tableau_auth = TSC.TableauAuth(args.username, password, site_id=site_content_url)
171176
server = TSC.Server(args.server, use_server_version=True)
172177
with server.auth.sign_in(tableau_auth):
173178
workbook_path_mapping = parse_workbook_path(args.file_path)
174179
all_projects = {project.id: project for project in TSC.Pager(server.projects)}
175180
update_workbooks_by_paths(all_projects, enable_materialized_views, server, workbook_path_mapping)
181+
return True
176182

177183

178184
def update_workbooks_by_paths(all_projects, enable_materialized_views, server, workbook_path_mapping):
@@ -201,6 +207,7 @@ def update_site(args, enable_materialized_views, password, site_content_url):
201207
server.sites.update(site_to_update)
202208
print("Updated materialized views settings for site: {}".format(site_to_update.name))
203209
print('\n')
210+
return True
204211

205212

206213
if __name__ == "__main__":

0 commit comments

Comments
 (0)
0