Add date guessing feature + tests

src/include/ttail.h

@@ -15,6 +15,11 @@
 #define TTAIL_FLAG_PREFIX 1
 #define TTAIL_FLAG_DATE_MIN 2
 #define TTAIL_FLAG_DATE_MAX 4
+#define TTAIL_FLAG_FORMAT 8
+#define TTAIL_DEFAULT_FORMATS {"%m", "%A %B %d, %Y %H:%M:%S", "%A", "%B", \
+"%m/%d/%y %I %p", "%d,%m,%Y %H:%M", "at %A the %dst of %B in %Y",\
+"run job at %I %p,%B %dnd", "%A den %d. %B %Y %H.%M Uhr",\
+"%c", "%y/%m/%d", "%Y/%m/%d", "%y-%m-%d", "%Y/%m/%d:%H:%M",NULL}
 
 struct _ttail_s
 {
@@ -58,6 +63,14 @@ int ttail_add_logfile(ttail_t*, const char*);
  */
 int ttail_set_prefix(ttail_t*, const char*);
 
+/**@brief Attempt to guess a dateformat
+ *@param ttail_t* ttail if manage to guess set the ttail_t.fmt
+ *@param const char* date as a dtring
+ *@param struct tm* if non NULL will be set to detected date
+ *@return -1 if no guess -2 if fmt already set else id in TTAIL_DEFAULT_FORMATS
+ */
+int ttail_format_guess(ttail_t*, const char*, struct tm*);
+
 void ttail_free(ttail_t*);
 
 

src/ttail.c

@@ -22,6 +22,8 @@ ttail_t *ttail_init(int argc, char **argv)
 	res->logfile = NULL;
 	res->logfile_name = NULL;
 	res->logfile_sz = 0;
+	memset(&(res->date_min), 0, sizeof(struct tm));
+	memset(&(res->date_max), 0, sizeof(struct tm));
 
 	while(1)
 	{
@@ -52,7 +54,7 @@ ttail_t *ttail_init(int argc, char **argv)
 				}
 				break;
 			case 'f':
-				if(res->fmt)
+				if(res->flag & TTAIL_FLAG_FORMAT)
 				{
 					fprintf(stderr,"Multiple date format \
 given\n");
@@ -67,6 +69,7 @@ for date format");
 					goto ttail_init_err;
 				}
 				strcpy(res->fmt, optarg);
+				res->flag |= TTAIL_FLAG_FORMAT;
 
 				break;
 			case 'l':
@@ -110,12 +113,26 @@ for date format");
 		goto ttail_init_err;
 	}
 
+	/* date min/max processing */
 	for(c=0;c<c;c++)
 	{
 		if(!dates[c])
 		{
 			continue;
 		}
+		if(!(res->flag & TTAIL_FLAG_PREFIX))
+		{
+			/* no format specified */
+			ret = ttail_format_guess(res, dates[c],
+				c==0?&(res->date_min):&(res->date_max));
+			if(res < 0)
+			{
+				fprintf(stderr, "Unable to guess format for \
+date '%s'\n", dates[c]);
+				goto ttail_init_err;
+			}
+			continue;
+		}
 		date = strptime(dates[c], res->fmt, 
 			c==0?&(res->date_min):&(res->date_max));
 		if(!date)
@@ -245,6 +262,67 @@ error message");
 	return -1;
 }
 
+int ttail_format_guess(ttail_t* t, const char* date_str, struct tm* tm)
+{
+	int i, res;
+	char *res_ret, *ret;
+	char *fmt[] = TTAIL_DEFAULT_FORMATS;
+	struct tm dte;
+	
+	memset(&dte, 0, sizeof(struct tm));
+
+	if(t->flag & TTAIL_FLAG_FORMAT)
+	{
+		fprintf(stderr, "Format allready set\n");
+		return -2;
+	}
+	res = -1;
+	res_ret = NULL;
+	i=0;
+	while(fmt[i])
+	{
+		ret = strptime(date_str, fmt[i], &dte);
+		if(ret)
+		{
+			if(!res_ret || strlen(res_ret) > strlen(ret))
+			{
+				res_ret = ret;
+				res = i;
+				if(tm)
+				{
+					memcpy(tm, &dte, sizeof(struct tm));
+				}
+				if(t->fmt)
+				{
+					free(t->fmt);
+				}
+				t->fmt = malloc(
+					sizeof(char)*(strlen(fmt[i])+1));
+				if(!t->fmt)
+				{
+					perror("Unable to allocate memory\
+for date format");
+					t->flag ^= TTAIL_FLAG_FORMAT;
+					return -1;
+				}
+				strcpy(t->fmt, fmt[i]);
+				t->flag |= TTAIL_FLAG_FORMAT;
+			}
+		}
+		i++;
+	}
+	if(!res_ret)
+	{
+		if(tm)
+		{
+			memset(tm, 0, sizeof(struct tm));
+		}
+		return -1;
+	}
+
+	return res;
+}
+
 void ttail_free(ttail_t* t)
 {
 	size_t i;

tests/ttail_init_check.c

@@ -10,7 +10,10 @@ ttail_t *ttail;
 #define __Fname_sz 5
 #define FNAME_NO_EXIST 0
 #define FNAME_EXIST 1
+
 char *fname[__Fname_sz];
+/*date formats*/
+char *fmt[] = TTAIL_DEFAULT_FORMATS;
 
 void teardown_ttail(void)
 {
@@ -20,6 +23,9 @@ void setup_ttail_empty(void)
 {
 	ttail = ttail_init(1, (char**)&"foo");
 }
+/*
+ * ttail_add_logfile() tests
+ */
 START_TEST (test_init_empty_logfilename)
 {
 	ck_assert_msg(ttail->logfile_name == NULL,
@@ -149,6 +155,9 @@ START_TEST (test_init_multiple_logfilename)
 }
 END_TEST
 
+/*
+ * ttail_set_prefix() tests
+ */
 START_TEST (test_init_prefix)
 {
 	int ret;
@@ -192,11 +201,110 @@ START_TEST (test_init_againbad_prefix)
 }
 END_TEST
 
+/*
+ * ttail_format_guess() tests
+ */
+START_TEST (test_init_guess_date)
+{
+	int ret;
+	struct tm tm;
+	char res[] = "%Y/%m/%d";
+	ret = ttail_format_guess(ttail, "1988/10/22", &tm);
+	ck_assert_int_ne(ret, -1);
+	ck_assert_str_eq(fmt[ret], res);
+	ck_assert(ttail->fmt != NULL);
+	ck_assert_str_eq(ttail->fmt, res);
+	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == TTAIL_FLAG_FORMAT);
+	ck_assert_int_eq(tm.tm_year, 88);
+	ck_assert_int_eq(tm.tm_mon, 9);
+	ck_assert_int_eq(tm.tm_mday, 22);
+	ck_assert_int_eq(tm.tm_hour, 0);
+	ck_assert_int_eq(tm.tm_min, 0);
+	ck_assert_int_eq(tm.tm_sec, 0);
+}
+END_TEST
+
+START_TEST (test_init_guess_datetime)
+{
+	int ret;
+	struct tm tm;
+	char res[] = "%Y/%m/%d:%H:%M";
+	ret = ttail_format_guess(ttail, "1988/10/22:22:10:00", &tm);
+	ck_assert_int_ne(ret, -1);
+	ck_assert_str_eq(fmt[ret], res);
+	ck_assert(ttail->fmt != NULL);
+	ck_assert_str_eq(ttail->fmt, res);
+	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == TTAIL_FLAG_FORMAT);
+	ck_assert_int_eq(tm.tm_year, 88);
+	ck_assert_int_eq(tm.tm_mon, 9);
+	ck_assert_int_eq(tm.tm_mday, 22);
+	ck_assert_int_eq(tm.tm_hour, 22);
+	ck_assert_int_eq(tm.tm_min, 10);
+	ck_assert_int_eq(tm.tm_sec, 0);
+}
+END_TEST
+
+START_TEST (test_init_guess_noguess)
+{
+	int ret;
+	struct tm tm;
+	ret = ttail_format_guess(ttail, "notadate", &tm);
+	ck_assert_int_eq(ret, -1);
+	ck_assert(ttail->fmt == NULL);
+	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == 0);
+	ck_assert_int_eq(tm.tm_year, 0);
+	ck_assert_int_eq(tm.tm_mon, 0);
+	ck_assert_int_eq(tm.tm_mday, 0);
+	ck_assert_int_eq(tm.tm_hour, 0);
+	ck_assert_int_eq(tm.tm_min, 0);
+	ck_assert_int_eq(tm.tm_sec, 0);
+}
+END_TEST
+
+START_TEST (test_init_guess_date_notm)
+{
+	int ret;
+	char res[] = "%Y/%m/%d";
+	ret = ttail_format_guess(ttail, "1988/10/22", NULL);
+	ck_assert_int_ne(ret, -1);
+	ck_assert_str_eq(fmt[ret], res);
+	ck_assert(ttail->fmt != NULL);
+	ck_assert_str_eq(ttail->fmt, res);
+	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == TTAIL_FLAG_FORMAT);
+}
+END_TEST
+
+START_TEST (test_init_guess_noguess_notm)
+{
+	int ret;
+	struct tm tm;
+	ret = ttail_format_guess(ttail, "notadate", &tm);
+	ck_assert_int_eq(ret, -1);
+	ck_assert(ttail->fmt == NULL);
+	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == 0);
+}
+END_TEST
+
+START_TEST (test_init_guess_fmt_set)
+{
+	int ret;
+	struct tm tm;
+	char res[] = "%Y/%m/%d";
+	ret = ttail_format_guess(ttail, "1988/10/22", NULL);
+	ck_assert_int_eq(ret, 11);
+	ret = ttail_format_guess(ttail, "1988/10/22", NULL);
+	ck_assert_int_eq(ret, -2);
+	ck_assert_str_eq(ttail->fmt, res);
+	ck_assert((ttail->flag & TTAIL_FLAG_FORMAT) == TTAIL_FLAG_FORMAT);
+}
+END_TEST
+
 Suite * ttail_init_suite(void)
 {
 	Suite *s;
 	TCase *tc_init_logfile;
 	TCase *tc_init_prefix;
+	TCase *tc_init_fmt_guess;
 
 	s = suite_create("ttail init checks");
 
@@ -218,8 +326,19 @@ Suite * ttail_init_suite(void)
 	tcase_add_test(tc_init_prefix, test_init_again_prefix);
 	tcase_add_test(tc_init_prefix, test_init_againbad_prefix);
 
+	tc_init_fmt_guess = tcase_create("date format guess init checks");
+	tcase_add_checked_fixture(tc_init_fmt_guess,
+		setup_ttail_empty, teardown_ttail);
+	tcase_add_test(tc_init_fmt_guess, test_init_guess_date);
+	tcase_add_test(tc_init_fmt_guess, test_init_guess_datetime);
+	tcase_add_test(tc_init_fmt_guess, test_init_guess_noguess);
+	tcase_add_test(tc_init_fmt_guess, test_init_guess_date_notm);
+	tcase_add_test(tc_init_fmt_guess, test_init_guess_noguess_notm);
+	tcase_add_test(tc_init_fmt_guess, test_init_guess_fmt_set);
+
 	suite_add_tcase(s, tc_init_logfile);
 	suite_add_tcase(s, tc_init_prefix);
+	suite_add_tcase(s, tc_init_fmt_guess);
 	return s;
 }