From 9137347acb00957d548ade66d65687d91be15236 Mon Sep 17 00:00:00 2001
From: Chaz <Chaz@Chaz-THINK>
Date: Wed, 24 Nov 2010 15:20:48 -0600
Subject: [PATCH] Just fixed a few bugs

---
 pyfpdb/IdentifySite.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/IdentifySite.py b/pyfpdb/IdentifySite.py
index b4f1a8a7..723991f3 100644
--- a/pyfpdb/IdentifySite.py
+++ b/pyfpdb/IdentifySite.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 #Copyright 2010 Chaz Littlejohn
@@ -28,18 +28,21 @@ import Configuration
 import Database
 
 __ARCHIVE_PRE_HEADER_REGEX='^Hand #(\d+)\s*$|\*{20}\s#\s\d+\s\*+\s+'
-re_SplitArchive = re.compile(__ARCHIVE_PRE_HEADER_REGEX)
+re_SplitArchive = re.compile(__ARCHIVE_PRE_HEADER_REGEX, re.MULTILINE)
 
 
 class IdentifySite:
     def __init__(self, config, in_path = '-'):
         self.in_path = in_path
         self.config = config
-        self.db = Database.Database(config)
+        self.db = Database.Database(self.config)
         self.sitelist = {}
         self.filelist = {}
         self.generateSiteList()
-        self.walkDirectory(self.in_path, self.sitelist)
+        if os.path.isdir(self.in_path):
+            self.walkDirectory(self.in_path, self.sitelist)
+        else:
+            self.idSite(self.in_path, self.sitelist)
         
     def generateSiteList(self):
         """Generates a ordered dictionary of site, filter and filter name for each site in hhcs"""
@@ -80,7 +83,7 @@ class IdentifySite:
                 for kodec in self.__listof(obj.codepage):
                     try:
                         in_fh = codecs.open(file, 'r', kodec)
-                        whole_file = in_fh.read()
+                        whole_file = in_fh.read(2000)
                         in_fh.close()
                 
                         if info[2] in ('OnGame', 'Winamax'):
@@ -94,7 +97,7 @@ class IdentifySite:
                             if re_SplitArchive.search(whole_file):
                                 archive = True
                         if m:
-                            self.filelist[file] = [info[0]] + [info[1]] + [kodec] + [archive]
+                            self.filelist[file] = [info[1]] + [kodec] + [archive]
                             break
                     except:
                         pass