Merge branch 'master' of https://github.com/datamachine/tg into datamachine-master

Author: vvaltman

.gitignore

@@ -1,6 +1,7 @@
 telegram
 *.o
 Makefile
+aclocal.m4
 autom4te.cache
 config.h
 config.log
@@ -16,4 +17,5 @@ debian/telegram-cli.[a-z]
 debian/files
 debian/telegram-cli/*
 debian/telegram-cli.debhelper.log
-debian/telegram-cli.substvars
+debian/telegram-cli.substvars
+__pycache__

.travis.yml

@@ -9,6 +9,7 @@ install:
  - sudo apt-get install libreadline6-dev
  - sudo apt-get install libssl-dev
  - sudo apt-get install liblua5.2-dev lua5.2
+ - sudo apt-get install python-dev python
  - sudo apt-get install libevent-dev
  - sudo apt-get install libjansson-dev
 

Makefile.in

@@ -4,10 +4,9 @@ CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@ @OPENSSL_LDFLAGS@
 CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@
 DEFS=@DEFS@
-COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra -Werror -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC
-
+COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Werror -Wextra -Wno-missing-field-initializers -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC
 EXTRA_LIBS=@LIBS@ @EXTRA_LIBS@ @OPENSSL_LIBS@
-LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS}
+LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS} -ldl -lpthread -lutil
 LINK_FLAGS=${LDFLAGS} ${LOCAL_LDFLAGS}
 
 DEP=dep
@@ -19,7 +18,7 @@ DIR_LIST=${DEP} ${AUTO} ${EXE} ${OBJ} ${LIB} ${DEP}/auto ${OBJ}/auto
 
 EXE_LIST=${EXE}/telegram-cli
 
-TG_OBJECTS=${OBJ}/main.o ${OBJ}/loop.o ${OBJ}/interface.o ${OBJ}/lua-tg.o ${OBJ}/json-tg.o
+TG_OBJECTS=${OBJ}/main.o ${OBJ}/loop.o ${OBJ}/interface.o ${OBJ}/lua-tg.o ${OBJ}/json-tg.o ${OBJ}/python-tg.o ${OBJ}/python-types.o
 
 INCLUDE=-I. -I${srcdir} -I${srcdir}/tgl
 CC=@CC@

README-PY

@@ -0,0 +1,95 @@
+To use python with client you should write python script. You can specify it from config ("python_script" option) or from command_line [-Z].
+
+You should set the following callbacks in your script:
+  tgl.on_binlog_replay_end() - it is called when replay of old events end. Any updates prior this call were already received by this client
+                           some time ago. 
+  
+  tgl.on_get_difference_end() - it is called after first get_difference call. So we received all updates after last client execute.
+
+  tgl.on_our_id(our_id) - Informs about id of currently logged in user.
+
+  tgl.on_msg_receive(msg) - it is called when we receive new msg (!! may be called before on_binlog_replay_end, than it is old msg).
+
+  tgl.on_user_update(peer, what_changed) - updated info about user. what_changed is array of strings.
+  tgl.on_chat_update(peer, what_changed) - updated info about user. what_changed is array of strings.
+  tgl.on_secret_chat_update(peer, what_changed) - updated info about user. what_changed is array of strings.
+
+
+
+Also, you can call several functions. Each this function last two arguments, are callback, which is a python function implementing the callback from the function.
+These functions may return false immidiately if something is bad with args, or return true and call cb_function in future.
+The callback function should have one arguments: first success (True or False), and the rest depends on the call.
+Functions that require a peer type other than what is passed will raise tgl.PeerError.
+
+
+Function_list (arguments are listed aside from callback, import tgl for access) :
+  tgl.get_contact_list ()
+  tgl.get_dialog_list ()
+  
+  tgl.rename_chat (peer, new_name)
+  tgl.chat_set_photo (peer, file)
+  
+  tgl.send_typing (peer)
+  tgl.send_typing_abort (peer)
+  
+  tgl.send_msg (peer, text)
+  tgl.fwd_msg (peer, msg)
+  
+  tgl.send_photo (peer, file)
+  tgl.send_video (peer, file)
+  tgl.send_audio (peer, file)
+  tgl.send_document (peer, file)
+  tgl.send_text (peer, file)
+
+  tgl.load_photo(msg)
+  tgl.load_video(msg)
+  tgl.load_video_thumb(msg)
+  tgl.load_audio(msg)
+  tgl.load_document(msg)
+  tgl.load_document_thumb(msg)
+
+  tgl.info (peer)
+
+  tgl.get_history (peer, limit)
+  
+  tgl.chat_add_user (peer, user)
+  tgl.chat_del_user (peer, user)
+ 
+  tgl.add_contact (phone, first_name, last_name)
+  tgl.rename_contact (phone, first_name, last_name) 
+  
+  tgl.msg_search (peer, text)
+  tgl.msg_global_search (text)
+
+  tgl.mark_read (peer)
+
+  tgl.set_profile_photo (file)
+  
+  tgl.create_secret_chat (user)
+  tgl.create_group_chat (peer, name)
+  
+  tgl.delete_msg (msg)
+  tgl.restore_msg (msg_id)
+
+  tgl.status_online ()
+  tgl.status_offline ()
+
+  tgl.send_location (peer, latitude, longitude)
+
+Additionally, the tgl.Peer object has the following direct methods:
+  peer.rename_chat(new_name)
+  peer.chat_set_photo(file)
+  peer.send_typing()
+  peer.send_typing_abort()
+  peer.send_msg(text)
+  peer.send_photo(file)
+  peer.send_video(file)
+  peer.send_document(file)
+  peer.send_text(file)
+  peer.info()
+  peer.history(limit, offset)
+  peer.add_user(peer)
+  peer.del_user(peer)
+  peer.search(text)
+  peer.mark_read()
+  peer.send_location(latitude, longitude)

README.md

@@ -24,30 +24,35 @@ Clone GitHub Repository
 
      git clone --recursive https://github.com/vysheng/tg.git && cd tg
 
+### Python Support
+
+Python support is currently limited to Python 2.7 or Python 3.1+. Other versions may work but are not tested.
+
 #### Linux and BSDs
 
-Install libs: readline, openssl and (if you want to use config) libconfig, liblua and libjansson.
-If you do not want to use them pass options --disable-libconfig, --disable-liblua and --disable-json respectively.
+Install libs: readline, openssl and (if you want to use config) libconfig, liblua, python and libjansson.
+If you do not want to use them pass options --disable-libconfig, --disable-liblua, --disable-python and --disable-json respectively.
 
 On Ubuntu/Debian use: 
 
-     sudo apt-get install libreadline-dev libconfig-dev libssl-dev lua5.2 liblua5.2-dev libevent-dev libjansson-dev make
+     sudo apt-get install libreadline-dev libconfig-dev libssl-dev lua5.2 liblua5.2-dev libevent-dev libjansson-dev libpython-dev make 
 
 On gentoo:
 
-     sudo emerge -av sys-libs/readline dev-libs/libconfig dev-libs/openssl dev-lang/lua dev-libs/libevent dev-libs/jansson
+     sudo emerge -av sys-libs/readline dev-libs/libconfig dev-libs/openssl dev-lang/lua dev-libs/libevent dev-libs/jansson dev-lang/python
 
 On Fedora:
 
      sudo yum install lua-devel openssl-devel libconfig-devel readline-devel libevent-devel libjansson-devel
+     sudo yum install lua-devel openssl-devel libconfig-devel readline-devel libevent-devel python-devel
 
 On FreeBSD:
 
-     pkg install libconfig libexecinfo lua52
+     pkg install libconfig libexecinfo lua52 python
 
 On OpenBSD:
 
-     pkg_add libconfig libexecinfo lua
+     pkg_add libconfig libexecinfo lua python
 
 Then,
 
@@ -69,6 +74,7 @@ If using [Homebrew](http://brew.sh/):
      brew install libconfig
      brew install readline
      brew install lua
+     brew install python
      brew install libevent
      export CFLAGS="-I/usr/local/include -I/usr/local/Cellar/readline/6.3.8/include"
      export LDFLAGS="-L/usr/local/lib -L/usr/local/Cellar/readline/6.3.8/lib"
@@ -81,6 +87,7 @@ If using [MacPorts](https://www.macports.org):
      sudo port install libconfig-hr
      sudo port install readline
      sudo port install lua51
+     sudo port install python34
      sudo port install libevent
      export CFLAGS="-I/usr/local/include -I/opt/local/include -I/opt/local/include/lua-5.1"
      export LDFLAGS="-L/usr/local/lib -L/opt/local/lib -L/opt/local/lib/lua-5.1"

ax_python.m4

@@ -0,0 +1,109 @@
+# ===========================================================================
+#         http://www.gnu.org/software/autoconf-archive/ax_python.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PYTHON
+#
+# DESCRIPTION
+#
+#   This macro does a complete Python development environment check.
+#
+#   It recurses through several python versions (from 2.1 to 2.6 in this
+#   version), looking for an executable. When it finds an executable, it
+#   looks to find the header files and library.
+#
+#   It sets PYTHON_BIN to the name of the python executable,
+#   PYTHON_INCLUDE_DIR to the directory holding the header files, and
+#   PYTHON_LIB to the name of the Python library.
+#
+#   This macro calls AC_SUBST on PYTHON_BIN (via AC_CHECK_PROG),
+#   PYTHON_INCLUDE_DIR and PYTHON_LIB.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Michael Tindal
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 14
+
+AC_DEFUN([AX_PYTHON],
+[AC_MSG_CHECKING(for python build information)
+AC_MSG_RESULT([])
+for python in python3.4 python3.3 python3.2 python3.1 python3 python2.7 python2.6 python2 python; do
+AC_CHECK_PROGS(PYTHON_BIN, [$python])
+ax_python_bin=$PYTHON_BIN
+if test x$ax_python_bin != x; then
+   AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
+   if test x$ax_python_lib == xno; then
+     AC_CHECK_LIB(${ax_python_bin}m, main, ax_python_lib=${ax_python_bin}m, ax_python_lib=no)
+   fi
+   if test x$ax_python_lib != xno; then
+     ax_python_header=`$ax_python_bin -c "from distutils.sysconfig import *; print(get_config_var('CONFINCLUDEPY'))"`
+     if test x$ax_python_header != x; then
+       break;
+     fi
+   fi
+fi
+unset ac_cv_prog_PYTHON_BIN
+unset PYTHON_BIN
+done
+if test x$ax_python_bin = x; then
+   ax_python_bin=no
+fi
+if test x$ax_python_header = x; then
+   ax_python_header=no
+fi
+if test x$ax_python_lib = x; then
+   ax_python_lib=no
+fi
+
+AC_MSG_RESULT([  results of the Python check:])
+AC_MSG_RESULT([    Binary:      $ax_python_bin])
+AC_MSG_RESULT([    Library:     $ax_python_lib])
+AC_MSG_RESULT([    Include Dir: $ax_python_header])
+
+
+PYTHON_FOUND=yes
+if test x$ax_python_header != xno; then
+  PYTHON_INCLUDE_DIR=$ax_python_header
+  AC_SUBST(PYTHON_INCLUDE_DIR)
+else 
+  PYTHON_FOUND=no
+fi
+
+if test x$ax_python_lib != xno; then
+  PYTHON_LIB=$ax_python_lib
+  AC_SUBST(PYTHON_LIB)
+else
+  PYTHON_FOUND=no
+fi
+AC_SUBST(PYTHON_FOUND)
+
+])dnl

bootstrap

@@ -0,0 +1,6 @@
+#! /bin/sh
+
+aclocal 
+autoheader
+automake --gnu --add-missing 
+autoconf

config.h.in

@@ -164,6 +164,9 @@
 /* use lua */
 #undef USE_LUA
 
+/* use python */
+#undef USE_PYTHON
+
 /* fixed for correct valgrind work */
 #undef VALGRIND_FIXES