pywaybackup 4.2.0__tar.gz → 4.2.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {pywaybackup-4.2.0/pywaybackup.egg-info → pywaybackup-4.2.1}/PKG-INFO +1 -1
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pyproject.toml +1 -1
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/archive_download.py +3 -2
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/helper.py +7 -1
- {pywaybackup-4.2.0 → pywaybackup-4.2.1/pywaybackup.egg-info}/PKG-INFO +1 -1
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/LICENSE +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/README.md +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/Exception.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/PyWayBackup.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/Snapshot.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/SnapshotCollection.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/Verbosity.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/Worker.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/__init__.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/archive_save.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/arg_parser.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/arg_specs.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/db.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/files.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/interactive.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup/main.py +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup.egg-info/SOURCES.txt +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup.egg-info/dependency_links.txt +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup.egg-info/entry_points.txt +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup.egg-info/requires.txt +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/pywaybackup.egg-info/top_level.txt +0 -0
- {pywaybackup-4.2.0 → pywaybackup-4.2.1}/setup.cfg +0 -0
|
@@ -16,7 +16,7 @@ dependencies = [
|
|
|
16
16
|
"python-magic-standalone==0.4.28",
|
|
17
17
|
]
|
|
18
18
|
name = "pywaybackup"
|
|
19
|
-
version = "4.2.
|
|
19
|
+
version = "4.2.1"
|
|
20
20
|
description = "Query and download archive.org as simple as possible."
|
|
21
21
|
authors = [{ name = "bitdruid", email = "bitdruid@outlook.com" }]
|
|
22
22
|
license = { file = "LICENSE" }
|
|
@@ -338,9 +338,10 @@ class DownloadArchive:
|
|
|
338
338
|
self.__download_response(context=context, worker=worker)
|
|
339
339
|
location = context.response.getheader("Location")
|
|
340
340
|
if location:
|
|
341
|
-
|
|
341
|
+
resolved_location = urljoin(context.snapshot_url, location)
|
|
342
|
+
context.encoded_download_url = context.encode_url(resolved_location)
|
|
342
343
|
worker.message.store(verbose=True, result="", info="TO", content=location)
|
|
343
|
-
worker.snapshot.redirect_timestamp = url_get_timestamp(
|
|
344
|
+
worker.snapshot.redirect_timestamp = url_get_timestamp(resolved_location)
|
|
344
345
|
worker.snapshot.redirect_url = context.snapshot_url
|
|
345
346
|
else:
|
|
346
347
|
break
|
|
@@ -34,8 +34,14 @@ def sanitize_url(url: str) -> str:
|
|
|
34
34
|
def url_get_timestamp(url):
|
|
35
35
|
"""
|
|
36
36
|
Extract the timestamp from a wayback machine URL.
|
|
37
|
+
|
|
38
|
+
Returns an empty string if the URL does not contain a `web/<timestamp>` segment
|
|
39
|
+
(e.g. relative or external redirect targets).
|
|
37
40
|
"""
|
|
38
|
-
|
|
41
|
+
parts = url.split("web/")
|
|
42
|
+
if len(parts) < 2:
|
|
43
|
+
return ""
|
|
44
|
+
timestamp = parts[1].split("/")[0]
|
|
39
45
|
if "id_" in url:
|
|
40
46
|
timestamp = timestamp.split("id_")[0]
|
|
41
47
|
return timestamp
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|