importers/git-importer
3
0
Fork 2
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Export the built tree as git repo #9

Merged
Ghost merged 24 commits from add_export into main 2022-11-02 14:17:24 +01:00
Conversation 10 Commits 24 Files Changed 34 +16 -7
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a1ead29734 - Show all commits

23
lib/db_revision.py
View File

@ -1,5 +1,8 @@
from __future__ import annotations
import logging
from hashlib import md5
from typing import Optional
from lib.db import DB
from lib.request import Request
@ -204,18 +207,24 @@ class DBRevision:
self._files.sort(key=lambda x: x["name"])
Ghost marked this conversation as resolved Outdated
aplanas commented 2022-11-02 11:57:28 +01:00
Outdated
Review
Copy Link

Reading the code seems that current_rev is not optional.

Reading the code seems that `current_rev` is not optional.
Ghost commented 2022-11-02 12:36:25 +01:00
Outdated
Review
Copy Link

There is a if current_rev - and it's treated as empty dict if there is nothing before.

There is a `if current_rev` - and it's treated as empty dict if there is nothing before.
aplanas commented 2022-11-02 13:05:07 +01:00
Outdated
Review
Copy Link

but not in the call?

but not in the call?
Ghost commented 2022-11-02 13:09:31 +01:00
Outdated
Review
Copy Link

well, the =None is not needed as there is always a variable passed. I guess nowadays I can make it current_rev: Optional[DbRevision]. Would that be more of your liking?

well, the `=None` is not needed as there is always a variable passed. I guess nowadays I can make it `current_rev: Optional[DbRevision]`. Would that be more of your liking?
aplanas commented 2022-11-02 13:14:26 +01:00
Outdated
Review
Copy Link

What I am wondering is the semantic of the function. calc_delta seems to be from some status to self. When the other status is not None the old_files is empty making all to download, when I would expect that none would be listed to download.

That makes me wonder if current_rev can be optional.

What I am wondering is the semantic of the function. `calc_delta` seems to be from some status to `self`. When the other status is not `None` the `old_files` is empty making all to download, when I would expect that none would be listed to download. That makes me wonder if `current_rev` can be optional.
Ghost commented 2022-11-02 13:19:03 +01:00
Outdated
Review
Copy Link

I even added documentation! :)

self is the revision to download and current_rev is the state of the repository. If it's None, there is no state and everything needs to be downloaded.

I even added documentation! :) `self` is the revision to download and `current_rev` is the state of the repository. If it's `None`, there is no state and everything needs to be downloaded.
return self._files
def calc_delta(self, db: DB, current_rev=None):
"""Calculate the list of files to download and to delete"""
old_files = dict()
def calc_delta(self, db: DB, current_rev: Optional[DBRevision]):
"""Calculate the list of files to download and to delete.
Param current_rev is the revision that's currently checked out.
Ghost marked this conversation as resolved Outdated
aplanas commented 2022-11-02 11:57:42 +01:00
Outdated
Review
Copy Link

(no optional)

(no optional)
If it's None, the repository is empty.
"""
Ghost marked this conversation as resolved Outdated
aplanas commented 2022-11-02 11:45:24 +01:00
Outdated
Review
Copy Link

The last two lines: old_files = {e["name"]: f"{e['md5']}-{e['size']}" for e in current_rev.files_list(db)}

The last two lines: `old_files = {e["name"]: f"{e['md5']}-{e['size']}" for e in current_rev.files_list(db)}`
Ghost commented 2022-11-02 12:37:09 +01:00
Outdated
Review
Copy Link

But current_rev is optional - no matter what you make out of it :)

But current_rev is optional - no matter what you make out of it :)
aplanas commented 2022-11-02 13:05:45 +01:00
Outdated
Review
Copy Link

still the for two lines can be replaced

still the `for` two lines can be replaced
Ghost commented 2022-11-02 13:08:32 +01:00
Outdated
Review
Copy Link

ah

ah
to_download = []
to_delete = []
Ghost marked this conversation as resolved
aplanas commented 2022-11-02 11:59:03 +01:00
Review
Copy Link

old_files.get(entry["name"]) != ..., will return None if missing.

`old_files.get(entry["name"]) != ...`, will return `None` if missing.
Ghost commented 2022-11-02 12:37:59 +01:00
Review
Copy Link

true, but an old database afine developer doesn't like comparing None with strings :)

true, but an old database afine developer doesn't like comparing None with strings :)
if current_rev:
for entry in current_rev.files_list(db):
old_files[entry["name"]] = f"{entry['md5']}-{entry['size']}"
old_files = {
Ghost marked this conversation as resolved Outdated
aplanas commented 2022-11-02 12:02:10 +01:00
Outdated
Review
Copy Link
to_download = [e["name"] for e in self.files_list(db) if old_files.get(e["name"]) != f"{e['md5']}-{e['size']}"]
logging.debug(f"Downloading {to_download}")
```python to_download = [e["name"] for e in self.files_list(db) if old_files.get(e["name"]) != f"{e['md5']}-{e['size']}"] logging.debug(f"Downloading {to_download}") ```
Ghost commented 2022-11-02 12:38:38 +01:00
Outdated
Review
Copy Link

That's outputting an array, which I don't want.

That's outputting an array, which I don't want.
aplanas commented 2022-11-02 13:07:11 +01:00
Outdated
Review
Copy Link

right, the last line can be replaced with a for, but this change is for the for and if lines

right, the last line can be replaced with a `for`, but this change is for the `for` and `if` lines
Ghost commented 2022-11-02 13:12:32 +01:00
Outdated
Review
Copy Link

What would be the benefit? I don't see it as more readable

What would be the benefit? I don't see it as more readable
e["name"]: f"{entry['md5']}-{entry['size']}"
for e in current_rev.files_list(db)
}
else:
aplanas commented 2022-11-02 13:07:31 +01:00
Outdated
Review
Copy Link

same

same
old_files = dict()
for entry in self.files_list(db):
if old_files.get(entry["name"], "") != f"{entry['md5']}-{entry['size']}":
if old_files.get(entry["name"]) != f"{entry['md5']}-{entry['size']}":
logging.debug(f"Download {entry['name']}")
to_download.append(entry["name"])
to_download.append((entry["name"], entry["md5"]))
old_files.pop(entry["name"], None)
for entry in old_files.keys():
logging.debug(f"Delete {entry}")