From 990ec722618646b70ebfba08c72e6f4a4f5e6f8e Mon Sep 17 00:00:00 2001
From: dave <dave@davepedu.com>
Date: Thu, 9 Nov 2017 17:35:50 -0800
Subject: [PATCH] rearrange stuff

---
 go/Makefile => Makefile                           | 0
 collect.py => python/collect.py                   | 0
 example.sh => python/example.sh                   | 0
 {irclogtools => python/irclogtools}/__init__.py   | 0
 {irclogtools => python/irclogtools}/archive.py    | 0
 {irclogtools => python/irclogtools}/containers.py | 2 +-
 {irclogtools => python/irclogtools}/tools.py      | 0
 pull.py => python/pull.py                         | 0
 requirements.txt => python/requirements.txt       | 0
 setup.py => python/setup.py                       | 0
 {go/src => src}/archive.go                        | 0
 {go/src => src}/containers.go                     | 0
 12 files changed, 1 insertion(+), 1 deletion(-)
 rename go/Makefile => Makefile (100%)
 rename collect.py => python/collect.py (100%)
 rename example.sh => python/example.sh (100%)
 rename {irclogtools => python/irclogtools}/__init__.py (100%)
 rename {irclogtools => python/irclogtools}/archive.py (100%)
 rename {irclogtools => python/irclogtools}/containers.py (98%)
 rename {irclogtools => python/irclogtools}/tools.py (100%)
 rename pull.py => python/pull.py (100%)
 rename requirements.txt => python/requirements.txt (100%)
 rename setup.py => python/setup.py (100%)
 rename {go/src => src}/archive.go (100%)
 rename {go/src => src}/containers.go (100%)

diff --git a/go/Makefile b/Makefile
similarity index 100%
rename from go/Makefile
rename to Makefile
diff --git a/collect.py b/python/collect.py
similarity index 100%
rename from collect.py
rename to python/collect.py
diff --git a/example.sh b/python/example.sh
similarity index 100%
rename from example.sh
rename to python/example.sh
diff --git a/irclogtools/__init__.py b/python/irclogtools/__init__.py
similarity index 100%
rename from irclogtools/__init__.py
rename to python/irclogtools/__init__.py
diff --git a/irclogtools/archive.py b/python/irclogtools/archive.py
similarity index 100%
rename from irclogtools/archive.py
rename to python/irclogtools/archive.py
diff --git a/irclogtools/containers.py b/python/irclogtools/containers.py
similarity index 98%
rename from irclogtools/containers.py
rename to python/irclogtools/containers.py
index d7b61ec..85705ac 100644
--- a/irclogtools/containers.py
+++ b/python/irclogtools/containers.py
@@ -46,7 +46,7 @@ class CombinedLogfile(object):
                     if not network:
                         network = meta["network"]
                     assert channel == meta["channel"], "Portion does not match first portion's channel"
-                    assert network == meta["network"], "Portion does not match first portion's channel"
+                    # assert network == meta["network"], "Portion does not match first portion's network"
 
                 elif line.startswith(self.ENDPORTIONHEADER.encode("UTF-8")):
                     assert portion is not None and meta is not None, "Ended portion while not in portion?"
diff --git a/irclogtools/tools.py b/python/irclogtools/tools.py
similarity index 100%
rename from irclogtools/tools.py
rename to python/irclogtools/tools.py
diff --git a/pull.py b/python/pull.py
similarity index 100%
rename from pull.py
rename to python/pull.py
diff --git a/requirements.txt b/python/requirements.txt
similarity index 100%
rename from requirements.txt
rename to python/requirements.txt
diff --git a/setup.py b/python/setup.py
similarity index 100%
rename from setup.py
rename to python/setup.py
diff --git a/go/src/archive.go b/src/archive.go
similarity index 100%
rename from go/src/archive.go
rename to src/archive.go
diff --git a/go/src/containers.go b/src/containers.go
similarity index 100%
rename from go/src/containers.go
rename to src/containers.go