add quiet option. singleton load global resources

Change-Id: Id11c299f16fc3c6297f2678b1d62940d81f9528a
vmware · Nov 4, 2016 · 3977aad · 3977aad
1 parent c675a4d
commit 3977aad
Show file tree

Hide file tree

Showing 16 changed files with 270 additions and 54 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,10 +1,19 @@
 ACLOCAL_AMFLAGS = -I m4
 
+CLEANFILES =
+EXTRA_DIST =
 conf_DATA = tdnf.conf
 pkginclude_HEADERS = include/tdnfclient.h include/tdnferror.h include/tdnftypes.h
+pkgconfigdir = $(libdir)/pkgconfig
 
 SUBDIRS = \
     common \
     client \
     tests \
     tools
+
+pkgconfig_DATA = tdnf.pc
+tdnf.pc: $(top_srcdir)/tdnf.pc.in
+	./config.status --file=${subdir}/tdnf.pc:${subdir}/tdnf.pc.in
+CLEANFILES += tdnf.pc
+EXTRA_DIST += tdnf.pc.in
diff --git a/client/api.c b/client/api.c
@@ -20,6 +20,88 @@
 
 #include "includes.h"
 
+static TDNF_ENV gEnv = {0};
+
+uint32_t
+TDNFInit(
+    )
+{
+    uint32_t dwError = 0;
+    int nLocked = 0;
+
+    pthread_mutex_lock (&gEnv.mutexInitialize);
+    nLocked = 1;
+    if(!gEnv.nInitialized)
+    {
+        dwError = rpmReadConfigFiles(NULL, NULL);
+        BAIL_ON_TDNF_ERROR(dwError);
+
+        gEnv.nInitialized = 1;
+    }
+
+cleanup:
+    if(nLocked)
+    {
+        pthread_mutex_unlock(&gEnv.mutexInitialize);
+    }
+    return dwError;
+
+error:
+    goto cleanup;
+}
+
+uint32_t
+TDNFIsInitialized(
+    int *pnInitialized
+    )
+{
+    uint32_t dwError = 0;
+    int nInitialized = 0;
+    int nLocked = 0;
+
+    if(!pnInitialized)
+    {
+        dwError = ERROR_TDNF_INVALID_PARAMETER;
+        BAIL_ON_TDNF_ERROR(dwError);
+    }
+
+    pthread_mutex_lock (&gEnv.mutexInitialize);
+    nLocked = 1;
+
+    nInitialized = gEnv.nInitialized;
+
+    *pnInitialized = nInitialized;
+
+cleanup:
+    if(nLocked)
+    {
+        pthread_mutex_unlock(&gEnv.mutexInitialize);
+    }
+    return dwError;
+
+error:
+    if(pnInitialized)
+    {
+        *pnInitialized = 0;
+    }
+    goto cleanup;
+}
+
+void
+TDNFUninit(
+    )
+{
+    pthread_mutex_lock (&gEnv.mutexInitialize);
+
+    if(gEnv.nInitialized)
+    {
+        rpmFreeRpmrc();
+    }
+    gEnv.nInitialized = 0;
+
+    pthread_mutex_unlock(&gEnv.mutexInitialize);
+}
+
 //All alter commands such as install/update/erase
 uint32_t
 TDNFAlterCommand(

diff --git a/client/init.c b/client/init.c
@@ -118,6 +118,8 @@ TDNFCloneCmdArgs(
     pCmdArgs->nCacheOnly     = pCmdArgsIn->nCacheOnly;
     pCmdArgs->nDebugSolver   = pCmdArgsIn->nDebugSolver;
     pCmdArgs->nNoGPGCheck    = pCmdArgsIn->nNoGPGCheck;
+    pCmdArgs->nNoOutput      = pCmdArgsIn->nNoOutput;
+    pCmdArgs->nQuiet         = pCmdArgsIn->nQuiet;
     pCmdArgs->nRefresh       = pCmdArgsIn->nRefresh;
     pCmdArgs->nRpmVerbosity  = pCmdArgsIn->nRpmVerbosity;
     pCmdArgs->nShowDuplicates= pCmdArgsIn->nShowDuplicates;

diff --git a/client/prototypes.h b/client/prototypes.h
@@ -810,3 +810,7 @@ uint32_t
 TDNFValidateCmdArgs(
     PTDNF pTdnf
     );
+
+uint32_t
+TDNFIsInitialized(
+    );
diff --git a/client/remoterepo.c b/client/remoterepo.c
@@ -41,6 +41,42 @@ lrProgressCB(
     return 0;
 }
 
+uint32_t
+set_progress_cb(
+    LrHandle *pRepoHandle,
+    const char *pszPkgName
+    )
+{
+    uint32_t dwError = 0;
+    gboolean bRet = FALSE;
+
+    if(!pRepoHandle || IsNullOrEmptyString(pszPkgName))
+    {
+        dwError = ERROR_TDNF_INVALID_PARAMETER;
+        BAIL_ON_TDNF_ERROR(dwError);
+    }
+
+    bRet = lr_handle_setopt(pRepoHandle, NULL, LRO_PROGRESSCB, lrProgressCB);
+    if(bRet == FALSE)
+    {
+        //TODO: Add repo specific
+        dwError = ERROR_TDNF_INVALID_PARAMETER;
+        BAIL_ON_TDNF_ERROR(dwError);
+    }
+    bRet = lr_handle_setopt(pRepoHandle, NULL, LRO_PROGRESSDATA, pszPkgName);
+    if(bRet == FALSE)
+    {
+        //TODO: Add repo specific
+        dwError = ERROR_TDNF_INVALID_PARAMETER;
+        BAIL_ON_TDNF_ERROR(dwError);
+    }
+
+cleanup:
+    return dwError;
+
+error:
+    goto cleanup;
+}
 
 uint32_t
 TDNFDownloadPackage(
@@ -59,13 +95,16 @@ TDNFDownloadPackage(
     char* pszUserPass = NULL;
     char* pszBaseUrl = NULL;
     const char* pszPkgName = NULL;
+    int nSilent = 0;
 
-    if(!pTdnf || !hPkg || IsNullOrEmptyString(pszRpmCacheDir))
+    if(!pTdnf || !pTdnf->pArgs || !hPkg || IsNullOrEmptyString(pszRpmCacheDir))
     {
         dwError = ERROR_TDNF_INVALID_PARAMETER;
         BAIL_ON_TDNF_ERROR(dwError);
     }
 
+    nSilent = pTdnf->pArgs->nNoOutput;
+
     pRepoHandle = lr_handle_init();
 
     if(!pRepoHandle)
@@ -97,18 +136,10 @@ TDNFDownloadPackage(
     {
         lr_handle_setopt(pRepoHandle, NULL, LRO_USERPWD, pszUserPass);
     }
-    bRet = lr_handle_setopt(pRepoHandle, NULL, LRO_PROGRESSCB, lrProgressCB);
-    if(bRet == FALSE)
-    {
-        //TODO: Add repo specific
-        dwError = ERROR_TDNF_INVALID_PARAMETER;
-        BAIL_ON_TDNF_ERROR(dwError);
-    }
-    bRet = lr_handle_setopt(pRepoHandle, NULL, LRO_PROGRESSDATA, pszPkgName);
-    if(bRet == FALSE)
+
+    if(!nSilent)
     {
-        //TODO: Add repo specific
-        dwError = ERROR_TDNF_INVALID_PARAMETER;
+        dwError = set_progress_cb(pRepoHandle, pszPkgName);
         BAIL_ON_TDNF_ERROR(dwError);
     }
 

diff --git a/client/rpmtrans.c b/client/rpmtrans.c
@@ -46,9 +46,6 @@ TDNFRpmExecTransaction(
         BAIL_ON_TDNF_ERROR(dwError);
     }
 
-    dwError = rpmReadConfigFiles(NULL, NULL);
-    BAIL_ON_TDNF_ERROR(dwError);
-
     rpmSetVerbosity(TDNFConfGetRpmVerbosity(pTdnf));
 
     //Allow downgrades
@@ -212,6 +209,15 @@ TDNFRunTransaction(
     )
 {
     uint32_t dwError = 0;
+    int nSilent = 0;
+
+    if(!pTS || !pTdnf || !pTdnf->pArgs)
+    {
+        dwError = ERROR_TDNF_INVALID_PARAMETER;
+        BAIL_ON_TDNF_ERROR(dwError);
+    }
+
+    nSilent = pTdnf->pArgs->nNoOutput;
 
     dwError = rpmtsOrder(pTS->pTS);
     BAIL_ON_TDNF_ERROR(dwError);
@@ -221,13 +227,21 @@ TDNFRunTransaction(
 
     rpmtsClean(pTS->pTS);
 
-    fprintf(stdout, "Testing transaction\n");
+    //TODO do callbacks for output
+    if(!nSilent)
+    {
+        fprintf(stdout, "Testing transaction\n");
+    }
 
     rpmtsSetFlags(pTS->pTS, RPMTRANS_FLAG_TEST);
     dwError = rpmtsRun(pTS->pTS, NULL, pTS->nProbFilterFlags);
     BAIL_ON_TDNF_ERROR(dwError);
 
-    fprintf(stdout, "Running transaction\n");
+    //TODO do callbacks for output
+    if(!nSilent)
+    {
+        fprintf(stdout, "Running transaction\n");
+    }
     rpmtsSetFlags(pTS->pTS, RPMTRANS_FLAG_NONE);
     dwError = rpmtsRun(pTS->pTS, NULL, pTS->nProbFilterFlags);
     BAIL_ON_TDNF_ERROR(dwError);

diff --git a/client/structs.h b/client/structs.h
@@ -38,3 +38,9 @@ typedef struct _TDNF_RPM_TS_
   FD_t               pFD;
   GArray*            pCachedRpmsArray;
 }TDNFRPMTS, *PTDNFRPMTS;
+
+typedef struct _TDNF_ENV_
+{
+    pthread_mutex_t mutexInitialize;
+    int nInitialized;
+}TDNF_ENV, *PTDNF_ENV;
diff --git a/client/utils.c b/client/utils.c
@@ -387,9 +387,6 @@ TDNFRawGetPackageVersion(
         BAIL_ON_TDNF_ERROR(dwError);
     }
 
-    dwError = rpmReadConfigFiles(NULL, NULL);
-    BAIL_ON_TDNF_ERROR(dwError);
-
     pTS = rpmtsCreate();
     if(!pTS)
     {

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(tdnf, 1.0.9)
+AC_INIT(tdnf, 1.1.0)
 AC_MSG_NOTICE([tdnf configuration])
 
 AC_CANONICAL_SYSTEM

diff --git a/include/tdnfclient.h b/include/tdnfclient.h
@@ -24,6 +24,11 @@ extern "C" {
 
 //api.c
 
+//global init.
+uint32_t
+TDNFInit(
+    );
+
 //Open a handle using initial args 
 //args can define a command, have config overrides
 uint32_t
@@ -242,6 +247,12 @@ TDNFFreeCmdOpt(
     PTDNF_CMD_OPT pCmdOpt
     );
 
+//free global resources.
+void
+TDNFUninit(
+    );
+
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/tdnftypes.h b/include/tdnftypes.h
@@ -204,6 +204,8 @@ typedef struct _TDNF_CMD_ARGS
     int nShowDuplicates;   //show dups in list/search
     int nShowVersion;      //show version and exit
     int nNoGPGCheck;       //skip gpg check
+    int nNoOutput;         //if quiet and assumeyes are provided
+    int nQuiet;            //quiet option
     int nVerbose;          //print debug info
     int nIPv4;             //resolve to IPv4 addresses only
     int nIPv6;             //resolve to IPv6 addresses only

diff --git a/tdnf.pc.in b/tdnf.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/tdnf
+
+Name: tdnf
+Description: tiny dandified yum
+Version: @VERSION@
+Requires:hawkey librepo rpm
+Libs: -L${libdir} -ltdnfclient
+Cflags: -I${includedir}