refactor

.gitignore

@@ -3,4 +3,6 @@ __pycache__
 
 index-v2.json
 sourceCodes.txt
-success_repos.txt
+success_repos.txt
+
+.pdm-python

README.md

@@ -1,23 +1,2 @@
-# F-Droid_src
+# fdroid-push-swh
 
-## Install
-
-```shell
-pip install -r requirements.txt
-```
-
-## Usage
-
-```shell
-python3 main.py --help
-```
-
-```shell
-usage: main.py [-h] [--refresh] [--swh-token SWH_TOKEN] [--list-only]
-
-options:
-  -h, --help            show this help message and exit
-  --refresh             Redownload index-v2.json
-  --swh-token SWH_TOKEN
-  --list-only           Only list repos to sourceCodes.txt, do not submit to SWH
-```

pyproject.toml

@@ -0,0 +1,25 @@
+[project]
+name = "fdroid_push_swh"
+version = "0.1.0"
+description = "aaaa"
+authors = [
+    {name = "yzqzss", email = "[email protected]"},
+]
+dependencies = [
+    "requests",
+    "tqdm",
+    "httpx",
+]
+requires-python = ">=3.12"
+readme = "README.md"
+license = {text = "AGPL"}
+
+[build-system]
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"
+
+[project.scripts]
+fdroid-push-swh = "fdroid_push_swh:main"
+
+[tool.pdm]
+distribution = true

src/fdroid_push_swh/__init__.py

@@ -0,0 +1,8 @@
+import logging
+from fdroid_push_swh.main import main as lib_main
+
+import asyncio
+
+def main():
+    logging.basicConfig(level=logging.INFO)
+    asyncio.run(lib_main())

main.py → src/fdroid_push_swh/main.py

@@ -6,7 +6,7 @@
 import tqdm
 import argparse
 
-from swh import git_swh
+from fdroid_push_swh.swh import git_swh
 
 json_url = 'https://f-droid.org/repo/index-v2.json'
 json_cache = Path('index-v2.json')
@@ -28,12 +28,12 @@ async def main():
     else:
         r = requests.get(json_url, stream=True)
         r.raise_for_status()
-        data = b''
+        _data = b''
         for chunk in tqdm.tqdm(r.iter_content(chunk_size=1024 * 1024), unit='chunk', unit_scale=True):
-            data += chunk
+            _data += chunk
         with json_cache.open('wb') as f:
-            f.write(data)
-        data: dict = json.loads(data)
+            f.write(_data)
+        data: dict = json.loads(_data)
     print(len(data)//1024//1024, 'MiB')
     packages = data.get('packages', {})
 

swh.py → src/fdroid_push_swh/swh.py

@@ -78,6 +78,8 @@ async def post_git_url(client: httpx.AsyncClient, url: str, swh_token: str):
     save_request_status = r_json['save_request_status']
     request_url = r_json['request_url']
     return
+
+    # Why I commented out the following code? IDK what I thought 1 year ago (2023), lol.
     while True:
         await asyncio.sleep(10)
         r = await client.get(request_url, headers=headers, follow_redirects=True)