Merge branch 'next-gen' of https://github.com/manuelcortez/TWBlue into next-gen

README.md

@@ -35,8 +35,8 @@ Although most dependencies can be found in the windows-dependencies directory, w
 * [Python,](http://python.org) version 2.7.11  
 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 219
-* [Pycurl](http://pycurl.sourceforge.net) 7.19.5.3 for Python 2.7: [downloads](https://pypi.python.org/pypi/pycurl/7.19.5.3)
+* [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
 

mysc/pa.c format/App/AppInfo/Launcher/TWBluePortable.ini

@@ -1,7 +1,7 @@
 [Launch]
 ProgramExecutable=TWBlue\TWBlue.exe
 ProgramExecutable64=TWBlue64\TWBlue.exe
-CommandLineArguments=-p -d "%PAL:DataDir%"
+CommandLineArguments=-d "%PAL:DataDir%"
 SinglePortableAppInstance=true
 MinOS=XP
 SingleAppInstance=false

scripts/twblue.nsi

@@ -26,7 +26,6 @@ var StartMenuFolder
 !define MUI_FINISHPAGE_LINK "Visit TWBlue website"
 !define MUI_FINISHPAGE_LINK_LOCATION "http://twblue.es"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\TWBlue.exe"
-!define MUI_FINISHPAGE_RUN_PARAMETERS "-i"
 !insertmacro MUI_PAGE_FINISH
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
@@ -58,10 +57,10 @@ File /r TWBlue64\*
 ${Else}
 File /r TWBlue\*
 ${EndIf}
-CreateShortCut "$DESKTOP\TWBlue.lnk" "$INSTDIR\TWBlue.exe" "-i"
+CreateShortCut "$DESKTOP\TWBlue.lnk" "$INSTDIR\TWBlue.exe"
 !insertmacro MUI_STARTMENU_WRITE_BEGIN startmenu
 CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-CreateShortCut "$SMPROGRAMS\$StartMenuFolder\TWBlue.lnk" "$INSTDIR\TWBlue.exe" "-i"
+CreateShortCut "$SMPROGRAMS\$StartMenuFolder\TWBlue.lnk" "$INSTDIR\TWBlue.exe"
 CreateShortCut "$SMPROGRAMS\$StartMenuFolder\TWBlue on the web.lnk" "http://twblue.es"
 CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
 !insertmacro MUI_STARTMENU_WRITE_END

src/commandline.py

@@ -6,13 +6,7 @@ import application
 log = logging.getLogger("commandlineLauncher")
 
 parser = argparse.ArgumentParser(description=application.name+" command line launcher")
-group = parser.add_mutually_exclusive_group()
-group.add_argument("-p", "--portable", help="Use " + application.name + " as a portable application.", action="store_true", default=True)
-group.add_argument("-i", "--installed", help="Use " + application.name + " as an installed application. Config files will be saved in the user data directory", action="store_true")
 parser.add_argument("-d", "--data-directory", action="store", dest="directory", help="Specifies the directory where " + application.name + " saves userdata.")
 args = parser.parse_args()
-log.debug("Starting " + application.name + " with the following arguments: installed = %s, portable = %s and directory = %s" % (args.installed, args.portable, args.directory))
-if args.installed == True: paths.mode = "installed"
-elif args.portable == True:
- paths.mode = "portable"
- if args.directory != None: paths.directory = args.directory
+log.debug("Starting " + application.name + " with the following arguments: directory = %s" % (args.directory))
+if args.directory != None: paths.directory = args.directory

src/controller/buffersController.py

@@ -1088,7 +1088,7 @@ class conversationBufferController(searchBufferController):
   if dlg == widgetUtils.YES:
    self.timer.cancel()
    return True
-  elif dlg == WidgetUtils.NO:
+  elif dlg == widgetUtils.NO:
    return False
 
 class pocketBufferController(baseBufferController):

src/controller/settings.py

@@ -261,24 +261,24 @@ class accountSettingsController(globalSettingsController):
   if change == True:
    self.dialog.buffers.change_selected_item()
 
- def manage_pocket(self, *args, **kwargs):
-  if self.dialog.services.get_pocket_status() == _(u"Connect your Pocket account"):
-   self.connect_pocket()
-  else:
-   self.disconnect_pocket()
+# def manage_pocket(self, *args, **kwargs):
+#  if self.dialog.services.get_pocket_status() == _(u"Connect your Pocket account"):
+#   self.connect_pocket()
+#  else:
+#   self.disconnect_pocket()
 
- def connect_pocket(self):
-  dlg = self.dialog.services.show_pocket_dialog()
-  if dlg == widgetUtils.YES:
-   request_token = pocket.Pocket.get_request_token(consumer_key=keys.keyring.get("pocket_consumer_key"), redirect_uri="http://127.0.0.1:8080")
-   auth_url = pocket.Pocket.get_auth_url(code=request_token, redirect_uri="http://127.0.0.1:8080")
-   webbrowser.open_new_tab(auth_url)
-   httpd = BaseHTTPServer.HTTPServer(('127.0.0.1', 8080), authorisationHandler.handler)
-   while authorisationHandler.logged == False:
-    httpd.handle_request()
-   user_credentials = pocket.Pocket.get_credentials(consumer_key=keys.keyring.get("pocket_consumer_key"), code=request_token)
-   self.dialog.services.set_pocket(True)
-   self.config["services"]["pocket_access_token"] = user_credentials["access_token"]
+# def connect_pocket(self):
+#  dlg = self.dialog.services.show_pocket_dialog()
+#  if dlg == widgetUtils.YES:
+#   request_token = pocket.Pocket.get_request_token(consumer_key=keys.keyring.get("pocket_consumer_key"), redirect_uri="http://127.0.0.1:8080")
+#   auth_url = pocket.Pocket.get_auth_url(code=request_token, redirect_uri="http://127.0.0.1:8080")
+#   webbrowser.open_new_tab(auth_url)
+#   httpd = BaseHTTPServer.HTTPServer(('127.0.0.1', 8080), authorisationHandler.handler)
+#   while authorisationHandler.logged == False:
+#    httpd.handle_request()
+#   user_credentials = pocket.Pocket.get_credentials(consumer_key=keys.keyring.get("pocket_consumer_key"), code=request_token)
+#   self.dialog.services.set_pocket(True)
+#   self.config["services"]["pocket_access_token"] = user_credentials["access_token"]
 
  def disconnect_dropbox(self):
   self.config["services"]["pocket_access_token"] = ""

src/extra/translator/translator.py

@@ -101,8 +101,8 @@ languages = {
 }
 
 def available_languages():
-    l = languages.keys()
-    d = languages.values()
-    l.insert(0, '')
-    d.insert(0, _(u"autodetect"))
-    return sorted(zip(l, d))
+	l = languages.keys()
+	d = languages.values()
+	l.insert(0, '')
+	d.insert(0, _(u"autodetect"))
+	return sorted(zip(l, d))

src/libloader/libloader.py

@@ -32,7 +32,7 @@ def load_library(library, x86_path='.', x64_path='.', *args, **kwargs):
  loaded = _do_load(lib, *args, **kwargs)
  if loaded is not None:
   return loaded
- raise LibraryLoadError('unable to load %r. Provided library path: %r' % (library, path))
+ raise LibraryLoadError('unable to load %r. Provided library path: %r' % (library, lib))
 
 def _do_load(file, *args, **kwargs):
  loader = TYPES[platform.system()]['loader'] 

src/main.py

@@ -14,6 +14,9 @@ if system == "Windows":
  sys.stderr = open(os.path.join(os.getenv("temp"), "stderr.log"), "w")
 import languageHandler
 import paths
+#check if TWBlue is installed (Windows only)
+if os.path.exists(paths.app_path(u"Uninstall.exe")):
+ paths.mode="installed"
 import commandline
 import config
 import sound

src/paths.py

@@ -7,7 +7,7 @@ from platform_utils import paths as paths_
 
 from functools import wraps
 
-mode = None
+mode = "portable"
 directory = None
 
 log = logging.getLogger("paths")

src/platform_utils/libloader.py

@@ -32,7 +32,7 @@ def load_library(library, x86_path='.', x64_path='.', *args, **kwargs):
  loaded = _do_load(lib, *args, **kwargs)
  if loaded is not None:
   return loaded
- raise LibraryLoadError('unable to load %r. Provided library path: %r' % (library, path))
+ raise LibraryLoadError('unable to load %r. Provided library path: %r' % (library, lib))
 
 def _do_load(file, *args, **kwargs):
  loader = TYPES[platform.system()]['loader'] 

src/sessionmanager/sessionManager.py

@@ -2,6 +2,7 @@
 import shutil
 import widgetUtils
 import platform
+import output
 if platform.system() == "Windows":
  import wxUI as view
  from controller import settings

src/setup.py

@@ -28,22 +28,22 @@ from glob import glob
 import wx
 
 def get_architecture_files():
- if platform.architecture()[0][:2] == "32":
-  return [
+	if platform.architecture()[0][:2] == "32":
+		return [
   ("", ["../windows-dependencies/x86/oggenc2.exe", "../windows-dependencies/x86/bootstrap.exe"]),
   ("Microsoft.VC90.CRT", glob("../windows-dependencies/x86/Microsoft.VC90.CRT/*")),
   ("Microsoft.VC90.MFC", glob("../windows-dependencies/x86/Microsoft.VC90.MFC/*")),]
- elif platform.architecture()[0][:2] == "64":
-  return [
+	elif platform.architecture()[0][:2] == "64":
+		return [
   ("", ["../windows-dependencies/x64/oggenc2.exe", "../windows-dependencies/x86/bootstrap.exe"]),
   ("Microsoft.VC90.CRT", glob("../windows-dependencies/x64/Microsoft.VC90.CRT/*")),
   ("Microsoft.VC90.MFC", glob("../windows-dependencies/x64/Microsoft.VC90.MFC/*")),]
 
 def get_data():
- import accessible_output2
- import sound_lib
- import enchant
- return [
+	import accessible_output2
+	import sound_lib
+	import enchant
+	return [
   ("", ["conf.defaults", "app-configuration.defaults", "icon.ico"]),
     ("requests", ["cacert.pem"]),
   ("accessible_output2/lib", glob("accessible_output2/lib/*.dll")),
@@ -52,33 +52,33 @@ def get_data():
 ]+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 = []
- depth = 6
- for root, dirs, files in os.walk('documentation'):
-  if depth == 0:
-   break
-  new = (root, glob(os.path.join(root, "*.html")))
-  answer.append(new)
-  depth -= 1
- return answer
+	answer = []
+	depth = 6
+	for root, dirs, files in os.walk('documentation'):
+		if depth == 0:
+			break
+		new = (root, glob(os.path.join(root, "*.html")))
+		answer.append(new)
+		depth -= 1
+	return answer
 
 def get_sounds():
- answer = []
- depth = 6
- for root, dirs, files in os.walk('sounds'):
-  if depth == 0:
-   break
-  new = (root, glob(os.path.join(root, "*.ogg")))
-  answer.append(new)
-  depth -= 1
- return answer
+	answer = []
+	depth = 6
+	for root, dirs, files in os.walk('sounds'):
+		if depth == 0:
+			break
+		new = (root, glob(os.path.join(root, "*.ogg")))
+		answer.append(new)
+		depth -= 1
+	return answer
 
 def get_locales():
- answer = []
- for root, dirs, files in os.walk('locales'):
-  new = (root, glob(os.path.join(root, '*.mo')))
-  answer.append(new)
- return answer
+	answer = []
+	for root, dirs, files in os.walk('locales'):
+		new = (root, glob(os.path.join(root, '*.mo')))
+		answer.append(new)
+	return answer
 
 def wx_files():
 	wxDir=wx.__path__[0]
@@ -99,7 +99,7 @@ def wx_files():
 	return list(localeMoFiles)
 
 if __name__ == '__main__':
- setup(
+	setup(
   name = application.name,
   author = application.author,
   author_email = application.authorEmail,

src/sound.py

@@ -14,6 +14,8 @@ system = platform.system()
 from mysc.repeating_timer import RepeatingTimer
 from mysc.thread_utils import call_threaded
 import application
+import tempfile
+import glob
 URLPlayer = None
 
 def setup():

src/sound_lib/music.py

@@ -5,14 +5,14 @@ from .channel import Channel
 class Music(Channel):
 
  def __init__(self, mem=False, file=None, offset=0, length=0, flags=0, freq=0):
-  handle = BASS_MusicLoad(mem, file, offset, length, flags, freq)
+  handle = pybass.BASS_MusicLoad(mem, file, offset, length, flags, freq)
   super(Music, self).__init__(handle)
   self.add_attributes_to_mapping(
    music_amplify=pybass.BASS_ATTRIB_MUSIC_AMPLIFY,
-   music_bpm = BASS_ATTRIB_MUSIC_BPM,
-   music_pansep=BASS_ATTRIB_MUSIC_PANSEP,
-   music_speed=BASS_ATTRIB_MUSIC_SPEED,
-   music_vol_chan=BASS_ATTRIB_MUSIC_VOL_CHAN,
-   music_vol_global=BASS_ATTRIB_MUSIC_VOL_GLOBAL,
-   music_vol_inst=BASS_ATTRIB_MUSIC_VOL_INST,
+   music_bpm = pybass.BASS_ATTRIB_MUSIC_BPM,
+   music_pansep=pybass.BASS_ATTRIB_MUSIC_PANSEP,
+   music_speed=pybass.BASS_ATTRIB_MUSIC_SPEED,
+   music_vol_chan=pybass.BASS_ATTRIB_MUSIC_VOL_CHAN,
+   music_vol_global=pybass.BASS_ATTRIB_MUSIC_VOL_GLOBAL,
+   music_vol_inst=pybass.BASS_ATTRIB_MUSIC_VOL_INST,
   )

windows-dependencies

@@ -1 +1 @@
-Subproject commit baa04ec845383aebe6aacb3931ed1bb01da53dee
+Subproject commit a8a89ce8c247a4455886a3567159d7ed3829740c