Преглед на файлове

app.py: use version_fetcher for remotes.json auto-fetch jobs

Shiv Tyagi преди 1 година
родител
ревизия
7247a2c328
променени са 1 файла, в които са добавени 5 реда и са изтрити 18 реда
  1. 5 18
      app.py

+ 5 - 18
app.py

@@ -77,23 +77,10 @@ ap_src_metadata_fetcher = metadata_manager.APSourceMetadataFetcher(
     ap_repo=repo
 )
 versions_fetcher = metadata_manager.VersionsFetcher(
-    remotes_json_path=os.path.join(basedir, 'configs', 'remotes.json')
+    remotes_json_path=os.path.join(basedir, 'configs', 'remotes.json'),
+    ap_repo=repo
 )
-
-def load_remotes():
-    versions_fetcher.reload_remotes_json()
-    added_remotes = 0
-    for remote_info in versions_fetcher.get_all_remotes_info():
-        try:
-            repo.remote_add(remote=remote_info.name, url=remote_info.url)
-        except ap_git.DuplicateRemoteError:
-            app.logger.info(
-                f"Remote '{remote_info.name}' already exists. "
-                f"Updating url to '{remote_info.url}'."
-            )
-            repo.remote_set_url(remote=remote_info.name, url=remote_info.url)
-        added_remotes += 1
-    app.logger.info(f"{added_remotes} remotes added to base repo")
+versions_fetcher.start()
 
 def remove_directory_recursive(dirname):
     '''remove a directory recursively'''
@@ -404,7 +391,7 @@ try:
 except IOError:
     app.logger.info("No queue lock")
 
-load_remotes()
+versions_fetcher.reload_remotes_json()
 
 app.logger.info('Python version is: %s' % sys.version)
 
@@ -431,7 +418,7 @@ def refresh_remotes():
     if not token or token != auth_token:
         return "Unauthorized", 401
 
-    load_remotes()
+    versions_fetcher.reload_remotes_json()
     return "Successfully refreshed remotes", 200
 
 @app.route('/generate', methods=['GET', 'POST'])