From 74a3f43da9f79b3e022b9124cbcef51fb7b1c80b Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sun, 9 May 2010 19:40:44 +0000 Subject: [PATCH] Added USB transport. git-svn-id: file:///home/phd/archive/SVN/mc-extfs/trunk@40 1a6e6372-1aea-0310-bd00-dc960550e1df --- obexftp | 14 +++++++++++--- obexftp-ANNOUNCE | 15 +++------------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/obexftp b/obexftp index a5ef805..4442737 100755 --- a/obexftp +++ b/obexftp @@ -32,6 +32,8 @@ and "channel" is the OBEX File Transfer channel; you can discover the address and the channel for your device by using commands like "hcitool scan" and "sdptool browse". +For the USB put the interface number: "usb interface". + For the TTY put the device name: "tty /dev/ttyUSB0". For the IrDA: just put "IrDA" in the file. @@ -62,16 +64,16 @@ named in $TMP environment variable. """ -__version__ = "1.2.4" +__version__ = "1.3.0" __revision__ = "$Id$" __date__ = "$Date$"[7:-2] __author__ = "Oleg Broytman " -__copyright__ = "Copyright (C) 2004-2009 PhiloSoft Design" +__copyright__ = "Copyright (C) 2004-2010 PhiloSoft Design" __license__ = "GPL" # Change this to suite your needs -obexftp_prog = "/usr/local/obex/bin/obexftp" +obexftp_prog = "/usr/bin/obexftp" import sys, os, shutil @@ -334,6 +336,12 @@ def setup_transport(): elif len(parts) > 3: transport_error("too many arguments for 'bluetooth' transport") return ' '.join(["-b", parts[1], "-B", parts[2]]) + elif transport == "usb": + if len(parts) < 2: + transport_error("not enough arguments for 'usb' transport") + elif len(parts) > 2: + transport_error("too many arguments for 'usb' transport") + return ' '.join(["-u", parts[1]]) elif transport == "tty": if len(parts) < 2: transport_error("not enough arguments for 'tty' transport") diff --git a/obexftp-ANNOUNCE b/obexftp-ANNOUNCE index 711aa13..ed4026a 100644 --- a/obexftp-ANNOUNCE +++ b/obexftp-ANNOUNCE @@ -6,23 +6,14 @@ WHAT IS IT binary. -WHAT'S NEW in version 1.2.4 (2007-06-12) - Minor misspelling fix. - -WHAT'S NEW in version 1.2.3 (2005-11-24) - Put error logfile in the same directory as the transport file. If the -directory or the file is not writeable - try to put the logfile in a temporary -directory, usually /tmp. - Get preferred charset from the current locale and encode unicode fullpath -from XML to that charset. - Some errors are critical errors. More documentation. - +WHAT'S NEW in version 1.3.0 (2010-05-09) + USB transport. WHAT'S NEW in version 1.2.0 (2004-09-27) Fixed a major bug with blocked read from a pipe. Many thanks to Marius Konitzer for reporting the bug. Now I use files instead of pipes. - More test during parsing of a transport file. + More tests during parsing of a transport file. WHERE TO GET -- 2.39.5