Support for read 'useragent' attr. (RhBug: 947346)

rpm-software-management · Apr 3, 2013 · 4955704 · 4955704
1 parent 056a115
commit 4955704
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 3 deletions.
diff --git a/librepo/handle.c b/librepo/handle.c
@@ -95,6 +95,7 @@ lr_handle_free(lr_Handle handle)
     lr_free(handle->mirrorlist);
     lr_free(handle->used_mirror);
     lr_free(handle->destdir);
+    lr_free(handle->useragent);
     lr_internalmirrorlist_free(handle->internal_mirrorlist);
     lr_metalink_free(handle->metalink);
     lr_handle_free_list(&handle->yumdlist);
@@ -239,9 +240,13 @@ lr_handle_setopt(lr_Handle handle, lr_HandleOption option, ...)
         handle->interruptible = va_arg(arg, long) ? 1 : 0;
         break;
 
-    case LRO_USERAGENT:
-        c_rc = curl_easy_setopt(c_h, CURLOPT_USERAGENT, va_arg(arg, char *));
+    case LRO_USERAGENT: {
+        char *useragent = va_arg(arg, char *);
+        if (handle->useragent) lr_free(handle->useragent);
+        handle->useragent = lr_strdup(useragent);
+        c_rc = curl_easy_setopt(c_h, CURLOPT_USERAGENT, useragent);
         break;
+    }
 
     case LRO_GPGCHECK:
         if (va_arg(arg, long))
@@ -603,6 +608,11 @@ lr_handle_getinfo(lr_Handle handle, lr_HandleOption option, ...)
         *lnum = (long) handle->repotype;
         break;
 
+    case LRI_USERAGENT:
+        str = va_arg(arg, char **);
+        *str = handle->useragent;
+        break;
+
     case LRI_YUMDLIST: {
         char ***strlist = va_arg(arg, char ***);
         *strlist = handle->yumdlist;
@@ -656,7 +666,6 @@ lr_handle_getinfo(lr_Handle handle, lr_HandleOption option, ...)
         break;
     }
 
-
     default:
         rc = LRE_UNKNOWNOPT;
         break;

diff --git a/librepo/handle.h b/librepo/handle.h
@@ -105,6 +105,7 @@ typedef enum {
     LRI_PROGRESSDATA,           /* (lr_ProgressCb) */
     LRI_DESTDIR,                /* (char **) */
     LRI_REPOTYPE,               /* (long *) */
+    LRI_USERAGENT,              /* (char **) */
     LRI_YUMDLIST,               /* (char ***) */
     LRI_YUMBLIST,               /* (char ***) */
     LRI_LASTCURLERR,            /* (long *) */

diff --git a/librepo/handle_internal.h b/librepo/handle_internal.h
@@ -45,6 +45,7 @@ struct _lr_Handle {
     char            *used_mirror;   /*!< Finally used mirror (if any) */
     int             retries;        /*!< Number of maximum retries */
     char            *destdir;       /*!< Destination directory */
+    char            *useragent;     /*!< User agent */
     lr_Repotype     repotype;       /*!< Type of repository */
     lr_Checks       checks;         /*!< Which check sould be applied */
     long            status_code;    /*!< Last HTTP or FTP status code */

diff --git a/librepo/python/__init__.py b/librepo/python/__init__.py
@@ -220,6 +220,7 @@
 .. data:: LRI_PROGRESSDATA
 .. data:: LRI_DESTDIR
 .. data:: LRI_REPOTYPE
+.. data:: LRI_USERAGENT
 .. data:: LRI_YUMDLIST
 .. data:: LRI_YUMBLIST
 .. data:: LRI_LASTCURLERR
@@ -512,6 +513,7 @@
 LRI_PROGRESSDATA        = _librepo.LRI_PROGRESSDATA
 LRI_DESTDIR             = _librepo.LRI_DESTDIR
 LRI_REPOTYPE            = _librepo.LRI_REPOTYPE
+LRI_USERAGENT           = _librepo.LRI_USERAGENT
 LRI_YUMDLIST            = _librepo.LRI_YUMDLIST
 LRI_YUMBLIST            = _librepo.LRI_YUMBLIST
 LRI_LASTCURLERR         = _librepo.LRI_LASTCURLERR
@@ -530,6 +532,7 @@
     "progressdata":         LRI_PROGRESSDATA,
     "destdir":              LRI_DESTDIR,
     "repotype":             LRI_REPOTYPE,
+    "useragent":            LRI_USERAGENT,
     "yumdlist":             LRI_YUMDLIST,
     "yumblist":             LRI_YUMBLIST,
     "lastcurlerr":          LRI_LASTCURLERR,

diff --git a/librepo/python/handle-py.c b/librepo/python/handle-py.c
@@ -382,6 +382,7 @@ getinfo(_HandleObject *self, PyObject *args)
     case LRI_URL:
     case LRI_MIRRORLIST:
     case LRI_DESTDIR:
+    case LRI_USERAGENT:
     case LRI_LASTCURLSTRERR:
     case LRI_LASTCURLMSTRERR:
         res = lr_handle_getinfo(self->handle, (lr_HandleInfoOption)option, &str);

diff --git a/librepo/python/librepomodule.c b/librepo/python/librepomodule.c
@@ -121,6 +121,7 @@ init_librepo(void)
     PyModule_AddIntConstant(m, "LRI_PROGRESSDATA", LRI_PROGRESSDATA);
     PyModule_AddIntConstant(m, "LRI_DESTDIR", LRI_DESTDIR);
     PyModule_AddIntConstant(m, "LRI_REPOTYPE", LRI_REPOTYPE);
+    PyModule_AddIntConstant(m, "LRI_USERAGENT", LRI_USERAGENT);
     PyModule_AddIntConstant(m, "LRI_YUMDLIST", LRI_YUMDLIST);
     PyModule_AddIntConstant(m, "LRI_YUMBLIST", LRI_YUMBLIST);
     PyModule_AddIntConstant(m, "LRI_LASTCURLERR", LRI_LASTCURLERR);

diff --git a/tests/python/tests/test_handle.py b/tests/python/tests/test_handle.py
@@ -63,6 +63,14 @@ def test_handle_setopt_getinfo(self):
         h.setopt(librepo.LRO_DESTDIR,  "")
         self.assertEqual(h.getinfo(librepo.LRI_DESTDIR), "")
 
+        self.assertEqual(h.getinfo(librepo.LRI_USERAGENT), None)
+        h.setopt(librepo.LRO_USERAGENT,  "librepo/0.0")
+        self.assertEqual(h.getinfo(librepo.LRI_USERAGENT), "librepo/0.0")
+        h.setopt(librepo.LRO_USERAGENT,  None)
+        self.assertEqual(h.getinfo(librepo.LRI_USERAGENT), None)
+        h.setopt(librepo.LRO_USERAGENT,  "")
+        self.assertEqual(h.getinfo(librepo.LRI_USERAGENT), "")
+
         self.assertEqual(h.getinfo(librepo.LRI_YUMDLIST), None)
         h.setopt(librepo.LRO_YUMDLIST,  ["primary", "other"])
         self.assertEqual(h.getinfo(librepo.LRI_YUMDLIST), ["primary", "other"])
@@ -137,6 +145,14 @@ def test_handle_setget_attr(self):
         h.destdir =  ""
         self.assertEqual(h.destdir, "")
 
+        self.assertEqual(h.useragent, None)
+        h.useragent =  "librepo/0.0"
+        self.assertEqual(h.useragent, "librepo/0.0")
+        h.useragent =  None
+        self.assertEqual(h.useragent, None)
+        h.useragent =  ""
+        self.assertEqual(h.useragent, "")
+
         self.assertEqual(h.yumdlist, None)
         h.yumdlist =  ["primary", "other"]
         self.assertEqual(h.yumdlist, ["primary", "other"])

diff --git a/tests/test_handle.c b/tests/test_handle.c
@@ -33,6 +33,7 @@ START_TEST(test_handle)
     lr_handle_setopt(h, LRO_PROXY, "proxy");
     lr_handle_setopt(h, LRO_PROXYUSERPWD, "proxyuser:pwd");
     lr_handle_setopt(h, LRO_DESTDIR, "foodir");
+    lr_handle_setopt(h, LRO_USERAGENT, "librepo/0.0");
     char *dlist[] = {"primary", "filelists", NULL};
     lr_handle_setopt(h, LRO_YUMDLIST, dlist);
     lr_handle_setopt(h, LRO_YUMBLIST, dlist);
@@ -75,6 +76,10 @@ START_TEST(test_handle_getinfo)
     lr_handle_getinfo(h, LRI_REPOTYPE, &num);
     fail_if(num != 0);
 
+    str = NULL;
+    lr_handle_getinfo(h, LRI_USERAGENT, &str);
+    fail_if(num != 0);
+
     strlist = NULL;
     lr_handle_getinfo(h, LRI_YUMDLIST, &strlist);
     fail_if(strlist != NULL);