Updated pa.c format specification to version 3.3. Now setup.py collects all documentation, including license.txt

Added version indication on the issue-reporting system

.gitignore

@@ -16,4 +16,5 @@ src/Microsoft.VC90.CRT
 src/Microsoft.VC90.MFC
 src/launcher.bat
 src/sounds/iOs
-release-snapshot/
+release-snapshot/
+src/com_cache/

README.md

@@ -1,13 +1,12 @@
 TWBlue -
 ======
 
-Copyright (C) 2015. [Technow S.L.](https://www.technow.es)
+Copyright (C) 2016. [Technow S.L.](https://www.technow.es)
 
 TW Blue is an app designed to use Twitter simply and efficiently while using minimal system resources.
 With this app you’ll have access to twitter features such as:
 
-* Create, reply to, retweet and delete tweets,
+* Create, reply to, like, retweet and delete tweets,
-* Add and remove tweets from favourites,
 * Send and delete direct messages,
 * See your friends and followers,
 * Follow, unfollow, block and report users as spam,
@@ -18,9 +17,9 @@ With this app you’ll have access to twitter features such as:
 
 See [TWBlue's webpage](http://twblue.es) for more details.
 
-## Using TWBlue from sources
+## Running TWBlue from source
 
-This document describes how to run tw blue from source, and, after that, how to build a binary version, which doesn't need Python and the other dependencies to run.
+This document describes how to run tw blue from source and how to build a binary version which doesn't need Python and the other dependencies to run.
 
 ### Required dependencies.
 
@@ -36,7 +35,6 @@ Although most dependencies can be found in the windows-dependencies directory, w
 If you want to build both x86 and x64 binaries, you can install python x86 to C:\python27 and python x64 to C:\python27x64, for example.
 * [wxPython](http://www.wxpython.org) for Python 2.7, version 3.0.2.0
 * [Python windows extensions (pywin32)](http://www.sourceforge.net/projects/pywin32/) for python 2.7, build 220
-* [Pycurl](http://pycurl.sourceforge.net) 7.21.5 for Python 2.7: [downloads](https://pypi.python.org/pypi/pycurl/7.21.5)
 * [PyEnchant,](http://pythonhosted.org/pyenchant/) version 1.6.6.  
 x64 version has been built by TWBlue developers, so you only will find it in windows-dependencies folder
 
@@ -48,7 +46,7 @@ To build a binary version:
 
 #### Dependencies that must be installed using easy_install
 
-setuptools install a script, called easy_install. You can find it in the python scripts directory. To install packages using easy_install, you have to navigate to the scripts directory using a command prompt, for example:
+setuptools installs a script, called easy_install. You can find it in the python scripts directory. To install packages using easy_install, you have to navigate to the scripts directory using a command prompt, for example:
 
     cd C:\python27x64\scripts
 
@@ -64,6 +62,7 @@ setuptools install a script, called easy_install. You can find it in the python
 * pypubsub
 * configobj
 * requests-oauthlib
+* requests-toolbelt
 * future
 * pygeocoder
 * suds
@@ -74,7 +73,7 @@ setuptools install a script, called easy_install. You can find it in the python
 
 easy_install will automatically get the additional libraries that these packages need to work properly.
 Run the following command to quickly install and upgrade all packages and their dependencies:
-easy_install -Z --upgrade six configobj goslate markdown future suds requests oauthlib requests-oauthlib pypubsub pygeocoder arrow python-dateutil futures markdown microsofttranslator
+easy_install -Z --upgrade six configobj goslate markdown future suds requests oauthlib requests-oauthlib requests-toolbelt pypubsub pygeocoder arrow==0.6 python-dateutil futures markdown microsofttranslator winpaths
 
 #### Other dependencies
 
@@ -91,8 +90,11 @@ This dependency has been built using pure basic 4.61. Its source can be found at
 
 #### Dependencies required to build the portableApps.com format archive
 
+* [NSIS Unicode Portable,](http://portableapps.com/apps/development/nsis_portable) version 2.46.5 rev 3
 * [PortableApps.com Launcher,](http://portableapps.com/apps/development/portableapps.com_launcher) version 2.2
-* [PortableApps.com Installer,](http://portableapps.com/apps/development/portableapps.com_installer) version 3.0.20
+* [PortableApps.com Installer,](http://portableapps.com/apps/development/portableapps.com_installer) version 3.1.3
+
+Important! Install these 3 apps into the same folder, otherwise you won't be able to build the pa.c version. For example: D:\portableApps\NSISPortable, D:\PortableApps\PortableApps.com installer, ...
 
 ### Running TW Blue from source
 
@@ -121,7 +123,7 @@ To build it, run the following command from the src folder:
 
 ### Building an installer
 
-If you want to install TWBlue in your computer, you must create the installer first. Follow these steps:
+If you want to install TWBlue on your computer, you must create the installer first. Follow these steps:
 
 * Navigate to the src directory, and create a binary version for x86: C:\python27\python setup.py py2exe
 * Move the dist directory to the scripts folder in this repo, and rename it to twblue
@@ -136,7 +138,7 @@ Run the gen_pot.bat file, located in the tools directory. Your python installati
 
 ### How to build the portableApps.com archive
 
-If you want to have TWBlue in your PortableApps.com platform, follow these steps:
+If you want to have TWBlue on your PortableApps.com platform, follow these steps:
 
 * Navigate to the src directory, and create a binary version for x86: C:\python27\python setup.py py2exe
 * Move the dist directory to the misc\pa.c format\app folder in this repo, and rename it to twblue

contributors.txt

@@ -34,4 +34,12 @@ Holly Scott-Gardner
 Anibal Hernández
 Sussan Leiva
 Brian Hartgen
-PEDRO REINA COLOBON
+PEDRO REINA COLOBON
+Moora-Moora Arrilla
+Blake Oliver
+Steffen Schultz
+Riku
+Burak Yüksek
+florian Ionașcu
+Christian Leo Mameli
+Natalia Hedlund (Наталья Хедлунд)

doc/application.py

@@ -2,6 +2,17 @@
 name = 'TWBlue'
 snapshot = False
 if snapshot == False:
- version = "0.80"
+ version = "0.82"
+ update_url = 'http://twblue.es/updates/twblue_ngen.json'
+ mirror_update_url = 'https://raw.githubusercontent.com/manuelcortez/TWBlue/next-gen/updates/stable.json'
 else:
- version = "7"
+ version = "10.99"
+ update_url = 'http://twblue.es/updates/snapshots_ngen.json'
+ mirror_update_url = 'https://raw.githubusercontent.com/manuelcortez/TWBlue/next-gen/updates/snapshots.json'
+author = u"Manuel Cortéz"
+authorEmail = "manuel@manuelcortez.net"
+copyright = u"Copyright (C) 2015, Technow S.L. \nCopyright (C) 2013-2015, Manuel cortéz."
+description = unicode(name+" is an app designed to use Twitter simply and efficiently while using minimal system resources. This app provides access to most Twitter features.")
+translators = [u"Bryner Villalobos, Bill Dengler (English)", u"Mohammed Al Shara (Arabic)", u"Joan Rabat, Juan Carlos Rivilla (Catalan)", u"Manuel cortéz (Spanish)", u"Sukil Etxenike Arizaleta (Basque)", u"Jani Kinnunen (finnish)", u"Rémy Ruiz (French)", u"Juan Buño (Galician)", u"Steffen Schultz (German)", u"Robert Osztolykan (Hungarian)", u"Paweł Masarczyk (Polish)", u"Odenilton Júnior Santos (Portuguese)", u"Alexander Jaszyn (Russian)", u"Burak (Turkish)"]
+url = u"http://twblue.es"
+report_bugs_url = "http://twblue.es/bugs/api/soap/mantisconnect.php?wsdl"

doc/generator.py

@@ -7,7 +7,7 @@ languageHandler.setLanguage("en")
 import strings
 
 # the list of supported language codes of TW Blue
-languages = ["en", "es", "fr", "de", "it", "gl", "ja"]
+languages = ["en", "es", "fr", "de", "it", "gl", "ja", "ru"]
 #"eu", "ar", "ca", "es", "fi", "fr", "gl", "hu", "it", "pl", "pt", "ru", "tr"]
 
 def generate_document(language):

mysc/pa.c format/App/AppInfo/appinfo.ini

@@ -1,6 +1,6 @@
 [Format]
 Type=PortableApps.comFormat
-Version=3.0
+Version=3.3
 
 [Details]
 Name=tw blue portable
@@ -20,8 +20,8 @@ CommercialUse=true
 EULAVersion=2
 
 [Version]
-PackageVersion=0.80.0.0
+PackageVersion=0.82.0.0
-DisplayVersion=0.80
+DisplayVersion=0.82
 
 [Control]
 Icons=1

scripts/twblue.nsi

@@ -12,10 +12,10 @@ SetCompress auto
 SetCompressor /solid lzma
 SetDatablockOptimize on
 VIAddVersionKey ProductName "TWBlue"
-VIAddVersionKey LegalCopyright "Copyright 2015 Manuel Cortéz."
+VIAddVersionKey LegalCopyright "Copyright 2016 Manuel Cortéz."
-VIAddVersionKey ProductVersion "0.80"
+VIAddVersionKey ProductVersion "0.82"
-VIAddVersionKey FileVersion "0.80"
+VIAddVersionKey FileVersion "0.82"
-VIProductVersion "0.80.0.0"
+VIProductVersion "0.82.0.0"
 !insertmacro MUI_PAGE_WELCOME
 !define MUI_LICENSEPAGE_RADIOBUTTONS
 !insertmacro MUI_PAGE_LICENSE "license.txt"
@@ -69,10 +69,10 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "D
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "UninstallString" '"$INSTDIR\uninstall.exe"'
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall" "InstallLocation" $INSTDIR
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall" "Publisher" "Manuel Cortéz"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "DisplayVersion" "0.80"
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "DisplayVersion" "0.82"
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "URLInfoAbout" "http://twblue.es"
 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "VersionMajor" 0
-WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "VersionMinor" 80
+WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "VersionMinor" 82
 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "NoModify" 1
 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\twblue" "NoRepair" 1
 SectionEnd

src/Conf.defaults

@@ -39,6 +39,3 @@ spelling_language = string(default="")
 save_followers_in_autocompletion_db = boolean(default=False)
 save_friends_in_autocompletion_db = boolean(default=False)
 twishort_enabled = boolean(default=False)
-
-[services]
-pocket_access_token = string(default="")

src/app-configuration.defaults

@@ -15,6 +15,7 @@ speak_ready_msg = boolean(default=True)
 log_level = string(default="error")
 load_keymap = string(default="default.keymap")
 donation_dialog_displayed = boolean(default=False)
+check_for_updates = boolean(default=True)
 
 [proxy]
 server = string(default="")

src/application.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 name = 'TWBlue'
-snapshot = True
+snapshot = False
 if snapshot == False:
- version = "0.80"
+ version = "0.82"
  update_url = 'http://twblue.es/updates/twblue_ngen.json'
+ mirror_update_url = 'https://raw.githubusercontent.com/manuelcortez/TWBlue/next-gen/updates/stable.json'
 else:
  version = "10.99"
  update_url = 'http://twblue.es/updates/snapshots_ngen.json'
+ mirror_update_url = 'https://raw.githubusercontent.com/manuelcortez/TWBlue/next-gen/updates/snapshots.json'
 author = u"Manuel Cortéz"
 authorEmail = "manuel@manuelcortez.net"
 copyright = u"Copyright (C) 2015, Technow S.L. \nCopyright (C) 2013-2015, Manuel cortéz."

src/audio_services/services.py

@@ -10,7 +10,7 @@ def convert_audioboom(url):
  audio_id = url.split('.com/')[-1]
  return 'https://audioboom.com/%s.mp3' % audio_id
 
-@matches_url ('http://soundcloud.com/')
+@matches_url ('https://soundcloud.com/')
 def convert_soundcloud (url):
  client_id = "df8113ca95c157b6c9731f54b105b473"
  permalink = urllib.urlopen ('http://api.soundcloud.com/resolve.json?client_id=%s&url=%s' %(client_id, url))

src/config_utils.py

@@ -3,6 +3,9 @@ from configobj import ConfigObj, ParseError
 from validate import Validator, ValidateError
 import os
 import string
+from logging import getLogger
+log = getLogger("config_utils")
+
 class ConfigLoadError(Exception): pass
 
 def load_config(config_path, configspec_path=None, *args, **kwargs):
@@ -14,10 +17,12 @@ def load_config(config_path, configspec_path=None, *args, **kwargs):
  except ParseError:
   raise ConfigLoadError("Unable to load %r" % config_path)
  validator = Validator()
- validated = config.validate(validator, copy=True)
+ validated = config.validate(validator, preserve_errors=False, copy=True)
  if validated == True:
   config.write()
   return config
+ else:
+  log.exception("Error in config file: {0}".format(validated,))
 
 def is_blank(arg):
  "Check if a line is blank."
@@ -25,6 +30,7 @@ def is_blank(arg):
   if c not in string.whitespace:
    return False
  return True
+
 def get_keys(path):
  "Gets the keys of a configobj config file."
  res=[]

src/controller/attach.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+import os
+import widgetUtils
+import logging
+from wxUI.dialogs import attach as gui
+log = logging.getLogger("controller.attach")
+
+class attach(object):
+	def __init__(self):
+		self.attachments = list()
+		self.dialog = gui.attachDialog()
+		widgetUtils.connect_event(self.dialog.photo, widgetUtils.BUTTON_PRESSED, self.upload_image)
+		widgetUtils.connect_event(self.dialog.remove, widgetUtils.BUTTON_PRESSED, self.remove_attachment)
+		self.dialog.get_response()
+		log.debug("Attachments controller started.")
+
+	def upload_image(self, *args, **kwargs):
+		image, description  = self.dialog.get_image()
+		if image != None:
+			imageInfo = {"type": "photo", "file": image, "description": description}
+			log.debug("Image data to upload: %r" % (imageInfo,))
+			self.attachments.append(imageInfo)
+			info = [_(u"Photo"), description]
+			self.dialog.attachments.insert_item(False, *info)
+			self.dialog.remove.Enable(True)
+
+	def remove_attachment(self, *args, **kwargs):
+		current_item = self.dialog.attachments.get_selected()
+		log.debug("Removing item %d" % (current_item,))
+		if current_item == -1: current_item = 0
+		self.attachments.pop(current_item)
+		self.dialog.attachments.remove_item(current_item)
+		self.check_remove_status()
+		log.debug("Removed")
+
+	def check_remove_status(self):
+		if len(self.attachments) == 0 and self.dialog.attachments.get_count() == 0:
+			self.dialog.remove.Enable(False)

src/controller/buffersController.py

@@ -49,6 +49,7 @@ class bufferController(object):
 
 
  def get_event(self, ev):
+  """ Catches key presses in the WX interface and generate the corresponding event names."""
   if ev.GetKeyCode() == wx.WXK_RETURN and ev.ControlDown(): event = "audio"
   elif ev.GetKeyCode() == wx.WXK_RETURN: event = "url"
   elif ev.GetKeyCode() == wx.WXK_F5: event = "volume_down"
@@ -136,16 +137,25 @@ class bufferController(object):
    self.session.settings["mysc"]["twishort_enabled"] = tweet.message.long_tweet.GetValue()
    text = tweet.message.get_text()
    if len(text) > 140 and tweet.message.get("long_tweet") == True:
-    if tweet.image == None:
+    if not hasattr(tweet, "attachments"):
      text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text)
     else:
      text = twishort.create_tweet(self.session.settings["twitter"]["user_key"], self.session.settings["twitter"]["user_secret"], text, 1)
-   if tweet.image == None:
+   if not hasattr(tweet, "attachments") or len(tweet.attachments) == 0:
     call_threaded(self.session.api_call, call_name="update_status", status=text)
    else:
-    call_threaded(self.session.api_call, call_name="update_status_with_media", status=text, media=tweet.image)
+    call_threaded(self.post_with_media, text=text, attachments=tweet.attachments)
   if hasattr(tweet.message, "destroy"): tweet.message.destroy()
 
+ def post_with_media(self, text, attachments):
+  media_ids = []
+  for i in attachments:
+   photo = open(i["file"], "rb")
+   img = self.session.twitter.twitter.upload_media(media=photo)
+   self.session.twitter.twitter.set_description(media_id=img["media_id"], alt_text=dict(text=i["description"]))
+   media_ids.append(img["media_id"])
+  self.session.twitter.twitter.update_status(status=text, media_ids=media_ids)
+
  def save_positions(self):
   try:
    self.session.db[self.name+"_pos"]=self.buffer.list.get_selected()
@@ -200,7 +210,7 @@ class accountPanel(bufferController):
 
 class emptyPanel(bufferController):
  def __init__(self, parent, name, account):
-  super(emptyPanel, self).__init__(parent, None, name)
+  super(emptyPanel, self).__init__(parent=parent)
   log.debug("Initializing buffer %s, account %s" % (name, account,))
   self.buffer = buffers.emptyPanel(parent, name)
   self.type = self.buffer.type
@@ -242,11 +252,11 @@ class baseBufferController(bufferController):
   tweet = self.get_right_tweet()
   tweetsList = []
   tweet_id = tweet["id"]
-  uri = None
+  message = None
-  if tweet.has_key("long_uri"):
+  if tweet.has_key("message"):
-   uri = tweet["long_uri"]
+   message = tweet["message"]
   try:
-   tweet = self.session.twitter.twitter.show_status(id=tweet_id)
+   tweet = self.session.twitter.twitter.show_status(id=tweet_id, include_ext_alt_text=True)
    urls = utils.find_urls_in_text(tweet["text"])
    for url in range(0, len(urls)):
     try:  tweet["text"] = tweet["text"].replace(urls[url], tweet["entities"]["urls"][url]["expanded_url"])
@@ -254,14 +264,13 @@ class baseBufferController(bufferController):
   except TwythonError as e:
    utils.twitter_error(e)
    return
-  if uri != None:
+  if message != None:
-   tweet["text"] = twishort.get_full_text(uri)
+   tweet["message"] = message
   l = tweets.is_long(tweet)
   while l != False:
    tweetsList.append(tweet)
-   id = tweets.get_id(l)
    try:
-    tweet = self.session.twitter.twitter.show_status(id=id)
+    tweet = self.session.twitter.twitter.show_status(id=l, include_ext_alt_text=True)
     urls = utils.find_urls_in_text(tweet["text"])
     for url in range(0, len(urls)):
      try:  tweet["text"] = tweet["text"].replace(urls[url], tweet["entities"]["urls"][url]["expanded_url"])
@@ -300,7 +309,9 @@ class baseBufferController(bufferController):
   except TwythonError as e:
    output.speak(e.message, True)
   for i in items:
-   if utils.is_allowed(i, self.session.settings["twitter"]["ignored_clients"]) == True:
+   if utils.is_allowed(i, self.session.settings["twitter"]["ignored_clients"]) == True and utils.find_item(i["id"], self.session.db[self.name]) == None:
+    i = self.session.check_quoted_status(i)
+    i = self.session.check_long_tweet(i)
     elements.append(i)
     if self.session.settings["general"]["reverse_timelines"] == False:
      self.session.db[self.name].insert(0, i)
@@ -326,6 +337,7 @@ class baseBufferController(bufferController):
    if dlg == widgetUtils.YES:
     if self.name[:-9] in self.session.settings["other_buffers"]["timelines"]:
      self.session.settings["other_buffers"]["timelines"].remove(self.name[:-9])
+     self.session.db.pop(self.name)
      return True
    elif dlg == widgetUtils.NO:
     return False
@@ -334,6 +346,7 @@ class baseBufferController(bufferController):
    if dlg == widgetUtils.YES:
     if self.name[:-9] in self.session.settings["other_buffers"]["favourites_timelines"]:
      self.session.settings["other_buffers"]["favourites_timelines"].remove(self.name[:-9])
+     self.session.db.pop(self.name)
      return True
    elif dlg == widgetUtils.NO:
     return False
@@ -341,7 +354,15 @@ class baseBufferController(bufferController):
    output.speak(_(u"This buffer is not a timeline; it can't be deleted."), True)
    return False
 
+ def remove_tweet(self, id):
+  if type(self.session.db[self.name]) == dict: return
+  for i in xrange(0, len(self.session.db[self.name])):
+   if self.session.db[self.name][i]["id"] == id:
+    self.session.db[self.name].pop(i)
+    self.remove_item(i)
+
  def put_items_on_list(self, number_of_items):
+  if number_of_items == 0: return
   log.debug("The list contains %d items " % (self.buffer.list.get_count(),))
   log.debug("Putting %d items on the list" % (number_of_items,))
   if self.buffer.list.get_count() == 0:
@@ -351,11 +372,14 @@ class baseBufferController(bufferController):
    self.buffer.set_position(self.session.settings["general"]["reverse_timelines"])
   elif self.buffer.list.get_count() > 0:
    if self.session.settings["general"]["reverse_timelines"] == False:
-    for i in self.session.db[self.name][:number_of_items]:
+    items = self.session.db[self.name][len(self.session.db[self.name])-number_of_items:]
+    for i in items:
      tweet = self.compose_function(i, self.session.db, self.session.settings["general"]["relative_times"])
      self.buffer.list.insert_item(False, *tweet)
    else:
-    for i in self.session.db[self.name][0:number_of_items]:
+    items = self.session.db[self.name][0:number_of_items]
+    items.reverse()
+    for i in items:
      tweet = self.compose_function(i, self.session.db, self.session.settings["general"]["relative_times"])
      self.buffer.list.insert_item(True, *tweet)
   log.debug("Now the list contains %d items " % (self.buffer.list.get_count(),))
@@ -664,6 +688,7 @@ class listBufferController(baseBufferController):
   if dlg == widgetUtils.YES:
    if self.name[:-5] in self.session.settings["other_buffers"]["lists"]:
     self.session.settings["other_buffers"]["lists"].remove(self.name[:-5])
+    self.session.db.pop(self.name)
     return True
   elif dlg == widgetUtils.NO:
    return False
@@ -735,6 +760,7 @@ class peopleBufferController(baseBufferController):
    if dlg == widgetUtils.YES:
     if self.name[:-10] in self.session.settings["other_buffers"]["followers_timelines"]:
      self.session.settings["other_buffers"]["followers_timelines"].remove(self.name[:-10])
+     self.session.db.pop(self.name)
      return True
    elif dlg == widgetUtils.NO:
     return False
@@ -743,6 +769,7 @@ class peopleBufferController(baseBufferController):
    if dlg == widgetUtils.YES:
     if self.name[:-8] in self.session.settings["other_buffers"]["friends_timelines"]:
      self.session.settings["other_buffers"]["friends_timelines"].remove(self.name[:-8])
+     self.session.db.pop(self.name)
      return True
    elif dlg == widgetUtils.NO:
     return False
@@ -819,7 +846,7 @@ class peopleBufferController(baseBufferController):
 #   self.buffer.set_list_position()
   elif self.buffer.list.get_count() > 0:
    if self.session.settings["general"]["reverse_timelines"] == False:
-    for i in self.session.db[self.name]["items"][:number_of_items]:
+    for i in self.session.db[self.name]["items"][len(self.session.db[self.name]["items"])-number_of_items:]:
      tweet = self.compose_function(i, self.session.db)
      self.buffer.list.insert_item(False, *tweet)
    else:
@@ -892,6 +919,7 @@ class searchBufferController(baseBufferController):
    if self.name[:-11] in self.session.settings["other_buffers"]["tweet_searches"]:
     self.session.settings["other_buffers"]["tweet_searches"].remove(self.name[:-11])
     self.timer.cancel()
+    self.session.db.pop(self.name)
     return True
   elif dlg == widgetUtils.NO:
    return False
@@ -932,6 +960,7 @@ class searchPeopleBufferController(peopleBufferController):
    if self.name[:-11] in self.session.settings["other_buffers"]["tweet_searches"]:
     self.session.settings["other_buffers"]["tweet_searches"].remove(self.name[:-11])
     self.timer.cancel()
+    self.session.db.pop(self.name)
     return True
   elif dlg == widgetUtils.NO:
    return False
@@ -955,10 +984,10 @@ class trendsBufferController(bufferController):
   self.get_formatted_message = self.get_message
   self.reply = self.search_topic
 
- def start_stream(self):
+ def start_stream(self, mandatory=False):
   # starts stream every 3 minutes.
   current_time = time.time()
-  if self.execution_time == 0 or current_time-self.execution_time >= 180:
+  if self.execution_time == 0 or current_time-self.execution_time >= 180 or mandatory == True:
    self.execution_time = current_time
    try:
     data = self.session.call_paged("get_place_trends", id=self.trendsFor)
@@ -999,10 +1028,14 @@ class trendsBufferController(bufferController):
    if self.name[:-3] in self.session.settings["other_buffers"]["trending_topic_buffers"]:
     self.session.settings["other_buffers"]["trending_topic_buffers"].remove(self.name[:-3])
     self.timer.cancel()
+    self.session.db.pop(self.name)
     return True
   elif dlg == widgetUtils.NO:
    return False
 
+ def url(self, *args, **kwargs):
+  self.tweet_about_this_trend()
+
  def search_topic(self, *args, **kwargs):
   topic = self.trends[self.buffer.list.get_selected()]["name"]
   pub.sendMessage("search", term=topic)
@@ -1052,10 +1085,10 @@ class trendsBufferController(bufferController):
 
 class conversationBufferController(searchBufferController):
 
- def start_stream(self, start=False):
+ def start_stream(self, start=False, mandatory=False):
   # starts stream every 3 minutes.
   current_time = time.time()
-  if self.execution_time == 0 or current_time-self.execution_time >= 180:
+  if self.execution_time == 0 or current_time-self.execution_time >= 180 or mandatory == True:
    self.execution_time = current_time
    if start == True:
     self.statuses = []
@@ -1064,7 +1097,10 @@ class conversationBufferController(searchBufferController):
     self.ids.append(self.tweet["id"])
     tweet = self.tweet
     while tweet["in_reply_to_status_id"] != None:
-     tweet = self.session.twitter.twitter.show_status(id=tweet["in_reply_to_status_id"])
+     try:
+      tweet = self.session.twitter.twitter.show_status(id=tweet["in_reply_to_status_id"])
+     except TwythonError as err:
+      break
      self.statuses.insert(0, tweet)
      self.ids.append(tweet["id"])
     if tweet["in_reply_to_status_id"] == None:

src/controller/mainController.py

@@ -119,6 +119,7 @@ class Controller(object):
   pub.subscribe(self.manage_item_in_timeline, "item-in-timeline")
   pub.subscribe(self.manage_item_in_list, "item-in-list")
   pub.subscribe(self.restart_streams_, "restart_streams")
+  pub.subscribe(self.on_tweet_deleted, "tweet-deleted")
   widgetUtils.connect_event(self.view, widgetUtils.CLOSE_EVENT, self.exit_)
 
  def bind_other_events(self):
@@ -191,6 +192,7 @@ class Controller(object):
   widgetUtils.connect_event(self.systrayIcon, widgetUtils.MENU, self.update_profile, menuitem=self.systrayIcon.update_profile)
   widgetUtils.connect_event(self.systrayIcon, widgetUtils.MENU, self.show_hide, menuitem=self.systrayIcon.show_hide)
   widgetUtils.connect_event(self.systrayIcon, widgetUtils.MENU, self.check_for_updates, menuitem=self.systrayIcon.check_for_updates)
+  widgetUtils.connect_event(self.systrayIcon, widgetUtils.MENU, self.view_documentation, menuitem=self.systrayIcon.doc)
   widgetUtils.connect_event(self.systrayIcon, widgetUtils.MENU, self.exit, menuitem=self.systrayIcon.exit)
   widgetUtils.connect_event(self.systrayIcon, widgetUtils.TASKBAR_LEFT_CLICK, self.taskbar_left_click)
   widgetUtils.connect_event(self.systrayIcon, widgetUtils.TASKBAR_RIGHT_CLICK, self.taskbar_right_click)
@@ -923,7 +925,7 @@ class Controller(object):
     x = tweet["coordinates"]["coordinates"][0]
     y = tweet["coordinates"]["coordinates"][1]
     address = geocoder.reverse_geocode(y, x)
-    dlg = messages.viewTweet(address[0].__str__(), False)
+    dlg = commonMessageDialogs.view_geodata(address[0].__str__())
    else:
     output.speak(_(u"There are no coordinates in this tweet"))
   except GeocoderError:
@@ -1275,7 +1277,7 @@ class Controller(object):
   buffer = self.search_buffer("%s-timeline" % (who,), user)
   if buffer == None: return
   play_sound = "tweet_timeline.ogg"
-  if "%s-timeline" % (who,) not in buffer.session.settings["other_buffers"]["muted_buffers"]:
+  if "%s-timeline" % (who,) not in buffer.session.settings["other_buffers"]["muted_buffers"] and buffer.session.settings["sound"]["session_mute"] == False:
    self.notify(buffer.session, play_sound=play_sound)
    output.speak(_(u"One tweet from %s") % (data["user"]["name"]))
   buffer.add_new_item(data)
@@ -1284,7 +1286,7 @@ class Controller(object):
   buffer = self.search_buffer("%s" % (where,), user)
   if buffer == None: return
   play_sound = "list_tweet.ogg"
-  if "%s" % (where,) not in buffer.session.settings["other_buffers"]["muted_buffers"]:
+  if "%s" % (where,) not in buffer.session.settings["other_buffers"]["muted_buffers"] and buffer.session.settings["sound"]["session_mute"] == False:
    self.notify(buffer.session, play_sound=play_sound)
    output.speak(_(u"One tweet from %s") % (data["user"]["name"]))
   buffer.add_new_item(data)
@@ -1484,4 +1486,10 @@ class Controller(object):
    output.speak(_(u"Updating buffer..."))
    n = bf.start_stream(mandatory=True)
    if n != None:
-    output.speak(_(u"{0} items retrieved").format(n,))
+    output.speak(_(u"{0} items retrieved").format(n,))
+
+ def on_tweet_deleted(self, data):
+  id = data["delete"]["status"]["id"]
+  for i in self.buffers:
+   if hasattr(i, "remove_tweet") and hasattr(i, "name"):
+    i.remove_tweet(id)

src/controller/messages.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import re
 import platform
+import attach
 system = platform.system()
 import widgetUtils
 import output
@@ -32,6 +33,7 @@ class basicTweet(object):
   widgetUtils.connect_event(self.message.shortenButton, widgetUtils.BUTTON_PRESSED, self.shorten)
   widgetUtils.connect_event(self.message.unshortenButton, widgetUtils.BUTTON_PRESSED, self.unshorten)
   widgetUtils.connect_event(self.message.translateButton, widgetUtils.BUTTON_PRESSED, self.translate)
+  self.attachments = []
 
  def translate(self, event=None):
   dlg = translator.gui.translateDialog()
@@ -102,7 +104,7 @@ class basicTweet(object):
    self.message.text_focus()
 
  def attach(self, *args, **kwargs):
-  def completed_callback():
+  def completed_callback(dlg):
    url = dlg.uploaderFunction.get_url()
    pub.unsubscribe(dlg.uploaderDialog.update, "uploading")
    dlg.uploaderDialog.destroy()
@@ -125,16 +127,9 @@ class tweet(basicTweet):
    except AttributeError: pass
 
  def upload_image(self, *args, **kwargs):
-  if self.message.get("upload_image") == _(u"Discard image"):
+  a = attach.attach()
-   del self.image
+  if len(a.attachments) != 0:
-   self.image = None
+   self.attachments = a.attachments
-   output.speak(_(u"Discarded"))
-   self.message.set("upload_image", _(u"Upload a picture"))
-  else:
-   self.image = self.message.get_image()
-   if self.image != None:
-    self.message.set("upload_image", _(u"Discard image"))
-  self.message.text_focus()
 
  def autocomplete_users(self, *args, **kwargs):
   c = autocompletionUsers.completion.autocompletionUsers(self.message, self.session.session_id)
@@ -165,24 +160,56 @@ class dm(basicTweet):
 
 class viewTweet(basicTweet):
  def __init__(self, tweet, tweetList, is_tweet=True):
+  """ This represents a tweet displayer. However it could be used for showing something wich is not a tweet, like a direct message or an event.
+   param tweet: A dictionary that represents a full tweet or a string for non-tweets.
+   param tweetList: If is_tweet is set to True, this could be a list of quoted tweets.
+   param is_tweet: True or false, depending wether the passed object is a tweet or not."""
   if is_tweet == True:
+   image_description = []
    text = ""
    for i in xrange(0, len(tweetList)):
-    if tweetList[i].has_key("retweeted_status"):
+    # tweets with message keys are longer tweets, the message value is the full messaje taken from twishort.
-     text = text + "rt @%s: %s\n" % (tweetList[i]["retweeted_status"]["user"]["screen_name"], tweetList[i]["retweeted_status"]["text"])
+    if tweetList[i].has_key("message") and tweetList[i]["is_quote_status"] == False:
+     value = "message"
     else:
-     text = text + "@%s: %s\n" % (tweetList[i]["user"]["screen_name"], tweetList[i]["text"])
+     value = "text"
+    if tweetList[i].has_key("retweeted_status") and tweetList[i]["is_quote_status"] == False:
+     if tweetList[i].has_key("message") == False:
+      text = text + "rt @%s: %s\n" % (tweetList[i]["retweeted_status"]["user"]["screen_name"], tweetList[i]["retweeted_status"]["text"])
+     else:
+      text = text + "rt @%s: %s\n" % (tweetList[i]["retweeted_status"]["user"]["screen_name"], tweetList[i][value])
+    else:
+     text = text + " @%s: %s\n" % (tweetList[i]["user"]["screen_name"], tweetList[i][value])
+    # tweets with extended_entities could include image descriptions.
+    if tweetList[i].has_key("extended_entities") and tweetList[i]["extended_entities"].has_key("media"):
+     for z in tweetList[i]["extended_entities"]["media"]:
+      if z.has_key("ext_alt_text") and z["ext_alt_text"] != None:
+       image_description.append(z["ext_alt_text"])
+   # set rt and likes counters.
    rt_count = str(tweet["retweet_count"])
    favs_count = str(tweet["favorite_count"])
-   source = str(re.sub(r"(?s)<.*?>", "", tweet["source"]))
+   # Gets the client from where this tweet was made.
+   source = str(re.sub(r"(?s)<.*?>", "", tweet["source"].encode("utf-8")))
    if text == "":
-    if tweet.has_key("retweeted_status"):
+    if tweet.has_key("message"):
-     text = "rt @%s: %s" % (tweet["retweeted_status"]["user"]["screen_name"], tweet["retweeted_status"]["text"])
+     value = "message"
     else:
-     text = tweet["text"]
+     value = "text"
+    if tweet.has_key("retweeted_status"):
+     if tweet.has_key("message") == False:
+      text = "rt @%s: %s" % (tweet["retweeted_status"]["user"]["screen_name"], tweet["retweeted_status"]["text"])
+     else:
+      text = "rt @%s: %s" % (tweet["retweeted_status"]["user"]["screen_name"], tweet[value])
+    else:
+     text = tweet[value]
    text = self.clear_text(text)
-   self.message = message.viewTweet(text, rt_count, favs_count,source)
+   if tweet.has_key("extended_entities") and tweet["extended_entities"].has_key("media"):
+    for z in tweet["extended_entities"]["media"]:
+     if z.has_key("ext_alt_text") and z["ext_alt_text"] != None:
+      image_description.append(z["ext_alt_text"])
+   self.message = message.viewTweet(text, rt_count, favs_count, source.decode("utf-8"))
    self.message.set_title(len(text))
+   [self.message.set_image_description(i) for i in image_description]
   else:
    text = tweet
    self.message = message.viewNonTweet(text)
@@ -202,5 +229,5 @@ class viewTweet(basicTweet):
   urls = utils.find_urls_in_text(text)
   for i in urls:
    if "https://twitter.com/" in i:
-    text = text.replace(i, "")
+    text = text.replace(i, "\n")
   return text

src/controller/settings.py

@@ -64,11 +64,13 @@ class globalSettingsController(object):
   self.dialog.set_value("general", "use_invisible_shorcuts", config.app["app-settings"]["use_invisible_keyboard_shorcuts"])
   self.dialog.set_value("general", "disable_sapi5", config.app["app-settings"]["voice_enabled"])
   self.dialog.set_value("general", "hide_gui", config.app["app-settings"]["hide_gui"])  
+  self.dialog.set_value("general", "check_for_updates", config.app["app-settings"]["check_for_updates"])
   self.dialog.create_proxy()
   self.dialog.set_value("proxy", "server", config.app["proxy"]["server"])
   self.dialog.set_value("proxy", "port", config.app["proxy"]["port"])
   self.dialog.set_value("proxy", "user", config.app["proxy"]["user"])
   self.dialog.set_value("proxy", "password", config.app["proxy"]["password"])
+
   self.dialog.realize()
   self.response = self.dialog.get_response()
 
@@ -92,6 +94,7 @@ class globalSettingsController(object):
   config.app["app-settings"]["handle_longtweets"] = self.dialog.get_value("general", "handle_longtweets")
   config.app["app-settings"]["play_ready_sound"] = self.dialog.get_value("general", "play_ready_sound")
   config.app["app-settings"]["speak_ready_msg"] = self.dialog.get_value("general", "speak_ready_msg")
+  config.app["app-settings"]["check_for_updates"] = self.dialog.get_value("general", "check_for_updates")
   if config.app["proxy"]["server"] != self.dialog.get_value("proxy", "server") or config.app["proxy"]["port"] != self.dialog.get_value("proxy", "port") or config.app["proxy"]["user"] != self.dialog.get_value("proxy", "user") or config.app["proxy"]["password"] != self.dialog.get_value("proxy", "password"):
    if self.is_started == True:
     self.needs_restart = True

src/controller/user.py

@@ -31,6 +31,8 @@ class profileController(object):
 
  def get_data(self, screen_name):
   self.data = self.session.twitter.twitter.show_user(screen_name=screen_name)
+  if screen_name != self.session.db["user_name"]:
+   self.friendship_status = self.session.twitter.twitter.show_friendship(source_screen_name=self.session.db["user_name"], target_screen_name=screen_name)
 
  def fill_profile_fields(self):
   self.dialog.set_name(self.data["name"])
@@ -90,6 +92,17 @@ class profileController(object):
   if self.data["protected"] == True: protected = _(u"Yes")
   else: protected = _(u"No")
   string = string+ _(u"Protected: %s\n") % (protected)
+  if hasattr(self, "friendship_status"):
+   relation = False
+   friendship = "Relationship: "
+   if self.friendship_status["relationship"]["target"]["followed_by"]:
+    friendship += _(u"You follow {0}. ").format(self.data["name"],)
+    relation = True
+   if self.friendship_status["relationship"]["target"]["following"]:
+    friendship += _(u"{0} is following you.").format(self.data["name"],)
+    relation = True
+   if relation == True:
+    string = string+friendship+"\n"
   string = string+_(u"Followers: %s\n Friends: %s\n") % (self.data["followers_count"], self.data["friends_count"])
   if self.data["verified"] == True: verified = _(u"Yes")
   else: verified = _(u"No")

src/extra/AudioUploader/audioUploader.py

@@ -57,18 +57,16 @@ class audioUploader(object):
      url = base_url + '?apikey=' + self.config['sound']['sndup_api_key']
     else:
      url = base_url
-    self.uploaderFunction = transfer.Upload(field='file', url=url, filename=self.file, completed_callback=completed_callback)
    elif self.dialog.get("services") == "TwUp":
     url = "http://api.twup.me/post.json"
-    self.uploaderFunction = transfer.Upload(field='file', url=url, filename=self.file, completed_callback=completed_callback)
+   self.uploaderFunction = transfer.Upload(obj=self, field='file', url=url, filename=self.file, completed_callback=completed_callback)
    pub.subscribe(self.uploaderDialog.update, "uploading")
-   self.uploaderDialog.get_response()
+   self.uploaderDialog.get_response(self.uploaderFunction.perform_threaded)
-   self.uploaderFunction.perform_threaded()
 
  def get_available_services(self):
   services = []
-  services.append("TwUp")
   services.append("SNDUp")
+  services.append("TwUp")
   return services
 
  def on_pause(self, *args, **kwargs):
@@ -116,8 +114,9 @@ class audioUploader(object):
   if self.playing:
    self._stop()
   if self.recording != None:
-   self.dialog.disable_control("attach")
+   self.cleanup()
-   self.dialog.disable_control("play")
+  self.dialog.disable_control("attach")
+  self.dialog.disable_control("play")
   self.file = None
   self.dialog.enable_control("record")
   self.dialog.enable_control("attach_exists")
@@ -174,10 +173,6 @@ class audioUploader(object):
    os.remove(self.file)
    if hasattr(self, 'wav_file'):
     os.remove(self.wav_file)
-    del(self.wav_file)
-  if hasattr(self, 'wav_file') and os.path.exists(self.file):
-   os.remove(self.file)
-
 
  def on_attach_exists(self, *args, **kwargs):
   self.file = self.dialog.get_file()

src/extra/AudioUploader/transfer.py

@@ -1,106 +1,68 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-import pycurl
+import sys
-import sys
+import threading
-import threading
+import time
-import time
+import logging
-import json
+from utils import convert_bytes
-import logging
+from pubsub import pub
-from utils import *
+log = logging.getLogger("extra.AudioUploader.transfer")
-from pubsub import pub
+from requests_toolbelt.multipart.encoder import MultipartEncoder, MultipartEncoderMonitor
-
+import requests
-log = logging.getLogger("extra.AudioUploader.transfer")
+import os
-class Transfer(object):
+class Upload(object):
-
+ def __init__(self, field=None, obj=None, url=None, filename=None, follow_location=True, completed_callback=None, verbose=False, *args, **kwargs):
- def __init__(self, url=None, filename=None, follow_location=True, completed_callback=None, verbose=False, *args, **kwargs):
+  super(Upload, self).__init__(*args, **kwargs)
-  self.url = url
+  self.url=url
-  self.filename = filename
+  self.filename=filename
-  log.debug("Uploading audio to %s, filename %s" % (url, filename))
+  log.debug("Uploading audio to %s, filename %s" % (url, filename))
-  self.curl = pycurl.Curl()
+  self.start_time = None
-  self.start_time = None
+  self.completed_callback = completed_callback
-  self.completed_callback = completed_callback
+  self.background_thread = None
-  self.background_thread = None
+  self.transfer_rate = 0
-  self.transfer_rate = 0
+  self.m = MultipartEncoder(fields={field:(os.path.basename(self.filename), open(self.filename, 'rb'), "application/octet-stream")})
-  self.curl.setopt(self.curl.PROGRESSFUNCTION, self.progress_callback)
+  self.monitor = MultipartEncoderMonitor(self.m, self.progress_callback)
-  self.curl.setopt(self.curl.URL, url)
+  self.response=None
-  self.curl.setopt(self.curl.NOPROGRESS, 0)
+  self.obj=obj
-  self.curl.setopt(self.curl.HTTP_VERSION, self.curl.CURL_HTTP_VERSION_1_0)
+  self.follow_location=follow_location
-  self.curl.setopt(self.curl.FOLLOWLOCATION, int(follow_location))
+  #the verbose parameter is deprecated and will be removed soon
-  self.curl.setopt(self.curl.VERBOSE, int(verbose))
+
-  super(Transfer, self).__init__(*args, **kwargs)
+ def elapsed_time(self):
-
+  if not self.start_time:
- def elapsed_time(self):
+   return 0
-  if not self.start_time:
+  return time.time() - self.start_time
-   return 0
+
-  return time.time() - self.start_time
+ def progress_callback(self, monitor):
-
+  progress = {}
- def progress_callback(self, down_total, down_current, up_total, up_current):
+  progress["total"] = monitor.len
-  progress = {}
+  progress["current"] = monitor.bytes_read
-  progress["total"] = up_total
+  if progress["current"] == 0:
-  progress["current"] = up_current
+   progress["percent"] = 0
-#  else:
+   self.transfer_rate = 0
-#   print "Killed function"
+  else:
-#   return
+   progress["percent"] = int((float(progress["current"]) / progress["total"]) * 100)
-  if progress["current"] == 0:
+   self.transfer_rate = progress["current"] / self.elapsed_time()
-   progress["percent"] = 0
+  progress["speed"] = '%s/s' % convert_bytes(self.transfer_rate)
-   self.transfer_rate = 0
+  if self.transfer_rate:
-  else:
+   progress["eta"] = (progress["total"] - progress["current"]) / self.transfer_rate
-   progress["percent"] = int((float(progress["current"]) / progress["total"]) * 100)
+  else:
-   self.transfer_rate = progress["current"] / self.elapsed_time()
+   progress["eta"] = 0
-  progress["speed"] = '%s/s' % convert_bytes(self.transfer_rate)
+  pub.sendMessage("uploading", data=progress)
-  if self.transfer_rate:
+
-   progress["eta"] = (progress["total"] - progress["current"]) / self.transfer_rate
+ def perform_transfer(self):
-  else:
+  log.debug("starting upload...")
-   progress["eta"] = 0
+  self.start_time = time.time()
-  pub.sendMessage("uploading", data=progress)
+  self.response=requests.post(url=self.url, data=self.monitor, headers={"Content-Type":self.m.content_type}, allow_redirects=self.follow_location, stream=True)
-
+  log.debug("Upload finished.")
- def perform_transfer(self):
+  self.complete_transfer()
-  log.debug("starting upload...")
+
-  self.start_time = time.time()
+ def perform_threaded(self, *args, **kwargs):
-  self.curl.perform()
+  self.background_thread = threading.Thread(target=self.perform_transfer)
-  self.curl.close()
+  self.background_thread.daemon = True
-  log.debug("Upload finished.")
+  self.background_thread.start()
-  self.complete_transfer()
+
-
+ def complete_transfer(self):
- def perform_threaded(self):
+  if callable(self.completed_callback):
-  self.background_thread = threading.Thread(target=self.perform_transfer)
+   self.completed_callback(self.obj)
-  self.background_thread.daemon = True
+
-  self.background_thread.start()
+ def get_url(self):
-
+  return self.response.json()['url']
- def complete_transfer(self):
-  if callable(self.completed_callback):
-   self.curl.close()
-   self.completed_callback()
-
-class Upload(Transfer):
-
- def __init__(self, field=None, filename=None, *args, **kwargs):
-  super(Upload, self).__init__(filename=filename, *args, **kwargs)
-  self.response = dict()
-  self.curl.setopt(self.curl.POST, 1)
-  if isinstance(filename, unicode):
-   local_filename = filename.encode(sys.getfilesystemencoding())
-  else:
-   local_filename = filename
-  self.curl.setopt(self.curl.HTTPPOST, [(field, (self.curl.FORM_FILE, local_filename, self.curl.FORM_FILENAME, filename.encode("utf-8")))])
-  self.curl.setopt(self.curl.HEADERFUNCTION, self.header_callback)
-  self.curl.setopt(self.curl.WRITEFUNCTION, self.body_callback)
-
- def header_callback(self, content):
-  self.response['header'] = content
-
- def body_callback(self, content):
-  self.response['body'] = content
-
- def get_url(self):
-  return json.loads(self.response['body'])['url']
-
-class Download(Transfer):
-
- def __init__(self, follow_location=True, *args, **kwargs):
-  super(Download, self).__init__(*args, **kwargs)
-  self.download_file = open(self.filename, 'wb')
-  self.curl.setopt(self.curl.WRITEFUNCTION, self.download_file.write)
-
- def complete_transfer(self):
-  self.download_file.close()
-  super(DownloadDialog, self).complete_transfer()

src/extra/AudioUploader/wx_transfer_dialogs.py

@@ -3,10 +3,10 @@ import wx
 from utils import *
 import widgetUtils
 
-class TransferDialog(widgetUtils.BaseDialog):
+class UploadDialog(widgetUtils.BaseDialog):
 
  def __init__(self, filename, *args, **kwargs):
-  super(TransferDialog, self).__init__(parent=None, id=wx.NewId(), *args, **kwargs)
+  super(UploadDialog, self).__init__(parent=None, id=wx.NewId(), *args, **kwargs)
   self.pane = wx.Panel(self)
   self.progress_bar = wx.Gauge(parent=self.pane)
   fileBox = wx.BoxSizer(wx.HORIZONTAL)
@@ -56,18 +56,6 @@ class TransferDialog(widgetUtils.BaseDialog):
  def create_buttons(self):
   self.cancel_button = wx.Button(parent=self.pane, id=wx.ID_CANCEL)
 
- def get_response(self):
+ def get_response(self, fn):
-  self.Show()
+  wx.CallAfter(fn, 0.01)
-
+  self.ShowModal()
- def destroy(self):
-  self.Destroy()
-
-class UploadDialog(TransferDialog):
-
- def __init__(self, filename=None, *args, **kwargs):
-  super(UploadDialog, self).__init__(filename=filename, *args, **kwargs)
-
-class DownloadDialog(TransferDialog):
-
- def __init__(self, *args, **kwargs):
-  super(Download, self).__init__(*args, **kwargs)

src/fixes/__init__.py

@@ -4,9 +4,10 @@ import sys
 import fix_arrow # A few new locales for Three languages in arrow.
 import fix_urllib3_warnings # Avoiding some SSL warnings related to Twython.
 import fix_win32com
-
+import fix_requests #fix cacert.pem location for TWBlue binary copies
 def setup():
 	fix_arrow.fix()
 	if hasattr(sys, "frozen"):
 		fix_win32com.fix()
+		fix_requests.fix()
 	fix_urllib3_warnings.fix()

src/fixes/fix_requests.py

@@ -0,0 +1,10 @@
+from requests import certs, utils, adapters
+import paths
+
+def patched_where():
+ return paths.app_path(u"cacert.pem")
+
+def fix():
+ certs.where=patched_where
+ utils.DEFAULT_CA_BUNDLE_PATH=patched_where()
+ adapters.DEFAULT_CA_BUNDLE_PATH=patched_where()

src/issueReporter/issueReporter.py

@@ -47,7 +47,7 @@ class reportBug(object):
    issue.project.name = application.name
    issue.project.id = 0
    issue.summary = self.dialog.get("summary"),
-   issue.description = "Reported by @%s\n\n" % (self.user_name) + self.dialog.get("description")
+   issue.description = "Reported by @%s on version %s (snapshot = %s)\n\n" % (self.user_name, application.version, application.snapshot) + self.dialog.get("description")
    # to do: Create getters for category, severity and reproducibility in wx_UI.
    issue.category = constants.categories[self.dialog.category.GetSelection()]
    issue.reproducibility.name = constants.reproducibilities[self.dialog.reproducibility.GetSelection()]

src/keymaps/Chicken Nugget.keymap

@@ -17,7 +17,7 @@ send_dm = string(default="control+win+d")
 user_details = string(default="control+win+shift+u")
 exit = string(default="control+win+q")
 open_timeline = string(default="control+win+u")
-remove_buffer = string(default="control+win+backspace")
+remove_buffer = string(default="control+win+back")
 audio = string(default="control+win+return")
 url = string(default="control+win+b")
 go_home = string(default="control+win+home")
@@ -28,7 +28,7 @@ repeat_item = string(default="control+win+space")
 copy_to_clipboard = string(default="control+win+shift+c")
 search = string(default="control+win+/")
 find = string(default="control+win+shift+/")
-check_for_updates = string(default="alt+win+u)
+check_for_updates = string(default="alt+win+u")
 list_manager = string(default="control+win+shift+l")
 configuration = string(default="control+win+o")
 accountConfiguration = string(default="control+win+shift+o")

src/keys/__init__.py

@@ -5,16 +5,16 @@ import exceptions
 from ctypes import c_char_p
 from libloader import load_library
 import paths
-if application.snapshot == True:
+#if application.snapshot == True:
-	if platform.architecture()[0][:2] == "32":
+#	if platform.architecture()[0][:2] == "32":
-		lib = load_library("snapshot_api_keys32", x86_path=paths.app_path("keys/lib"))
+#		lib = load_library("snapshot_api_keys32", x86_path=paths.app_path("keys/lib"))
-	else:
+#	else:
-		lib = load_library("snapshot_api_keys64", x64_path=paths.app_path("keys/lib"))
+#	lib = load_library("snapshot_api_keys64", x64_path=paths.app_path("keys/lib"))
+#else:
+if platform.architecture()[0][:2] == "32":
+	lib = load_library("stable_api_keys32", x86_path=paths.app_path("keys/lib"))
 else:
-	if platform.architecture()[0][:2] == "32":
+	lib = load_library("stable_api_keys64", x64_path=paths.app_path("keys/lib"))
-		lib = load_library("stable_api_keys32", x86_path=paths.app_path("keys/lib"))
-	else:
-		lib = load_library("stable_api_keys64", x64_path=paths.app_path("keys/lib"))
 
 #	import linuxKeys
 #	lib = linuxKeys

src/libloader/com.py

@@ -1,7 +1,7 @@
 from pywintypes import com_error
 import win32com
 import paths
-win32com.__gen_path__=paths.data_path(u"com_cache")
+win32com.__gen_path__=paths.com_path()
 import sys
 import os
 sys.path.append(os.path.join(win32com.__gen_path__, "."))

src/long_tweets/tweets.py

@@ -18,15 +18,10 @@
 ############################################################
 from twitter import utils
 
-def get_id(url):
- return url.split("/")[-1]
-
 def is_long(tweet):
- long = False
+ if tweet.has_key("is_quote_status") and tweet["is_quote_status"] == True and tweet.has_key("quoted_status"):
- for url in range(0, len(tweet["entities"]["urls"])):
+  return tweet["quoted_status_id"]
-  if "twitter.com" in tweet["entities"]["urls"][url]["expanded_url"]:
+ return False
-   long = get_id(tweet["entities"]["urls"][url]["expanded_url"])
- return long
 
 def clear_url(tweet):
  urls = utils.find_urls_in_text(tweet["text"])

src/long_tweets/twishort.py

@@ -51,5 +51,4 @@ def create_tweet(user_token, user_secret, text, media=0):
  "text": text.encode("utf-8"),
  "media": media}
  response = requests.post(url, data=data)
-# print response.json()
  return response.json()["text_to_tweet"]

src/main.py

@@ -70,7 +70,8 @@ def setup():
  if system == "Windows":
   if config.app["app-settings"]["donation_dialog_displayed"] == False:
    donation()
-  updater.do_update()
+  if config.app['app-settings']['check_for_updates']:
+   updater.do_update()
  sm = sessionManager.sessionManagerController()
  sm.fill_list()
  if len(sm.sessions) == 0: sm.show()

src/paths.py

@@ -69,4 +69,17 @@ def locale_path():
 
 @merge_paths
 def sound_path():
- return app_path(u"sounds")
+ return app_path(u"sounds")
+
+@merge_paths
+def com_path():
+ global mode, directory
+ if mode == "portable":
+  if directory != None: path = os.path.join(directory, "com_cache")
+  elif directory == None: path = app_path(u"com_cache")
+ elif mode == "installed":
+  path = data_path(u"com_cache")
+ if not os.path.exists(path):
+  log.debug("%s path does not exist, creating..." % (path,))
+  os.mkdir(path)
+ return path

src/sessionmanager/session.py

@@ -18,7 +18,7 @@ import os
 from mysc.thread_utils import stream_threaded
 from pubsub import pub
 log = logging.getLogger("sessionmanager.session")
-from long_tweets import tweets
+from long_tweets import tweets, twishort
 
 sessions = {}
 
@@ -64,6 +64,7 @@ class Session(object):
    if utils.find_item(i["id"], self.db[name]) == None and     utils.is_allowed(i, self.settings["twitter"]["ignored_clients"]) == True:
     try: i = self.check_quoted_status(i)
     except: pass
+    i = self.check_long_tweet(i)
     if self.settings["general"]["reverse_timelines"] == False: self.db[name].append(i)
     else: self.db[name].insert(0, i)
     num = num+1
@@ -425,19 +426,17 @@ class Session(object):
  def check_quoted_status(self, tweet):
   status = tweets.is_long(tweet)
   if status != False:
-   tweet["quoted"] = 1
    tweet = self.get_quoted_tweet(tweet)
   return tweet
 
-   
+
  def get_quoted_tweet(self, tweet):
-  quoted_tweet = self.twitter.twitter.show_status(id=tweet["id"])
+  quoted_tweet = tweet
   urls = utils.find_urls_in_text(quoted_tweet["text"])
   for url in range(0, len(urls)):
    try:  quoted_tweet["text"] = quoted_tweet["text"].replace(urls[url], quoted_tweet["entities"]["urls"][url]["expanded_url"])
    except IndexError: pass
-  l = tweets.is_long(quoted_tweet)
+  id = tweets.is_long(quoted_tweet)
-  id = tweets.get_id(l)
   try: original_tweet = self.twitter.twitter.show_status(id=id)
   except: return quoted_tweet
   urls = utils.find_urls_in_text(original_tweet["text"])
@@ -446,3 +445,8 @@ class Session(object):
    except IndexError: pass
   return compose.compose_quoted_tweet(quoted_tweet, original_tweet)
 
+ def check_long_tweet(self, tweet):
+  long = twishort.is_long(tweet)
+  if long != False:
+   tweet["message"] = twishort.get_full_text(long)
+  return tweet

src/sessionmanager/sessionManager.py

@@ -44,6 +44,15 @@ class sessionManagerController(object):
     log.debug("Adding session %s" % (i,))
     strconfig = "%s/session.conf" % (paths.config_path(i))
     config_test = config_utils.load_config(strconfig)
+    if len(config_test) == 0:
+     try:
+      log.debug("Deleting session %s" % (i,))
+      shutil.rmtree(paths.config_path(i))
+      continue
+     except:
+      output.speak("An exception was raised while attempting to clean malformed session data. See the error log for details. If this message persists, contact the developers.",True)
+      os.exception("Exception thrown while removing malformed session")
+      continue
     name = config_test["twitter"]["user_name"]
     if config_test["twitter"]["user_key"] != "" and config_test["twitter"]["user_secret"] != "":
      sessionsList.append(name)

src/sessionmanager/wxUI.py

@@ -4,7 +4,7 @@ from multiplatform_widgets import widgets
 import application
 class sessionManagerWindow(wx.Dialog):
  def __init__(self):
-  super(sessionManagerWindow, self).__init__(parent=None, title="Session manager", size=wx.DefaultSize)
+  super(sessionManagerWindow, self).__init__(parent=None, title=_(u"Session manager"), size=wx.DefaultSize)
   panel = wx.Panel(self)
   sizer = wx.BoxSizer(wx.VERTICAL)
   label = wx.StaticText(panel, -1, _(u"Accounts list"), size=wx.DefaultSize)

src/setup.py

@@ -26,6 +26,7 @@ import application
 import platform
 from glob import glob
 import wx
+from requests import certs
 
 def get_architecture_files():
 	if platform.architecture()[0][:2] == "32":
@@ -45,15 +46,15 @@ def get_data():
 	import enchant
 	return [
   ("", ["conf.defaults", "app-configuration.defaults", "icon.ico"]),
-    ("requests", ["cacert.pem"]),
+    ("", [certs.where()]),
   ("accessible_output2/lib", glob("accessible_output2/lib/*.dll")),
   ("keys/lib", glob("keys/lib/*.dll")),
 ("keymaps", glob("keymaps/*.keymap")),
 ]+get_sounds()+get_locales()+get_documentation()+sound_lib.find_datafiles()+accessible_output2.find_datafiles()+enchant.utils.win32_data_files()+get_architecture_files()+wx_files()
 
 def get_documentation ():
-	answer = []
+	answer = [("documentation", ["documentation/license.txt"])]
-	depth = 6
+	depth = 9
 	for root, dirs, files in os.walk('documentation'):
 		if depth == 0:
 			break
@@ -112,7 +113,7 @@ options = {
     'optimize':2,
    'packages': ["pubsub", "pubsub.core", "pubsub.core.kwargs", "dbhash"],
     'dll_excludes': ["MPR.dll", "api-ms-win-core-apiquery-l1-1-0.dll", "api-ms-win-core-console-l1-1-0.dll", "api-ms-win-core-delayload-l1-1-1.dll", "api-ms-win-core-errorhandling-l1-1-1.dll", "api-ms-win-core-file-l1-2-0.dll", "api-ms-win-core-handle-l1-1-0.dll", "api-ms-win-core-heap-obsolete-l1-1-0.dll", "api-ms-win-core-libraryloader-l1-1-1.dll", "api-ms-win-core-localization-l1-2-0.dll", "api-ms-win-core-processenvironment-l1-2-0.dll", "api-ms-win-core-processthreads-l1-1-1.dll", "api-ms-win-core-profile-l1-1-0.dll", "api-ms-win-core-registry-l1-1-0.dll", "api-ms-win-core-synch-l1-2-0.dll", "api-ms-win-core-sysinfo-l1-2-0.dll", "api-ms-win-security-base-l1-2-0.dll", "api-ms-win-core-heap-l1-2-0.dll", "api-ms-win-core-interlocked-l1-2-0.dll", "api-ms-win-core-localization-obsolete-l1-1-0.dll", "api-ms-win-core-string-l1-1-0.dll", "api-ms-win-core-string-obsolete-l1-1-0.dll", "WLDAP32.dll", "MSVCP90.dll", "CRYPT32.dll", "mfc90.dll"],
-    'skip_archive': True
+    'compressed': True
    },
   },
   windows = [

src/sounds/FightingGames/sound notes.txt

@@ -0,0 +1 @@
+These sounds do not belong to us; they are the property of their original creators.

src/sounds/Qwitter/sound notes.txt

@@ -0,0 +1,2 @@
+These sounds do not belong to us; they are the property of their original creators.
+This soundpack was adapted for TWBlue by Bill Dengler (@codeofdusk on Twitter).