From 28217131501f489d251b803afc1d9187aa0719d1 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Sun, 19 Jun 2016 21:37:00 +0200
Subject: [PATCH 01/19] redefine scope of tsstats.log.* in func-docs

---
 tsstats/log.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tsstats/log.py b/tsstats/log.py
index 08570f6..e9a5ad0 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -25,6 +25,8 @@ def parse_logs(log_glob, ident_map=None, *args, **kwargs):
     '''
     parse logs specified by globbing pattern `log_glob`
 
+    basic parsing is done here: extracting sid and splitting
+
     :param log_glob: path to log-files (supports globbing)
     :param ident_map: :doc:`identmap`
 
@@ -42,7 +44,9 @@ def parse_logs(log_glob, ident_map=None, *args, **kwargs):
 
 def parse_log(log_path, ident_map=None, clients=None, online_dc=True):
     '''
-    parse log-file at `log_path`
+    extract details from log-files
+
+    detailed parsing is done here: onlinetime, kicks, pkicks, bans, pbans
 
     :param log_path: path to log-file
     :param ident_map: :doc:`identmap`

From bec02798717d6f225eda2992c9e8ae8392cdb841 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Sun, 19 Jun 2016 21:44:23 +0200
Subject: [PATCH 02/19] rename tsstats.log.parse_log to
 tsstats.log._parse_details

---
 tsstats/log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsstats/log.py b/tsstats/log.py
index e9a5ad0..32c59a1 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -42,7 +42,7 @@ def parse_logs(log_glob, ident_map=None, *args, **kwargs):
     return clients
 
 
-def parse_log(log_path, ident_map=None, clients=None, online_dc=True):
+def _parse_details(log_path, ident_map=None, clients=None, online_dc=True):
     '''
     extract details from log-files
 

From ad7ff96b1b4143cb2bdc54c6417dff803013cd4d Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Sun, 19 Jun 2016 22:10:35 +0200
Subject: [PATCH 03/19] add filename-checking to split logs by sid

* if filename doesn't match, fallback to plain sorting
* using re_log_filename to match
---
 tsstats/log.py | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/tsstats/log.py b/tsstats/log.py
index 32c59a1..b357583 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -2,11 +2,15 @@
 
 import logging
 import re
+from collections import namedtuple
 from datetime import datetime
 from glob import glob
+from os.path import basename
 
 from tsstats.client import Client, Clients
 
+re_log_filename = re.compile(r'ts3server_(?P<date>\d{4}-\d\d-\d\d)'
+                             '__(?P<time>\d\d_\d\d_\d\d.\d+)_(?P<sid>\d).log')
 re_log_entry = re.compile('(?P<timestamp>\d{4}-\d\d-\d\d\ \d\d:\d\d:\d\d.\d+)'
                           '\|\ *(?P<level>\w+)\ *\|\ *(?P<component>\w+)\ *'
                           '\|\ *(?P<sid>\d+)\ *\|\ *(?P<message>.*)')
@@ -17,6 +21,8 @@ re_disconnect_invoker = re.compile(
 
 log_timestamp_format = '%Y-%m-%d %H:%M:%S.%f'
 
+TimedLog = namedtuple('TimedLog', ['path', 'timestamp'])
+
 
 logger = logging.getLogger('tsstats')
 
@@ -26,6 +32,7 @@ def parse_logs(log_glob, ident_map=None, *args, **kwargs):
     parse logs specified by globbing pattern `log_glob`
 
     basic parsing is done here: extracting sid and splitting
+    and then given to _parse_details
 
     :param log_glob: path to log-files (supports globbing)
     :param ident_map: :doc:`identmap`
@@ -36,10 +43,30 @@ def parse_logs(log_glob, ident_map=None, *args, **kwargs):
     :return: parsed clients
     :rtype: tsstats.client.Clients
     '''
-    clients = Clients(ident_map)
+    vserver_logfiles = {}  # sid: [/path/to/log1, ..., /path/to/logn]
     for log_file in sorted(log_file for log_file in glob(log_glob)):
-        clients = parse_log(log_file, ident_map, clients, *args, **kwargs)
-    return clients
+        # try to get date and sid from filename
+        match = re_log_filename.match(basename(log_file))
+        if match:
+            match = match.groupdict()
+            timestamp = datetime.strptime('{0} {1}'.format(
+                match['date'], match['time'].replace('_', ':')))
+            tl = TimedLog(log_file, timestamp)
+            sid = match['sid']
+            if sid in vserver_logfiles:
+                # if already exists, keep list sorted by timestamp
+                vserver_logfiles[sid].apppend(tl)
+                vserver_logfiles[sid] =\
+                    sorted(vserver_logfiles[sid],
+                           key=lambda tl: tl.timestamp)
+            else:
+                # if not exists, just create a list
+                vserver_logfiles[match['sid']] = [tl]
+        else:
+            # fallback to plain sorting
+            vserver_logfiles.setdefault('', [])\
+                .append(TimedLog(log_file, None))
+    return vserver_logfiles
 
 
 def _parse_details(log_path, ident_map=None, clients=None, online_dc=True):

From 37a98419004ea42e96181e89b7bc96a6490d08f7 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Sun, 19 Jun 2016 22:13:05 +0200
Subject: [PATCH 04/19] rename tsstats.log.parse_logs to
 tsstats.log._sort_logfiles to fit updated scope

---
 tsstats/log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsstats/log.py b/tsstats/log.py
index b357583..68a14fb 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -27,7 +27,7 @@ TimedLog = namedtuple('TimedLog', ['path', 'timestamp'])
 logger = logging.getLogger('tsstats')
 
 
-def parse_logs(log_glob, ident_map=None, *args, **kwargs):
+def _sort_logfiles(log_glob):
     '''
     parse logs specified by globbing pattern `log_glob`
 

From 0c57b27abc9c6e2f9875694e180cb5ff84d71ddd Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Sun, 19 Jun 2016 22:21:02 +0200
Subject: [PATCH 05/19] update documentation of tsstats.log._sort_logfiles to
 fit updated scope

---
 tsstats/log.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tsstats/log.py b/tsstats/log.py
index 68a14fb..def8c18 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -29,19 +29,15 @@ logger = logging.getLogger('tsstats')
 
 def _sort_logfiles(log_glob):
     '''
-    parse logs specified by globbing pattern `log_glob`
-
-    basic parsing is done here: extracting sid and splitting
-    and then given to _parse_details
+    collect logfiles from `log_glob` and sort them by date
+    and bundle them by virtualserver-id
 
     :param log_glob: path to log-files (supports globbing)
-    :param ident_map: :doc:`identmap`
 
     :type log_glob: str
-    :type ident_map: dict
 
-    :return: parsed clients
-    :rtype: tsstats.client.Clients
+    :return: log-files sorted by date and bundled virtualserver-id
+    :rtype: dict{str: [TimedLog]}
     '''
     vserver_logfiles = {}  # sid: [/path/to/log1, ..., /path/to/logn]
     for log_file in sorted(log_file for log_file in glob(log_glob)):

From 612055a088ffb46f8e0085bb8ab9d6efbc90debc Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Sun, 19 Jun 2016 22:26:19 +0200
Subject: [PATCH 06/19] add wip tsstats.log.parse_logs

---
 tsstats/log.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tsstats/log.py b/tsstats/log.py
index def8c18..23a9f3e 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -27,6 +27,20 @@ TimedLog = namedtuple('TimedLog', ['path', 'timestamp'])
 logger = logging.getLogger('tsstats')
 
 
+def parse_logs(log_glob):
+    '''
+    parse logs from `log_glob`
+    '''
+    vserver_clients = {}
+    for virtualserver_id, logs in _sort_logfiles(log_glob):
+        clients = Clients()
+        for log in logs:
+            _parse_details(clients=clients)
+        if len(clients) >= 1:
+            vserver_clients[virtualserver_id] = clients
+    return vserver_clients
+
+
 def _sort_logfiles(log_glob):
     '''
     collect logfiles from `log_glob` and sort them by date

From e92ad9e6fe0dc9088ed440470efef1aedc0ea500 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Mon, 20 Jun 2016 21:31:59 +0200
Subject: [PATCH 07/19] update scope of tsstats.log._sort_logs (rename to
 tsstats.log._bundle_logs)

* rename to tsstats.log._bundle_logs
* expect list of logpaths as argument and return them sorted
* move globbing-stuff to parse_logs in an upcoming commit
---
 tsstats/log.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tsstats/log.py b/tsstats/log.py
index 23a9f3e..2aec053 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -41,27 +41,27 @@ def parse_logs(log_glob):
     return vserver_clients
 
 
-def _sort_logfiles(log_glob):
+def _bundle_logs(logs):
     '''
-    collect logfiles from `log_glob` and sort them by date
-    and bundle them by virtualserver-id
+    bundle `logs` by virtualserver-id
+    and sort by timestamp from filename (if exists)
 
-    :param log_glob: path to log-files (supports globbing)
+    :param logs: list of paths to logfiles
 
-    :type log_glob: str
+    :type logs: list
 
-    :return: log-files sorted by date and bundled virtualserver-id
+    :return: `logs` bundled by virtualserver-id and sorted by timestamp
     :rtype: dict{str: [TimedLog]}
     '''
     vserver_logfiles = {}  # sid: [/path/to/log1, ..., /path/to/logn]
-    for log_file in sorted(log_file for log_file in glob(log_glob)):
+    for log in logs:
         # try to get date and sid from filename
-        match = re_log_filename.match(basename(log_file))
+        match = re_log_filename.match(basename(log))
         if match:
             match = match.groupdict()
             timestamp = datetime.strptime('{0} {1}'.format(
                 match['date'], match['time'].replace('_', ':')))
-            tl = TimedLog(log_file, timestamp)
+            tl = TimedLog(log, timestamp)
             sid = match['sid']
             if sid in vserver_logfiles:
                 # if already exists, keep list sorted by timestamp
@@ -75,7 +75,7 @@ def _sort_logfiles(log_glob):
         else:
             # fallback to plain sorting
             vserver_logfiles.setdefault('', [])\
-                .append(TimedLog(log_file, None))
+                .append(TimedLog(log, None))
     return vserver_logfiles
 
 

From 105f464b9aa6b03f2ca76481c1e5100c852c4a62 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Mon, 20 Jun 2016 21:38:57 +0200
Subject: [PATCH 08/19] sort logs by path, if timestamp not available, though

---
 tsstats/log.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tsstats/log.py b/tsstats/log.py
index 2aec053..38a72cd 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -76,6 +76,9 @@ def _bundle_logs(logs):
             # fallback to plain sorting
             vserver_logfiles.setdefault('', [])\
                 .append(TimedLog(log, None))
+            vserver_logfiles[''] =\
+                sorted(vserver_logfiles[''],
+                       key=lambda tl: tl.path)
     return vserver_logfiles
 
 

From 976d40e2b9e2647e72cef7a52fa3b1ad0b116db6 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Mon, 20 Jun 2016 21:59:22 +0200
Subject: [PATCH 09/19] add test for tsstats.log._bundle_logs

---
 tsstats/tests/test_log.py | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/tsstats/tests/test_log.py b/tsstats/tests/test_log.py
index cd0a62f..e916f61 100644
--- a/tsstats/tests/test_log.py
+++ b/tsstats/tests/test_log.py
@@ -1,17 +1,17 @@
-from datetime import timedelta
+from datetime import datetime, timedelta
 from time import sleep
 
 import pytest
 
 from tsstats.exceptions import InvalidLog
-from tsstats.log import parse_log, parse_logs
+from tsstats.log import TimedLog, _bundle_logs, _parse_details
 
 testlog_path = 'tsstats/tests/res/test.log'
 
 
 @pytest.fixture
 def clients():
-    return parse_log(testlog_path, online_dc=False)
+    return _parse_details(testlog_path, online_dc=False)
 
 
 def test_log_client_count(clients):
@@ -39,6 +39,32 @@ def test_log_pbans(clients):
     assert clients['2'].pbans == 1
 
 
+@pytest.mark.parametrize("logs,bundled", [
+    (
+        ['l1.log', 'l2.log'],
+        {'': [TimedLog('l1.log', None), TimedLog('l2.log', None)]}
+    ),
+    (
+        [
+            'ts3server_2016-06-06__14_22_09.527229_1.log',
+            'ts3server_2017-07-07__15_23_10.638340_1.log'
+        ],
+        {
+            '1': [
+                TimedLog('ts3server_2016-06-06__14_22_09.527229_1.log',
+                         datetime(year=2016, month=6, day=6, hour=14,
+                                  minute=22, second=9, microsecond=527229)),
+                TimedLog('ts3server_2017-07-07__15_23_10.638340_1.log',
+                         datetime(year=2017, month=7, day=7, hour=15,
+                                  minute=23, second=10, microsecond=638340))
+            ]
+        }
+    )
+])
+def test_log_bundle(logs, bundled):
+    assert _bundle_logs(logs) == bundled
+
+
 def test_log_invalid():
     with pytest.raises(InvalidLog):
         parse_log('tsstats/tests/res/test.log.broken')

From 9a6bbe4f3e7e3d44fbd2dbb8034cb47166245509 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Mon, 20 Jun 2016 21:59:46 +0200
Subject: [PATCH 10/19] fix 2 typos in tsstats.log._bundle_logs

---
 tsstats/log.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tsstats/log.py b/tsstats/log.py
index 38a72cd..54c2876 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -60,12 +60,13 @@ def _bundle_logs(logs):
         if match:
             match = match.groupdict()
             timestamp = datetime.strptime('{0} {1}'.format(
-                match['date'], match['time'].replace('_', ':')))
+                match['date'], match['time'].replace('_', ':')),
+                log_timestamp_format)
             tl = TimedLog(log, timestamp)
             sid = match['sid']
             if sid in vserver_logfiles:
                 # if already exists, keep list sorted by timestamp
-                vserver_logfiles[sid].apppend(tl)
+                vserver_logfiles[sid].append(tl)
                 vserver_logfiles[sid] =\
                     sorted(vserver_logfiles[sid],
                            key=lambda tl: tl.timestamp)

From c0f1a6c64984bf7f22fa06df5804fff58d17c599 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Mon, 20 Jun 2016 22:02:55 +0200
Subject: [PATCH 11/19] add glob-resolution to tsstats.log.parse_logs

* correct name of bundle-function (to tsstats.log._bundle_logs)
* add .items() to correct for-loop
---
 tsstats/log.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tsstats/log.py b/tsstats/log.py
index 54c2876..7e08902 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -32,7 +32,8 @@ def parse_logs(log_glob):
     parse logs from `log_glob`
     '''
     vserver_clients = {}
-    for virtualserver_id, logs in _sort_logfiles(log_glob):
+    for virtualserver_id, logs in\
+            _bundle_logs(log_file for log_file in glob(log_glob)).items():
         clients = Clients()
         for log in logs:
             _parse_details(clients=clients)

From c132c176615671d5d67b7fc54864f45293035ffd Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Tue, 21 Jun 2016 18:20:57 +0200
Subject: [PATCH 12/19] add ident_map-arg to tsstats.log.parse_logs

* give all given arguments to tsstats.log._bundle_logs while parsing (*args,
**kwargs)
---
 tsstats/log.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tsstats/log.py b/tsstats/log.py
index 7e08902..e24c3a5 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -27,16 +27,16 @@ TimedLog = namedtuple('TimedLog', ['path', 'timestamp'])
 logger = logging.getLogger('tsstats')
 
 
-def parse_logs(log_glob):
+def parse_logs(log_glob, ident_map=None, *args, **kwargs):
     '''
     parse logs from `log_glob`
     '''
     vserver_clients = {}
     for virtualserver_id, logs in\
             _bundle_logs(log_file for log_file in glob(log_glob)).items():
-        clients = Clients()
+        clients = Clients(ident_map)
         for log in logs:
-            _parse_details(clients=clients)
+            _parse_details(clients=clients, *args, **kwargs)
         if len(clients) >= 1:
             vserver_clients[virtualserver_id] = clients
     return vserver_clients

From 468bfcd22d645176e61e2bb58881390d035a8498 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Tue, 21 Jun 2016 18:23:35 +0200
Subject: [PATCH 13/19] fix log-tests by renaming all occurences of parse_log
 to _parse_details

* additionally remove deprecated test_multiple-test
---
 tsstats/tests/test_log.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/tsstats/tests/test_log.py b/tsstats/tests/test_log.py
index e916f61..328c033 100644
--- a/tsstats/tests/test_log.py
+++ b/tsstats/tests/test_log.py
@@ -67,18 +67,13 @@ def test_log_bundle(logs, bundled):
 
 def test_log_invalid():
     with pytest.raises(InvalidLog):
-        parse_log('tsstats/tests/res/test.log.broken')
-
-
-def test_log_multiple():
-    assert len(parse_log(testlog_path, online_dc=False)) == \
-        len(parse_logs(testlog_path, online_dc=False))
+        _parse_details('tsstats/tests/res/test.log.broken')
 
 
 @pytest.mark.slowtest
 def test_log_client_online():
-    clients = parse_log(testlog_path)
+    clients = _parse_details(testlog_path)
     old_onlinetime = int(clients['1'].onlinetime.total_seconds())
     sleep(2)
-    clients = parse_log(testlog_path)
+    clients = _parse_details(testlog_path)
     assert int(clients['1'].onlinetime.total_seconds()) == old_onlinetime + 2

From 54532fd598ac5da98b2a1d118a0a5cc95dd79d11 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Tue, 21 Jun 2016 18:25:38 +0200
Subject: [PATCH 14/19] use _bundle_logs in template-tests for now

---
 tsstats/tests/test_template.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tsstats/tests/test_template.py b/tsstats/tests/test_template.py
index 9652cd5..8e90b45 100644
--- a/tsstats/tests/test_template.py
+++ b/tsstats/tests/test_template.py
@@ -5,12 +5,12 @@ from os import remove
 import pytest
 from bs4 import BeautifulSoup
 
-from tsstats.log import parse_log
+from tsstats.log import _parse_details
 from tsstats.template import render_template
 from tsstats.utils import seconds_to_text
 
 output_path = 'tsstats/tests/res/output.html'
-clients = parse_log('tsstats/tests/res/test.log')
+clients = _parse_details('tsstats/tests/res/test.log')
 
 logger = logging.getLogger('tsstats')
 

From 21be54675fd9ea12536cbe0e0e1aca5ae0156550 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Tue, 21 Jun 2016 18:29:59 +0200
Subject: [PATCH 15/19] add proper func-doc to tsstats.log.parse_logs

---
 tsstats/log.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tsstats/log.py b/tsstats/log.py
index e24c3a5..b76cb3f 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -30,6 +30,15 @@ logger = logging.getLogger('tsstats')
 def parse_logs(log_glob, ident_map=None, *args, **kwargs):
     '''
     parse logs from `log_glob`
+
+    :param log_glob: path to server-logs (supports globbing)
+    :param ident_map: identmap used for Client-initializations
+
+    :type log_glob: str
+    :type ident_map: dict
+
+    :return: clients bundled by virtual-server
+    :rtype: dict
     '''
     vserver_clients = {}
     for virtualserver_id, logs in\

From def9f2e1e2ccf07db961135881dd48e221a95998 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Tue, 21 Jun 2016 22:16:39 +0200
Subject: [PATCH 16/19] fix logpath not given to _bundle_logs in
 tsstats.log.parse_logs

---
 tsstats/log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsstats/log.py b/tsstats/log.py
index b76cb3f..d86a057 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -45,7 +45,7 @@ def parse_logs(log_glob, ident_map=None, *args, **kwargs):
             _bundle_logs(log_file for log_file in glob(log_glob)).items():
         clients = Clients(ident_map)
         for log in logs:
-            _parse_details(clients=clients, *args, **kwargs)
+            _parse_details(log.path, clients=clients, *args, **kwargs)
         if len(clients) >= 1:
             vserver_clients[virtualserver_id] = clients
     return vserver_clients

From 0b667f55b7cc51967a976473aed1cd1444c43076 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Wed, 22 Jun 2016 20:40:30 +0200
Subject: [PATCH 17/19] check for None instead of False to allow empty clients
 as arg to tsstats.log._parse_details

---
 tsstats/log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsstats/log.py b/tsstats/log.py
index d86a057..5b3bf43 100644
--- a/tsstats/log.py
+++ b/tsstats/log.py
@@ -112,7 +112,7 @@ def _parse_details(log_path, ident_map=None, clients=None, online_dc=True):
     :return: parsed clients
     :rtype: tsstats.client.Clients
     '''
-    if not clients:
+    if clients is None:
         clients = Clients(ident_map)
     log_file = open(log_path)
     # process lines

From eafc98f54803bb53e3e1470cf9f0871dfe5bb351 Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Wed, 22 Jun 2016 20:40:55 +0200
Subject: [PATCH 18/19] add test for tsstats.log.parse_logs

---
 tsstats/tests/test_log.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tsstats/tests/test_log.py b/tsstats/tests/test_log.py
index 328c033..1dc1689 100644
--- a/tsstats/tests/test_log.py
+++ b/tsstats/tests/test_log.py
@@ -4,7 +4,7 @@ from time import sleep
 import pytest
 
 from tsstats.exceptions import InvalidLog
-from tsstats.log import TimedLog, _bundle_logs, _parse_details
+from tsstats.log import TimedLog, _bundle_logs, _parse_details, parse_logs
 
 testlog_path = 'tsstats/tests/res/test.log'
 
@@ -77,3 +77,8 @@ def test_log_client_online():
     sleep(2)
     clients = _parse_details(testlog_path)
     assert int(clients['1'].onlinetime.total_seconds()) == old_onlinetime + 2
+
+
+def test_parse_logs():
+    assert len(_parse_details(testlog_path)) ==\
+        len(parse_logs(testlog_path)[''])

From 95c22dde3501bc00fd570e1d6650f2defcd085fe Mon Sep 17 00:00:00 2001
From: Thor77 <xXThor77Xx@gmail.com>
Date: Wed, 22 Jun 2016 20:47:12 +0200
Subject: [PATCH 19/19] make __main__.main work with new output of
 tsstats.log.parse_logs

* if sid given, add .<sid> to outputpath
---
 tsstats/__main__.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tsstats/__main__.py b/tsstats/__main__.py
index 984dfd3..e28d626 100644
--- a/tsstats/__main__.py
+++ b/tsstats/__main__.py
@@ -64,8 +64,13 @@ def main(config=None, idmap=None, log=None, output=None, debug=False):
     if not log or not output:
         raise InvalidConfiguration('log or output missing')
 
-    clients = parse_logs(log, ident_map=identmap)
-    render_template(clients, output=abspath(output))
+    sid_clients = parse_logs(log, ident_map=identmap)
+    for sid, clients in sid_clients.items():
+        if sid:
+            ext = '.{}'.format(sid)
+        else:
+            ext = ''
+        render_template(clients, output=abspath(output + ext))
 
 
 if __name__ == '__main__':