Skip to content

Commit

Permalink
Organizing
Browse files Browse the repository at this point in the history
  • Loading branch information
@jsarasin
jsarasin committed Apr 19, 2016
1 parent 0692fdb commit 42468df
Show file tree
Hide file tree
Showing 5 changed files with 231 additions and 234 deletions.
178 changes: 88 additions & 90 deletions catchat.py
View file
Original file line number Diff line number Diff line change
@@ -1,134 +1,132 @@
import gi
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk, Pango, Gdk, GObject


import cc_chat
import cc_http
import urllib
import os

import gi
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk, Pango, Gdk, GObject


TARGET_TYPE_URI_LIST = 80

CCHttp = cc_http.cc_http()


def get_file_path_from_dnd_dropped_uri(uri):
# get the path to file
path = ""
if uri.startswith('file:\\\\\\'): # windows
path = uri[8:] # 8 is len('file:///')
elif uri.startswith('file://'): # nautilus, rox
path = uri[7:] # 7 is len('file://')
elif uri.startswith('file:'): # xffm
path = uri[5:] # 5 is len('file:')

path = urllib.url2pathname(path) # escape special chars
path = path.strip('\r\n\x00') # remove \r\n and NULL
# get the path to file
path = ""
if uri.startswith('file:\\\\\\'): # windows
path = uri[8:] # 8 is len('file:///')
elif uri.startswith('file://'): # nautilus, rox
path = uri[7:] # 7 is len('file://')
elif uri.startswith('file:'): # xffm
path = uri[5:] # 5 is len('file:')

return path
path = urllib.url2pathname(path) # escape special chars
path = path.strip('\r\n\x00') # remove \r\n and NULL

return path

class MyWindow(Gtk.Window):
chatroom = cc_chat.cc_chat(CCHttp)

def __init__(self):
chatroom = cc_chat.cc_chat(CCHttp)

#########################
# Setup the main window
Gtk.Window.__init__(self, title="Chat")
self.set_border_width(5)
self.set_size_request(400, 700)
self.set_position(Gtk.WindowPosition.CENTER)
def __init__(self):
#########################
# Setup the main window
Gtk.Window.__init__(self, title="Chat")
self.set_border_width(5)
self.set_size_request(400, 700)
self.set_position(Gtk.WindowPosition.CENTER)

#############################
# Create the internal widgets
#############################
# Create the internal widgets

# Create the chat area box
self.box = Gtk.Box(spacing=5, orientation=Gtk.Orientation.VERTICAL)
self.add(self.box)
# Create the chat area box
self.box = Gtk.Box(spacing=5, orientation=Gtk.Orientation.VERTICAL)
self.add(self.box)

# Create the chat message area
self.chat_scrollwindow = Gtk.ScrolledWindow()
self.chat_scrollwindow.set_vexpand(True)
self.chat_scrollwindow.set_hexpand(False)
# Create the chat message area
self.chat_scrollwindow = Gtk.ScrolledWindow()
self.chat_scrollwindow.set_vexpand(True)
self.chat_scrollwindow.set_hexpand(False)

self.textview = Gtk.TextView()
self.textview.set_editable(False)
self.textview.set_buffer(self.chatroom.chat_history)
self.textview.set_cursor_visible(False)
self.textview.set_wrap_mode(Gtk.WrapMode.WORD_CHAR)
self.textview = Gtk.TextView()
self.textview.set_editable(False)
self.textview.set_buffer(self.chatroom.chat_history)
self.textview.set_cursor_visible(False)
self.textview.set_wrap_mode(Gtk.WrapMode.WORD_CHAR)

self.chat_scrollwindow.add(self.textview)
self.box.add(self.chat_scrollwindow)
self.chat_scrollwindow.add(self.textview)
self.box.add(self.chat_scrollwindow)

# Create the text entry
self.entry = Gtk.Entry()
self.entry.connect("activate", self.on_entry_return)
# Create the text entry
self.entry = Gtk.Entry()
self.entry.connect("activate", self.on_entry_return)

GObject.timeout_add_seconds(2, self.update_chat)
GObject.timeout_add_seconds(2, self.update_chat)



#####################
# Setup the DND Files
self.textview.drag_dest_set(Gtk.DestDefaults.ALL, [Gtk.TargetEntry.new("text/uri-list", 0, 80)], Gdk.DragAction.COPY)
self.textview.drag_dest_add_text_targets();
self.textview.connect("drag-motion", self.drag_over)
self.textview.connect("drag-data-received", self.drag_drop_receive)
#####################
# Setup the DND Files
self.textview.drag_dest_set(Gtk.DestDefaults.ALL, [Gtk.TargetEntry.new("text/uri-list", 0, 80)], Gdk.DragAction.COPY)
self.textview.drag_dest_add_text_targets();
self.textview.connect("drag-motion", self.drag_over)
self.textview.connect("drag-data-received", self.drag_drop_receive)

self.entry.drag_dest_set(Gtk.DestDefaults.ALL, [Gtk.TargetEntry.new("text/uri-list", 0, 80)], Gdk.DragAction.COPY)
self.entry.drag_dest_add_text_targets();
self.entry.connect("drag-motion", self.drag_over)
self.entry.connect("drag-data-received", self.drag_drop_receive)
self.entry.drag_dest_set(Gtk.DestDefaults.ALL, [Gtk.TargetEntry.new("text/uri-list", 0, 80)], Gdk.DragAction.COPY)
self.entry.drag_dest_add_text_targets();
self.entry.connect("drag-motion", self.drag_over)
self.entry.connect("drag-data-received", self.drag_drop_receive)

self.box.add(self.entry)
self.box.add(self.entry)

self.scroll_to_bottom()
self.scroll_to_bottom()


def scroll_to_bottom(self):
marky = self.chatroom.chat_history.get_mark("end" + str(self.chatroom.chat_range_end))
if(marky != None):
self.textview.scroll_to_mark(marky, 0, True, 0,0)
def scroll_to_bottom(self):
marky = self.chatroom.chat_history.get_mark("end" + str(self.chatroom.chat_range_end))
if(marky != None):
self.textview.scroll_to_mark(marky, 0, True, 0,0)

def on_entry_return(self, input):
def on_entry_return(self, input):

if(self.entry.get_text() == ""):
self.update_chat();
return
if(self.entry.get_text() == ""):
self.update_chat();
return

self.chatroom.say(self.entry.get_text())
self.entry.set_text("")
self.chatroom.update()
self.scroll_to_bottom()
self.chatroom.say(self.entry.get_text())
self.entry.set_text("")
self.chatroom.update()
self.scroll_to_bottom()

def drag_over(self, widget, context, x,y, time):
Gdk.drag_status(context, Gdk.DragAction.COPY, time)
return True
def drag_over(self, widget, context, x,y, time):
Gdk.drag_status(context, Gdk.DragAction.COPY, time)
return True

def update_chat(self):
#GObject.idle_add(self.update_chat_worker)
self.chatroom.update()
self.scroll_to_bottom()
def update_chat(self):
#GObject.idle_add(self.update_chat_worker)
self.chatroom.update()
self.scroll_to_bottom()

return True
return True



def drag_drop_receive(self, widget, context, x, y, selection, target_type, time):
if target_type == TARGET_TYPE_URI_LIST:
uri = selection.get_data().strip('\r\n\x00')
uri_splitted = uri.split() # we may have more than one file dropped
for uri in uri_splitted:
path = get_file_path_from_dnd_dropped_uri(uri)
if os.path.isfile(path): # is it file?
hash = self.chatroom.maybe_send_file_return_hash(path)
self.chatroom.say_picture(hash)
self.chatroom.update()
self.scroll_to_bottom()
def drag_drop_receive(self, widget, context, x, y, selection, target_type, time):
if target_type == TARGET_TYPE_URI_LIST:
uri = selection.get_data().strip('\r\n\x00')
uri_splitted = uri.split() # we may have more than one file dropped
for uri in uri_splitted:
path = get_file_path_from_dnd_dropped_uri(uri)
if os.path.isfile(path): # is it file?
hash = self.chatroom.maybe_send_file_return_hash(path)
self.chatroom.say_picture(hash)
self.chatroom.update()
self.scroll_to_bottom()

#data = file(path).read()
#data = file(path).read()



Expand Down
65 changes: 32 additions & 33 deletions cc_chat.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,48 +6,47 @@
import cc_chatbubblerenderer

class cc_chat(object):
chat_history = Gtk.TextBuffer()
bubble_maker = None
cchttp = None
chatroom = 0
chat_range_start = 0
chat_range_end = 0
chat_history = Gtk.TextBuffer()
bubble_maker = None
cchttp = None
chatroom = 0
chat_range_start = 0
chat_range_end = 0

def __init__(self, cchttpv):
self.cchttp = cchttpv
self.bubble_maker = cc_chatbubblerenderer.ChatBubbleRenderer(cchttpv)
self.bubble_maker.setup_tags(self.chat_history)
def __init__(self, cchttpv):
self.cchttp = cchttpv
self.bubble_maker = cc_chatbubblerenderer.ChatBubbleRenderer(cchttpv)
self.bubble_maker.setup_tags(self.chat_history)

reply = self.cchttp.get_chat_from_id_range(self.chatroom)
reply = self.cchttp.get_chat_from_id_range(self.chatroom)

for message in reply['chat_log']:
self.add_message_bubble(message)
for message in reply['chat_log']:
self.add_message_bubble(message)

def add_message_bubble(self, message):
if (message['idchats'] < self.chat_range_start):
self.chat_range_start = message['idchats']
if (message['idchats'] > self.chat_range_end):
self.chat_range_end = message['idchats']
def add_message_bubble(self, message):
if (message['idchats'] < self.chat_range_start):
self.chat_range_start = message['idchats']
if (message['idchats'] > self.chat_range_end):
self.chat_range_end = message['idchats']

self.bubble_maker.get_bubble(message, self.chat_history)
self.bubble_maker.get_bubble(message, self.chat_history)

def say(self, message):
self.cchttp.say(self.chatroom, message)
def say(self, message):
self.cchttp.say(self.chatroom, message)

def say_picture(self, hash):
self.cchttp.say_picture(self.chatroom, hash)
def say_picture(self, hash):
self.cchttp.say_picture(self.chatroom, hash)

def maybe_send_file_return_hash(self, filename):
md5 = self.cchttp.md5(filename)
def maybe_send_file_return_hash(self, filename):
md5 = self.cchttp.md5(filename)

if(self.cchttp.check_hash_exists(md5) == False ):
self.cchttp.send_file(self.chatroom, filename)
if(self.cchttp.check_hash_exists(md5) == False ):
self.cchttp.send_file(self.chatroom, filename)

return md5
return md5


def update(self):
reply = self.cchttp.get_chat_from_id_range(self.chatroom, self.chat_range_end)
for message in reply['chat_log']:
self.add_message_bubble(message)

def update(self):
reply = self.cchttp.get_chat_from_id_range(self.chatroom, self.chat_range_end)
for message in reply['chat_log']:
self.add_message_bubble(message)
Loading

0 comments on commit 42468df

Please sign in to comment.