Fix dependencies, user agent, upload URL

ftruzzi · Jun 20, 2023 · 61d1ad8 · 61d1ad8
1 parent 7d81b57
commit 61d1ad8
Show file tree

Hide file tree

Showing 6 changed files with 764 additions and 472 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -25,8 +25,7 @@ jobs:
 
     - name: Install poetry
       run: |
-        curl -sSL \
-          "https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py" | python
+        curl -sSL "https://install.python-poetry.org" | python
         # Adding `poetry` to `$PATH`:
         echo "$HOME/.poetry/bin" >> $GITHUB_PATH
     - name: Set up cache
@@ -37,7 +36,6 @@ jobs:
     - name: Install dependencies
       run: |
         poetry config virtualenvs.in-project true
-        poetry config experimental.new-installer false
         poetry install
     - name: Run tests
       run: |

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -16,15 +16,13 @@ jobs:
 
     - name: Install poetry
       run: |
-        curl -sSL \
-          "https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py" | python
+        curl -sSL "https://install.python-poetry.org" | python
         # Adding `poetry` to `$PATH`:
         echo "$HOME/.poetry/bin" >> $GITHUB_PATH
 
     - name: Install dependencies
       run: |
         poetry config virtualenvs.in-project true
-        poetry config experimental.new-installer false
         poetry install
 
     - name: Config PyPI token

diff --git a/libgen_uploader/helpers.py b/libgen_uploader/helpers.py
@@ -47,7 +47,6 @@ def check_upload_form_response(response: BeautifulSoup) -> bool:
 def check_metadata_form_response(
     response: BeautifulSoup,
 ) -> str:
-
     if error_el := response.select_one(".error") or response.select_one(".form_error"):
         error_text = error_el.text.strip()
         raise LibgenUploadException(f"File save failed: {error_text}")

diff --git a/libgen_uploader/libgen_uploader.py b/libgen_uploader/libgen_uploader.py
@@ -12,7 +12,7 @@
 # https://github.com/jmcarp/robobrowser/issues/93
 import werkzeug
 
-werkzeug.cached_property = werkzeug.utils.cached_property
+werkzeug.cached_property = werkzeug.utils.cached_property  # type: ignore
 
 from bs4 import BeautifulSoup
 from cerberus import schema
@@ -96,7 +96,6 @@ def __init__(
     def _init_browser(self):
         self._browser = RoboBrowser(
             parser="html.parser",
-            user_agent=f"libgen_uploader-v{LIBGEN_UPLOADER_VERSION} github.com/ftruzzi/libgen_uploader",
         )
         self._browser.session.auth = (UPLOAD_USERNAME, UPLOAD_PASSWORD)
 
@@ -138,13 +137,15 @@ def _validate_file(file: Union[str, bytes]) -> Union[str, bytes]:
     def _upload_file(self, file: Union[str, bytes], library: str) -> BeautifulSoup:
         if library == "scitech":
             self._init_browser()
-            self._browser.open(SCITECH_UPLOAD_URL)
+            upload_url = SCITECH_UPLOAD_URL
         elif library == "fiction":
             self._init_browser()
-            self._browser.open(FICTION_UPLOAD_URL)
+            upload_url = FICTION_UPLOAD_URL
         else:
             raise ValueError(f"Unknown library to upload to: {library}")
 
+        self._browser.open(upload_url)
+
         if isinstance(file, str):
             encoder = MultipartEncoder(
                 fields={"file": (basename(file), open(file, "rb"))}
@@ -169,7 +170,7 @@ def _upload_file(self, file: Union[str, bytes], library: str) -> BeautifulSoup:
             )
             session = self._browser.session
             response = session.post(
-                "https://library.bz/fiction/upload/",
+                upload_url,
                 data=monitor,
                 headers={"Content-Type": monitor.content_type},
             )