From: Maxious <maxious@lambdacomplex.org>
Date: Sun, 30 Sep 2012 01:30:00 +0000
Subject: Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=scannr.git&a=commitdiff&h=7d16d6eb99e51155f343c815a9a052810ee04739
---
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr

Conflicts:
scannr.py
---


--- /dev/null
+++ b/.gitmodules
@@ -1,1 +1,4 @@
+[submodule "pynma"]
+	path = pynma
+	url = git://github.com/uskr/pynma.git
 

--- /dev/null
+++ b/README.txt
@@ -1,1 +1,1 @@
-
+ffmpeg from http://ffmpeg.zeranoe.com/builds/

--- /dev/null
+++ b/pynma

--- a/scannr.py
+++ b/scannr.py
@@ -1,21 +1,46 @@
+import logging
+logging.basicConfig(level=logging.DEBUG,
+                    format='%(asctime)s\t%(levelname)s\t%(message)s')
+
 import snd
 import time
 from datetime import date
 import threading
 from pydispatch import dispatcher
 import wave
+import serial
+#python -m serial.tools.miniterm -p COM20 -e -b 115200 --cr
+import psycopg2
+import sys,os
+
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__) or '.', 'pynma'))
+import pynma
 
 filename = "demo.wav"
+MIN_LENGTH = 90000
+nma = pynma.PyNMA( "apikey(s)", "developerkey")    
+conn = psycopg2.connect("dbname=test user=postgres")
 
 def worker(filename):
+
     """thread worker function
     http://www.doughellmann.com/PyMOTW/threading/
+    https://github.com/uskr/pynma
+ffmpeg -i 2012-09-29-1348911268.34-demo.wav -ar 8000 -ab 4.75k test.3gp
+http://stackoverflow.com/questions/2559746/getting-error-while-converting-wav-to-amr-using-ffmpeg
+"""
+    print 'Worker for '+filename
+    ser.write("GLG\r")   
+    line = ser.readline()   # read a '\n' terminated line
+    print line
+    """nma.push(application, event, description, (opt) url,)"""
+    """http://initd.org/psycopg/docs/usage.html"""
+    #cur = conn.cursor()
+    #cur.execute("INSERT INTO test (num, data) VALUES (%s, %s)",(100, "abc'def"))
+    #conn.commit()
+    #cur.close()
 
-    https://github.com/uskr/pynma
-
-http://stackoverflow.com/questions/1092531/event-system-in-python """
-    print 'Worker for '+filename
-    
     return
 
 def filenameMaker():
@@ -25,20 +50,26 @@
 def record_to_async_file():
     "Records from the microphone and outputs the resulting data to `path`"
     sample_width, data = snd.record()
-    data = snd.pack('<' + ('h'*len(data)), *data)
-    path = filename
-    dispatcher.send( signal='FILE_CREATED', sender=filename, filename=filename)
-    wf = wave.open(path, 'wb')
-    wf.setnchannels(1)
-    wf.setsampwidth(sample_width)
-    wf.setframerate(snd.RATE)
-    wf.writeframes(data)
-    wf.close()
-    print("done - result written to "+path)
+    print str(len(data))
+    if len(data) > MIN_LENGTH:
+        data = snd.pack('<' + ('h'*len(data)), *data)
+        path = filename
+        dispatcher.send( signal='FILE_CREATED', sender=filename, filename=filename)
+        wf = wave.open(path, 'wb')
+        wf.setnchannels(1)
+        wf.setsampwidth(sample_width)
+        wf.setframerate(snd.RATE)
+        wf.writeframes(data)
+        wf.close()
+        print("done - result "+str(len(data))+" frames written to "+path)
 
 dispatcher.connect( filenameMaker, signal='SND_STARTED', sender=dispatcher.Any )
 dispatcher.connect( worker, signal='FILE_CREATED', sender=dispatcher.Any )
+
+ser = serial.Serial('COM20', 112500, timeout=1) 
+
 print "Scannr started..."
 while True:
     print "ready to record"
     record_to_async_file()
+ser.close()

--- /dev/null
+++ b/trunklog.php
@@ -1,1 +1,31 @@
-
+<?php
+// http://www.unitrunker.com/logs.html
+/*
+Timestamp as YYYYMMDDHHMMSS
+Site number in unformatted decimal
+Action: Call, Leaves, Joins, Login, Logout, Drop, Add, Busy, Deny, Kill
+Source type I or G
+Source ID in unformatted decimal
+Target type I or G
+Target ID in unformatted decimal
+Channel number in unformatted decimal
+Call Type*/
+$row = 0;
+echo "<table>";
+if (($handle = fopen("C:\Users\Madoka\AppData\Roaming\UniTrunker\S00000001\UniTrunker-20120411.LOG", "r")) !== FALSE) {
+    while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
+        
+        if ($row > 0 && count($data) == 9) {
+            
+        echo "<tr>";
+        for ($c=0; $c < count($data); $c++) {
+            echo '<td>'.$data[$c] . "</td>\n";
+        }
+        echo "</tr>";
+        }
+        $row++;
+    }
+    fclose($handle);
+}
+echo "</table>";
+?>