addd urlhandler for static content, more reusing of code.

aqhome/http/httpservice_conf.c

@@ -63,7 +63,6 @@ static int _checkSession(const AQH_SESSION *session);
 static int _checkModule(const AQH_MODULE *m, int ignoreMissingId);
 static int _checkRoleList(const AQH_ROLE_LIST *roleList, int ignoreMissingId);
 static int _writeDbFile(const char *fname, GWEN_DB_NODE *db);
-static GWEN_STRINGLIST *_getConfFileList(const char *folder, const char *mask);
 static AQH_SESSION_LIST *_readAllSessionsIntoList(const AQH_SERVICE *sv);
 static AQH_SESSION *_readSessionFromFile(const char *filename);
 
@@ -761,6 +760,31 @@ int AQH_HttpService_DelSession(AQH_SERVICE *sv, AQH_SESSION *session)
 
 
 
+GWEN_STRINGLIST *AQH_HttpService_GetFolderFileList(const char *folder, const char *mask, int senseCase)
+{
+  GWEN_STRINGLIST *sl;
+  int rv;
+
+  sl=GWEN_StringList_new();
+  GWEN_StringList_SetSenseCase(sl, senseCase);
+
+  rv=GWEN_Directory_GetFileEntries(folder, sl, mask);
+  if (rv<0) {
+    DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
+    GWEN_StringList_free(sl);
+    return NULL;
+  }
+  if (GWEN_StringList_Count(sl)<1) {
+    DBG_INFO(AQH_LOGDOMAIN, "Empty string list");
+    GWEN_StringList_free(sl);
+    return NULL;
+  }
+
+  return sl;
+}
+
+
+
 AQH_MODULE *_ensureModule(AQH_SERVICE *sv, const char *modName)
 {
   AQH_MODULE *module;
@@ -1159,29 +1183,6 @@ GWEN_BUFFER *_getSessionFolder(const AQH_SERVICE *sv)
 
 
 
-GWEN_STRINGLIST *_getConfFileList(const char *folder, const char *mask)
-{
-  GWEN_STRINGLIST *sl;
-  int rv;
-
-  sl=GWEN_StringList_new();
-  rv=GWEN_Directory_GetFileEntries(folder, sl, mask);
-  if (rv<0) {
-    DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
-    GWEN_StringList_free(sl);
-    return NULL;
-  }
-  if (GWEN_StringList_Count(sl)<1) {
-    DBG_INFO(AQH_LOGDOMAIN, "Empty string list");
-    GWEN_StringList_free(sl);
-    return NULL;
-  }
-
-  return sl;
-}
-
-
-
 AQH_SESSION_LIST *_readAllSessionsIntoList(const AQH_SERVICE *sv)
 {
   GWEN_BUFFER *folderBuf;
@@ -1190,7 +1191,7 @@ AQH_SESSION_LIST *_readAllSessionsIntoList(const AQH_SERVICE *sv)
   if (folderBuf) {
     GWEN_STRINGLIST *fileList;
 
-    fileList=_getConfFileList(GWEN_Buffer_GetStart(folderBuf), "*.conf");
+    fileList=AQH_HttpService_GetFolderFileList(GWEN_Buffer_GetStart(folderBuf), "*.conf", 1);
     if (fileList) {
       AQH_SESSION_LIST *sessionList;
       uint32_t pos;

aqhome/http/httpservice_conf.h

@@ -52,6 +52,8 @@ AQHOME_API int AQH_HttpService_DelSession(AQH_SERVICE *sv, AQH_SESSION *session)
 AQHOME_API void AQH_HttpService_LoadAllSessions(AQH_SERVICE *sv);
 
 
+AQHOME_API GWEN_STRINGLIST *AQH_HttpService_GetFolderFileList(const char *folder, const char *mask, int senseCase);
+
 #endif
 
 

aqhome/http/urlhandler.c

@@ -53,6 +53,8 @@ void AQH_HttpUrlHandler_free(AQH_HTTP_URLHANDLER *uh)
   if (uh) {
     GWEN_LIST_FINI(AQH_HTTP_URLHANDLER, uh);
     GWEN_INHERIT_FINI(AQH_HTTP_URLHANDLER, uh);
+
+    free(uh->folder);
     GWEN_StringList_free(uh->urlPatternList);
     GWEN_FREE_OBJECT(uh);
   }
@@ -90,6 +92,23 @@ void AQH_HttpUrlHandler_AddUrlPattern(AQH_HTTP_URLHANDLER *uh, const char *s)
 
 
 
+const char *AQH_HttpUrlHandler_GetFolder(const AQH_HTTP_URLHANDLER *uh)
+{
+  return uh?uh->folder:NULL;
+}
+
+
+
+void AQH_HttpUrlHandler_SetFolder(AQH_HTTP_URLHANDLER *uh, const char *s)
+{
+  if (uh) {
+    free(uh->folder);
+    uh->folder=s?strdup(s):NULL;
+  }
+}
+
+
+
 int AQH_HttpUrlHandler_UrlMatches(const AQH_HTTP_URLHANDLER *uh, const char *s)
 {
   if (uh && s && *s) {

aqhome/http/urlhandler.h

@@ -39,6 +39,9 @@ AQHOME_API int AQH_HttpUrlHandler_UrlMatches(const AQH_HTTP_URLHANDLER *uh, cons
 AQHOME_API AQH_HTTP_CONTENT *AQH_HttpUrlHandler_GetContentProvider(const AQH_HTTP_URLHANDLER *uh);
 AQHOME_API void AQH_HttpUrlHandler_SetContentProvider(AQH_HTTP_URLHANDLER *uh, AQH_HTTP_CONTENT *cp);
 
+AQHOME_API const char *AQH_HttpUrlHandler_GetFolder(const AQH_HTTP_URLHANDLER *uh);
+AQHOME_API void AQH_HttpUrlHandler_SetFolder(AQH_HTTP_URLHANDLER *uh, const char *s);
+
 AQHOME_API void AQH_HttpUrlHandler_SetHandleFn(AQH_HTTP_URLHANDLER *uh, AQH_HTTP_URLHANDLER_HANDLE_FN fn);
 
 AQHOME_API int AQH_HttpUrlHandler_AddContentHeaders(AQH_HTTP_URLHANDLER *uh, int m, GWEN_BUFFER *dbuf);

aqhome/http/urlhandler_p.h

@@ -21,6 +21,8 @@ struct AQH_HTTP_URLHANDLER {
   AQH_SERVICE *httpService;
   GWEN_STRINGLIST *urlPatternList;
   AQH_HTTP_CONTENT *httpContentProvider;
+  char *folder;
+
   AQH_HTTP_URLHANDLER_HANDLE_FN handleFn;
 };