pyreposync 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl

pyreposync/__init__.py

@@ -10,7 +10,7 @@ import time
 from pyreposync.downloader import Downloader
 from pyreposync.exceptions import OSRepoSyncException, OSRepoSyncHashError
 from pyreposync.sync_rpm import SyncRPM
-from pyreposync.sync_deb import SyncDeb
+from pyreposync.sync_deb822 import SyncDeb822
 
 
 def main():
@@ -269,20 +269,32 @@ class PyRepoSync:
                     section, "allow_missing_packages", fallback=False
                 ),
                 treeinfo=self.config.get(section, "treeinfo", fallback=".treeinfo"),
+                basic_auth_user=self.config.get(
+                    section, "basic_auth_user", fallback=None
+                ),
+                basic_auth_pass=self.config.get(
+                    section, "basic_auth_pass", fallback=None
+                ),
                 proxy=self.config.get("main", "proxy", fallback=None),
                 client_cert=self.config.get(section, "sslclientcert", fallback=None),
                 client_key=self.config.get(section, "sslclientkey", fallback=None),
                 ca_cert=self.config.get(section, "sslcacert", fallback=None),
             )
-        elif section.endswith(":deb"):
-            return SyncDeb(
+        elif section.endswith(":deb822"):
+            return SyncDeb822(
                 base_url=self.config.get(section, "baseurl"),
                 destination=self.config.get("main", "destination"),
-                reponame=section[:-4],
+                reponame=section[:-7],
                 date=date,
                 allow_missing_packages=self.config.getboolean(
                     section, "allow_missing_packages", fallback=False
                 ),
+                basic_auth_user=self.config.get(
+                    section, "basic_auth_user", fallback=None
+                ),
+                basic_auth_pass=self.config.get(
+                    section, "basic_auth_pass", fallback=None
+                ),
                 proxy=self.config.get(section, "proxy", fallback=None),
                 client_cert=self.config.get(section, "sslclientcert", fallback=None),
                 client_key=self.config.get(section, "sslclientkey", fallback=None),
@@ -291,11 +303,12 @@ class PyRepoSync:
                 components=self.config.get(section, "components").split(),
                 binary_archs=self.config.get(section, "binary_archs").split(),
             )
+        return None
 
     def get_sections(self):
         sections = set()
         for section in self.config:
-            if section.endswith(":rpm") or section.endswith(":deb"):
+            if section.endswith(":rpm") or section.endswith(":deb822"):
                 if self.repo and section != self.repo:
                     continue
                 if self._tags:

pyreposync/downloader.py

@@ -2,6 +2,7 @@ import hashlib
 import logging
 import os
 import requests
+import requests.auth
 import requests.exceptions
 import shutil
 import tempfile
@@ -11,8 +12,20 @@ from pyreposync.exceptions import OSRepoSyncDownLoadError, OSRepoSyncHashError
 
 
 class Downloader(object):
-    def __init__(self, proxy=None, client_cert=None, client_key=None, ca_cert=None):
+    def __init__(
+        self,
+        basic_auth_user=None,
+        basic_auth_pass=None,
+        proxy=None,
+        client_cert=None,
+        client_key=None,
+        ca_cert=None,
+    ):
         self.log = logging.getLogger("application")
+        if basic_auth_user and basic_auth_pass:
+            self._basic_auth = (basic_auth_user, basic_auth_pass)
+        else:
+            self._basic_auth = None
         if proxy:
             self._proxy = {"http": proxy, "https": proxy}
         else:
@@ -26,6 +39,10 @@ class Downloader(object):
         else:
             self._ca_cert = True
 
+    @property
+    def basic_auth(self):
+        return self._basic_auth
+
     @property
     def ca_cert(self):
         return self._ca_cert
@@ -123,7 +140,12 @@ class Downloader(object):
     ):
         self.create_dir(destination)
         r = requests.get(
-            url, stream=True, proxies=self.proxy, cert=self.cert, verify=self.ca_cert
+            url,
+            auth=self.basic_auth,
+            stream=True,
+            proxies=self.proxy,
+            cert=self.cert,
+            verify=self.ca_cert,
         )
         if r.status_code == 200:
             with open(destination, "wb", 0) as dst:

pyreposync/{sync_deb.py → sync_deb822.py}

@@ -6,7 +6,7 @@ import os
 from pyreposync.sync_generic import SyncGeneric
 
 
-class SyncDeb(SyncGeneric):
+class SyncDeb822(SyncGeneric):
     def __init__(
         self,
         base_url,
@@ -17,6 +17,8 @@ class SyncDeb(SyncGeneric):
         components,
         binary_archs,
         allow_missing_packages,
+        basic_auth_user=None,
+        basic_auth_pass=None,
         proxy=None,
         client_cert=None,
         client_key=None,
@@ -28,6 +30,8 @@ class SyncDeb(SyncGeneric):
             reponame=reponame,
             date=date,
             allow_missing_packages=allow_missing_packages,
+            basic_auth_user=basic_auth_user,
+            basic_auth_pass=basic_auth_pass,
             proxy=proxy,
             client_cert=client_cert,
             client_key=client_key,

pyreposync/sync_generic.py

@@ -14,6 +14,8 @@ class SyncGeneric:
         reponame,
         date,
         allow_missing_packages,
+        basic_auth_user=None,
+        basic_auth_pass=None,
         proxy=None,
         client_cert=None,
         client_key=None,
@@ -25,7 +27,12 @@ class SyncGeneric:
         self._destination = destination
         self._reponame = reponame
         self.downloader = Downloader(
-            proxy=proxy, client_cert=client_cert, client_key=client_key, ca_cert=ca_cert
+            basic_auth_user=basic_auth_user,
+            basic_auth_pass=basic_auth_pass,
+            proxy=proxy,
+            client_cert=client_cert,
+            client_key=client_key,
+            ca_cert=ca_cert,
         )
         self.log = logging.getLogger("application")
 

pyreposync/sync_rpm.py

@@ -24,6 +24,8 @@ class SyncRPM(SyncGeneric):
         date,
         treeinfo,
         allow_missing_packages,
+        basic_auth_user=None,
+        basic_auth_pass=None,
         proxy=None,
         client_cert=None,
         client_key=None,
@@ -35,6 +37,8 @@ class SyncRPM(SyncGeneric):
             reponame=reponame,
             date=date,
             allow_missing_packages=allow_missing_packages,
+            basic_auth_user=basic_auth_user,
+            basic_auth_pass=basic_auth_pass,
             proxy=proxy,
             client_cert=client_cert,
             client_key=client_key,

{pyreposync-0.2.5.dist-info → pyreposync-0.2.7.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: pyreposync
-Version: 0.2.5
-Summary: Orbit Api
+Version: 0.2.7
+Summary: rpm and deb822 repository sync tool
 Project-URL: Source, https://github.com/schlitzered/pyreposync
 Author-email: "Stephan.Schultchen" <sschultchen@gmail.com>
 License: The MIT License (MIT)

pyreposync-0.2.7.dist-info/RECORD

@@ -0,0 +1,11 @@
+pyreposync/__init__.py,sha256=fHirsBBkEk806RJwVKQZHgujQZRk13YnokX-8rp_QJE,17117
+pyreposync/downloader.py,sha256=cRUtbQ4PYbGDczZl5PsBtTQFhqagnX9IQvbwSCd0OBc,5212
+pyreposync/exceptions.py,sha256=IlnvhNaffQQ6geOgrjCciNFVbFpNcycH4ijSuMTbrGA,169
+pyreposync/sync_deb822.py,sha256=Ynwok1fiZktO3P_0lYWfBOHgaJOFpzfVNkhgKL5Y56s,8517
+pyreposync/sync_generic.py,sha256=qe-ERp8O2kCnhOuToSZWhdQzGY7aYb7G7nUxuKD3lxY,5880
+pyreposync/sync_rpm.py,sha256=FXWEJd2YelMsZeTOnjcNjkN2D_ECtX9HEp73GpiLeK4,11763
+pyreposync-0.2.7.dist-info/METADATA,sha256=t_2vG9j5arm-bG1SyZ0DDqADLwQKEiqS66EZ-q1VnJE,1591
+pyreposync-0.2.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pyreposync-0.2.7.dist-info/entry_points.txt,sha256=9LsBDWOF3O6_3ONP3Lc-4v1MTt5ay0Xv-TMcFbOIt2s,47
+pyreposync-0.2.7.dist-info/licenses/LICENSE.txt,sha256=lwnJoIo7uwc0h6y6gC_RYqJkvjplViV3Ad6u7pQM4Bw,1084
+pyreposync-0.2.7.dist-info/RECORD,,

pyreposync-0.2.5.dist-info/RECORD

@@ -1,11 +0,0 @@
-pyreposync/__init__.py,sha256=Y5wux97cZGbZfLJa2aXku1ZwISLVqoeYsgDDVTmbVpU,16562
-pyreposync/downloader.py,sha256=828bIMCctd1X6I1w91-XHytQ1M5fmxkEw0YDKd5nvAY,4764
-pyreposync/exceptions.py,sha256=IlnvhNaffQQ6geOgrjCciNFVbFpNcycH4ijSuMTbrGA,169
-pyreposync/sync_deb.py,sha256=d9UggP-wW5CXXV4bjmd0gk7i0BM9xDeEJP8XEY_tYN0,8364
-pyreposync/sync_generic.py,sha256=wN5hPcIacvQiMQoajcf7WSbiBGqxI86CYwfVnq1fR38,5693
-pyreposync/sync_rpm.py,sha256=1yf2-lQShKyY3CI_FW1i0tyWQ0sg69iBUn-4iWfoevk,11613
-pyreposync-0.2.5.dist-info/METADATA,sha256=Vs779KRX_64pvfPldLU6yQvLvdk0w3xIPxMEUfUlKbQ,1565
-pyreposync-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pyreposync-0.2.5.dist-info/entry_points.txt,sha256=9LsBDWOF3O6_3ONP3Lc-4v1MTt5ay0Xv-TMcFbOIt2s,47
-pyreposync-0.2.5.dist-info/licenses/LICENSE.txt,sha256=lwnJoIo7uwc0h6y6gC_RYqJkvjplViV3Ad6u7pQM4Bw,1084
-pyreposync-0.2.5.dist-info/RECORD,,