Add info details to updatinfo

jsilhan · May 20, 2016 · ba755ef · ba755ef
1 parent 1a43f9c
commit ba755ef
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 5 deletions.
diff --git a/client/api.c b/client/api.c
@@ -879,15 +879,19 @@ TDNFUpdateInfo(
     int nCount = 0;
     int iPkg = 0;
     int iAdv = 0;
+    time_t dwUpdated = 0;
 
     PTDNF_UPDATEINFO pUpdateInfos = NULL;
     PTDNF_UPDATEINFO pInfo = NULL;
     const char* pszTemp = NULL;
+    const int DATELEN = 200;
+    char szDate[DATELEN];
 
     HyPackage hPkg = NULL;
     HyPackageList hPkgList = NULL;
     HyAdvisoryList hAdvList = NULL;
     HyAdvisory hAdv = NULL;
+    struct tm* pLocalTime = NULL;
 
     if(!pTdnf || !ppszPackageNameSpecs || !ppUpdateInfo)
     {
@@ -930,6 +934,33 @@ TDNFUpdateInfo(
                 dwError = TDNFAllocateString(pszTemp, &pInfo->pszID);
                 BAIL_ON_TDNF_ERROR(dwError);
             }
+            pszTemp = hy_advisory_get_description(hAdv);
+            if(pszTemp)
+            {
+                dwError = TDNFAllocateString(pszTemp, &pInfo->pszDescription);
+                BAIL_ON_TDNF_ERROR(dwError);
+            }
+
+            dwUpdated = hy_advisory_get_updated(hAdv);
+            if(dwUpdated > 0)
+            {
+                pLocalTime = localtime(&dwUpdated);
+                if(!pLocalTime)
+                {
+                    dwError = errno;
+                    BAIL_ON_TDNF_SYSTEM_ERROR(dwError);
+                }
+                memset(szDate, 0, DATELEN);
+                dwError = strftime(szDate, DATELEN, "%c", pLocalTime);
+                if(dwError == 0)
+                {
+                    dwError = ERROR_TDNF_INVALID_PARAMETER;
+                    BAIL_ON_TDNF_SYSTEM_ERROR(dwError);
+                }
+                dwError = TDNFAllocateString(szDate, &pInfo->pszDate);
+                BAIL_ON_TDNF_ERROR(dwError);
+            }
+
 
             dwError = TDNFGetUpdateInfoPackages(hAdv, &pInfo->pPackages);
             BAIL_ON_TDNF_ERROR(dwError);

diff --git a/client/includes.h b/client/includes.h
@@ -27,6 +27,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <time.h>
 //
 #include <sys/utsname.h>
 //glib

diff --git a/client/packageutils.c b/client/packageutils.c
@@ -243,17 +243,17 @@ TDNFGetInstalled(
 
     *phPkgList = hPkgList;
 cleanup:
+    if(hQuery)
+    {
+        hy_query_free(hQuery);
+    }
     return dwError;
 
 error:
     if(phPkgList)
     {
         *phPkgList = NULL;
     }
-    if(hQuery)
-    {
-        hy_query_free(hQuery);
-    }
     goto cleanup;
 }
 

diff --git a/tools/cli/prototypes.h b/tools/cli/prototypes.h
@@ -135,6 +135,12 @@ TDNFCliUpdateInfoCommand(
     PTDNF pTdnf,
     PTDNF_CMD_ARGS pCmdArgs
     );
+
+uint32_t
+TDNFCliUpdateInfoInfo(
+    PTDNF_UPDATEINFO pInfo
+    );
+
 //help.c
 void
 TDNFCliShowUsage(

diff --git a/tools/cli/updateinfocmd.c b/tools/cli/updateinfocmd.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 
 
-
 char*
 TDNFGetUpdateInfoType(
     int nType
@@ -79,6 +78,11 @@ TDNFCliUpdateInfoCommand(
             dwError = TDNFCliUpdateInfoList(pUpdateInfo);
             BAIL_ON_CLI_ERROR(dwError);
         }
+        else if(pInfoArgs->nMode == OUTPUT_INFO)
+        {
+            dwError = TDNFCliUpdateInfoInfo(pUpdateInfo);
+            BAIL_ON_CLI_ERROR(dwError);
+        }
     }
 cleanup:
     if(pInfoArgs)
@@ -174,3 +178,45 @@ TDNFCliUpdateInfoList(
 error:
     goto cleanup;
 }
+
+uint32_t
+TDNFCliUpdateInfoInfo(
+    PTDNF_UPDATEINFO pInfo
+    )
+{
+    uint32_t dwError = 0;
+    PTDNF_UPDATEINFO_PKG pPkg = NULL;
+
+    if(!pInfo)
+    {
+        dwError = ERROR_TDNF_INVALID_PARAMETER;
+        BAIL_ON_CLI_ERROR(dwError);
+    }
+
+    while(pInfo)
+    {
+        pPkg = pInfo->pPackages;
+        while(pPkg)
+        {
+            fprintf(stdout, "       Name : %s\n",
+                pPkg->pszFileName);
+            fprintf(stdout, "  Update ID : %s\n",
+                pInfo->pszID);
+            fprintf(stdout, "       Type : %s\n",
+                TDNFGetUpdateInfoType(pInfo->nType));
+            fprintf(stdout, "    Updated : %s\n",
+                pInfo->pszDate);
+            fprintf(stdout, "Description : %s\n",
+                pInfo->pszDescription);
+
+            pPkg = pPkg->pNext;
+        }
+        pInfo = pInfo->pNext;
+    }
+
+cleanup:
+    return dwError;
+
+error:
+    goto cleanup;
+}