Removed dropbox, updated translations

src/extra/AudioUploader/audioUploader.py

@@ -19,7 +19,7 @@
 import widgetUtils
 import wx_ui
 import wx_transfer_dialogs
-import dropbox_transfer, transfer
+import transfer
 import output
 import tempfile
 import sound
@@ -31,6 +31,7 @@ import sound_lib
 import logging
 
 log = logging.getLogger("extra.AudioUploader.audioUploader")
+
 class audioUploader(object):
  def __init__(self, configFile, completed_callback):
   self.config = configFile
@@ -50,9 +51,7 @@ class audioUploader(object):
    log.debug("Uploading file %s to %s..." % (self.file, self.dialog.get("services")))
    self.uploaderDialog = wx_transfer_dialogs.UploadDialog(self.file)
    output.speak(_(u"Attaching..."))
-   if self.dialog.get("services") == "Dropbox":
-    self.uploaderFunction = dropbox_transfer.dropboxUploader(filename=self.file, completed_callback=completed_callback, config=self.config)
-   elif self.dialog.get("services") == "SNDUp":
+   if self.dialog.get("services") == "SNDUp":
     base_url = "http://sndup.net/post.php"
     if len(self.config["sound"]["sndup_api_key"]) > 0:
      url = base_url + '?apikey=' + self.config['sound']['sndup_api_key']
@@ -69,8 +68,6 @@ class audioUploader(object):
  def get_available_services(self):
   services = []
   services.append("TwUp")
-  if self.config["services"]["dropbox_token"] != "":
-   services.append("Dropbox")
   services.append("SNDUp")
   return services
 

src/extra/AudioUploader/dropbox_transfer.py

@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-import threading
-import time
-import os
-import exceptions
-import dropbox
-import logging
-import application
-from keys import keyring
-from utils import *
-from dropbox.rest import ErrorResponse
-from StringIO import StringIO
-from pubsub import pub
-
-log = logging.getLogger("extra.AudioUploader.dropbox_transfer")
-class UnauthorisedError(exceptions.Exception):
- def __init__(self, *args, **kwargs):
-  super(UnauthorisedError, self).__init__(*args, **kwargs)
-
-class newChunkedUploader(dropbox.client.ChunkedUploader):
- def __init__(self, client, file_obj, length, callback):
-  super(newChunkedUploader, self).__init__(client, file_obj, length)
-  self.progress_callback = callback
-
- def upload_chunked(self, chunk_size = 4 * 1024 * 1024):
-  while self.offset < self.target_length:
-   next_chunk_size = min(chunk_size, self.target_length - self.offset)
-   if self.last_block == None:
-    self.last_block = self.file_obj.read(next_chunk_size)
-
-   try:
-    (self.offset, self.upload_id) = self.client.upload_chunk(
-                    StringIO(self.last_block), next_chunk_size, self.offset, self.upload_id)
-    self.last_block = None
-    if callable(self.progress_callback): self.progress_callback(self.offset)
-   except ErrorResponse as e:
-    reply = e.body
-    if "offset" in reply and reply['offset'] != 0:
-     if reply['offset'] > self.offset:
-      self.last_block = None
-      self.offset = reply['offset']
-
-class dropboxLogin(object):
- def __init__(self, config):
-  log.debug("Trying to login in Dropbox...")
-  self.logged = False
-  self.config = config
-
- def get_url(self):
-  log.debug("Getting autorisation URL...")
-  self.flow = dropbox.client.DropboxOAuth2FlowNoRedirect(keyring.get("dropbox_api_key"), keyring.get("dropbox_api_secret"))
-  return self.flow.start()
-
- def authorise(self, code):
-  log.debug("Authorising " + application.name + " to Dropbox...")
-  access_token, user_id = self.flow.finish(code)
-  log.debug("Saving tokens...")
-  self.config["services"]["dropbox_token"] = access_token
-  self.logged = True
-
-class dropboxUploader(object):
- def __init__(self, config, filename, completed_callback, short_url=False):
-  if config["services"]["dropbox_token"] != "":
-   log.debug("logging in Dropbox...")
-   self.client = dropbox.client.DropboxClient(config["services"]["dropbox_token"])
-  else:
-   log.error("Dropbox is not authorised for this session.")
-   raise UnauthorisedError("You need to authorise " + application.name)
-  self.filename = filename
-  self.short_url = short_url
-  self.file = open(self.filename, "rb")
-  self.file_size = os.path.getsize(self.filename)
-  self.uploader = newChunkedUploader(client=self.client, file_obj=self.file, length=self.file_size, callback=self.process)
-  self.start_time = None
-  self.completed_callback = completed_callback
-  self.background_thread = None
-  self.current = 0
-  self.transfer_rate = 0
-  log.debug("File Size: %d " % (self.file_size,))
-
- def elapsed_time(self):
-  if not self.start_time:
-   return 0
-  return time.time() - self.start_time
-
- def perform_transfer(self):
-  log.debug("Starting transfer...")
-  self.start_time = time.time()
-  while self.uploader.offset < self.file_size:
-   self.uploader.upload_chunked(self.file_size/100)
-  self.transfer_completed()
-
- def process(self, offset):
-  progress = {}
-  self.current = offset
-  progress["total"] = self.file_size
-  progress["current"] = self.current
-  progress["percent"] = int((float(progress["current"]) / progress["total"]) * 100)
-  self.transfer_rate = progress["current"] / self.elapsed_time()
-  progress["speed"] = '%s/s' % convert_bytes(self.transfer_rate)
-  if self.transfer_rate:
-   progress["eta"] = (progress["total"] - progress["current"]) / self.transfer_rate
-  else:
-   progress["eta"] = 0
-  pub.sendMessage("uploading", data=progress)
-
- def perform_threaded(self):
-  self.background_thread = threading.Thread(target=self.perform_transfer)
-  self.background_thread.daemon = True
-  self.background_thread.start()
-
- def transfer_completed(self):
-  log.debug("Transfer completed")
-  self.uploader.finish(os.path.basename(self.filename))
-  if callable(self.completed_callback):
-   self.completed_callback()
-
- def get_url(self):
-  original = "%s" % (self.client.media(os.path.basename(self.filename))["url"])
-  return original
-#  .replace("dl=0", "dl=1")