Move code to proper place #660

Signed-off-by: Jono Yang <[email protected]>

Author: JonoYang

minecode_pipelines/miners/__init__.py

@@ -6,52 +6,3 @@
 # See https://github.com/aboutcode-org/purldb for support or download.
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
-
-import os
-import saneyaml
-
-from pathlib import Path
-
-from aboutcode import hashid
-from packageurl import PackageURL
-from scanpipe.pipes import federatedcode
-
-
-def write_packageurls_to_file(repo, base_dir, packageurls):
-    purl_file_rel_path = os.path.join(base_dir, hashid.PURLS_FILENAME)
-    purl_file_full_path = Path(repo.working_dir) / purl_file_rel_path
-    write_data_to_file(path=purl_file_full_path, data=packageurls)
-    return purl_file_rel_path
-
-
-def write_data_to_file(path, data):
-    path.parent.mkdir(parents=True, exist_ok=True)
-    with open(path, encoding="utf-8", mode="w") as f:
-        f.write(saneyaml.dump(data))
-
-
-def write_purls_to_repo(repo, package, packages, push_commit=False):
-    # save purls to yaml
-    path_elements = hashid.package_path_elements(package)
-    _, core_path, _, _ = path_elements
-    ppath = core_path / hashid.PURLS_FILENAME
-    purls = [p.purl for p in packages]
-    federatedcode.write_data_as_yaml(
-        base_path=repo.working_dir,
-        file_path=ppath,
-        data=purls,
-    )
-
-    change_type = "Add" if ppath in repo.untracked_files else "Update"
-    commit_message = f"""\
-    {change_type} list of available {package} versions
-    """
-    federatedcode.commit_changes(
-        repo=repo,
-        files_to_commit=[ppath],
-        commit_message=commit_message,
-    )
-
-    # see if we should push
-    if push_commit:
-        federatedcode.push_changes(repo=repo)

minecode_pipelines/pipes/__init__.py

@@ -10,32 +10,16 @@
 import json
 import os
 import requests
-import saneyaml
-
 from datetime import datetime
-from pathlib import Path
 
-from aboutcode.hashid import PURLS_FILENAME
-from scanpipe.pipes.federatedcode import clone_repository
-from scanpipe.pipes.federatedcode import commit_and_push_changes
+import saneyaml
+from aboutcode import hashid
+from scanpipe.pipes import federatedcode
 
 
 MINECODE_SETTINGS_REPO = "https://github.com/AyanSinhaMahapatra/minecode-test/"
 
 
-def write_packageurls_to_file(repo, base_dir, packageurls):
-    purl_file_rel_path = os.path.join(base_dir, PURLS_FILENAME)
-    purl_file_full_path = Path(repo.working_dir) / purl_file_rel_path
-    write_data_to_file(path=purl_file_full_path, data=packageurls)
-    return purl_file_rel_path
-
-
-def write_data_to_file(path, data):
-    path.parent.mkdir(parents=True, exist_ok=True)
-    with open(path, encoding="utf-8", mode="w") as f:
-        f.write(saneyaml.dump(data))
-
-
 def fetch_last_serial_mined(
     settings_repo=MINECODE_SETTINGS_REPO,
     settings_path=None,
@@ -59,6 +43,12 @@ def fetch_last_serial_mined(
     return settings_data.get("last_serial")
 
 
+def write_data_to_file(path, data):
+    path.parent.mkdir(parents=True, exist_ok=True)
+    with open(path, encoding="utf-8", mode="w") as f:
+        f.write(saneyaml.dump(data))
+
+
 def update_last_serial_mined(
     last_serial,
     settings_repo=MINECODE_SETTINGS_REPO,
@@ -68,7 +58,41 @@ def update_last_serial_mined(
         "date": str(datetime.now()),
         "last_serial": last_serial,
     }
-    cloned_repo = clone_repository(repo_url=settings_repo)
+    cloned_repo = federatedcode.clone_repository(repo_url=settings_repo)
     settings_path = os.path.join(cloned_repo.working_dir, settings_path)
     write_data_to_file(path=settings_path, data=settings_data)
-    commit_and_push_changes(repo=cloned_repo, file_to_commit=settings_path)
+    federatedcode.commit_and_push_changes(repo=cloned_repo, file_to_commit=settings_path)
+
+
+def create_package_path(package):
+    path_elements = hashid.package_path_elements(package)
+    _, core_path, _, _ = path_elements
+    ppath = core_path / hashid.PURLS_FILENAME
+    return ppath
+
+
+def write_purls_to_repo(repo, package, packages, commit_message="",push_commit=False):
+    # save purls to yaml
+    path_elements = hashid.package_path_elements(package)
+    _, core_path, _, _ = path_elements
+    ppath = core_path / hashid.PURLS_FILENAME
+    purls = [p.purl for p in packages]
+    federatedcode.write_data_as_yaml(
+        base_path=repo.working_dir,
+        file_path=ppath,
+        data=purls,
+    )
+
+    change_type = "Add" if ppath in repo.untracked_files else "Update"
+    commit_message = f"""\
+    {change_type} list of available {package} versions
+    """
+    federatedcode.commit_changes(
+        repo=repo,
+        files_to_commit=[ppath],
+        commit_message=commit_message,
+    )
+
+    # see if we should push
+    if push_commit:
+        federatedcode.push_changes(repo=repo)