Skip to content

Commit 82fa1cc

Browse files
committed
simplify API of reset
Implement simplification per requested at #945 (comment)
1 parent 6a0ee87 commit 82fa1cc

File tree

2 files changed

+26
-32
lines changed

2 files changed

+26
-32
lines changed

rootfs/standard/var/pynode/application_info.py

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -760,35 +760,30 @@ def backup_data_folder(app_data):
760760
def restore_data_folder(app_data):
761761
log_message(" Running restore_data_folder...")
762762

763-
def reset_data_folder(app_data):
764-
log_message(" Running reset_data_folder...")
765-
766-
# If app_data is a string (short name), convert it to a full configuration
767-
# and preserve the original short name.
768-
if isinstance(app_data, str):
769-
original_short_name = app_data # Save the short name for service commands.
770-
app_data = get_application(app_data)
771-
else:
772-
original_short_name = app_data["short_name"]
773-
763+
def reset_data_folder(short_name):
764+
log_message(f" Running reset_data_folder for '{short_name}'...")
765+
766+
app_data = get_application(short_name)
767+
if not app_data:
768+
log_message(f" ERROR: application '{short_name}' not found")
769+
return False
774770
data_folder = app_data["storage_folder"]
775771

776772
# Stop the service before removing data_folder
777-
log_message("Stopping '{}'.".format(original_short_name))
778-
stop_service(original_short_name)
773+
log_message(f" Stopping '{short_name}'…")
774+
stop_service(short_name)
779775

780776
# Remove App data_folder
781-
log_message("Removing storage folder '{}' of '{}'...".format(data_folder, original_short_name))
782-
data_folder = app_data["storage_folder"]
783-
run_linux_cmd("rm -rf {}".format(data_folder))
777+
log_message(f" Removing storage folder '{data_folder}'…")
778+
run_linux_cmd(f"rm -rf {data_folder}")
784779

785780
# Re-create the storage folder
786-
log_message("Creating storage folder '{}' of '{}'...".format(data_folder, original_short_name))
781+
log_message(f" Creating storage folder '{data_folder}'…")
787782
create_application_storage_folder(app_data)
788783

789784
# Re-start the service
790-
log_message("Starting '{}'.".format(original_short_name))
791-
start_service(original_short_name)
785+
log_message(f" Starting '{short_name}'…")
786+
start_service(short_name)
792787

793788
return True
794789

rootfs/standard/var/www/mynode/api.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -149,43 +149,42 @@ def api_restart_app():
149149

150150
return "OK"
151151

152-
# @mynode_api.route("/api/restart_app")
153152
@mynode_api.route("/api/backup_data_folder")
154153
def api_backup_data_folder():
155154
check_logged_in()
156155

157-
app = request.args.get("app")
158-
if not app:
156+
short_name = request.args.get("short_name")
157+
if not short_name:
159158
return "NO_APP_SPECIFIED"
160-
if not is_application_valid(app):
159+
if not is_application_valid(short_name):
161160
return "INVALID_APP_NAME"
162-
if not backup_data_folder(app):
161+
if not backup_data_folder(short_name):
163162
return "ERROR"
164163
return "OK"
165164

166165
@mynode_api.route("/api/restore_data_folder")
167166
def api_restore_data_folder():
168167
check_logged_in()
169168

170-
app = request.args.get("app")
171-
if not app:
169+
short_name = request.args.get("short_name")
170+
if not short_name:
172171
return "NO_APP_SPECIFIED"
173-
if not is_application_valid(app):
172+
if not is_application_valid(short_name):
174173
return "INVALID_APP_NAME"
175-
if not restore_data_folder(app):
174+
if not restore_data_folder(short_name):
176175
return "ERROR"
177176
return "OK"
178177

179178
@mynode_api.route("/api/reset_data_folder")
180179
def api_reset_data_folder():
181180
check_logged_in()
182181

183-
app = request.args.get("app")
184-
if not app:
182+
short_name = request.args.get("short_name")
183+
if not short_name:
185184
return "NO_APP_SPECIFIED"
186-
if not is_application_valid(app):
185+
if not is_application_valid(short_name):
187186
return "INVALID_APP_NAME"
188-
if not reset_data_folder(app):
187+
if not reset_data_folder(short_name):
189188
return "ERROR"
190189
return "OK"
191190

0 commit comments

Comments
 (0)