Update to v0.4.6

Author: Emil Tullstedt

CHANGELOG

@@ -1,5 +1,12 @@
 # Change Log
 
+## [0.4.6] - 2016-10-06
+### Added
+- Set explicit length limit for outgoing SMS
+### Removed
+- Outgoing call feature
+- List numbers feature
+
 ## [0.4.4] - 2016-07-26
 ### Fixed
 - Added requests as a requirement for elkme

elkme/__init__.py

@@ -3,5 +3,5 @@
 # see main.py for the main entry-point
 #
 
-__version__ = '0.4.5'
-__release_date__ = '2016-07-26'
+__version__ = '0.4.6'
+__release_date__ = '2016-10-06'

elkme/config.py

@@ -33,11 +33,6 @@ def default_config_location(Filename="elkme"):
         # That's ok, since XP is no longer supported by MSFT
         location = os.environ["LOCALAPPDATA"] + os.sep + Filename + ".ini"
 
-    # Migration if textme-conffile exists but not elkme
-    if Filename == "elkme" and not os.path.isfile(location):
-        oldconf = default_config_location("textme")
-        if os.path.isfile(oldconf):
-            os.rename(oldconf, location)
     return location
 
 

elkme/elks.py

@@ -65,7 +65,7 @@ def format_sms_payload(self, message, to, sender='elkme', options=[]):
             'to': to,
             'message': message
         }
-        
+
         for option in options:
           if option not in ['dontlog', 'dryrun', 'flash']:
             raise Exception('Option %s not supported' % option)
@@ -82,29 +82,3 @@ def send_sms(self, message, to, sender='elkme', options=[]):
             options=options)
         return self.query_api(sms)
 
-    def format_call_payload(self, payload, to, sender):
-        voice_start = parse_payload(payload)
-
-        call = {
-            'from': sender,
-            'to': to,
-            'voice_start': voice_start
-        }
-        return call
-
-    def make_call(self, payload, to, sender):
-        """ Make a call connection to the 46elks API.
-        Will be deprecated and replaced. """
-        call = self.format_call_payload(payload, to, sender)
-        return self.query_api(call, 'Calls')
-
-    def list_numbers(self, all = False):
-        """ List numbers belonging to the current user.
-        Will be deprecated and replaced. """
-        response = self.query_api(endpoint='Numbers')
-        numbers = json.loads(response)['data']
-        if not all:
-            numbers = filter(lambda num: num['active'] == 'yes', numbers)
-        numbers = map(lambda num: num['number'], numbers)
-        return list(numbers)
-

elkme/helpers.py

@@ -81,9 +81,9 @@ def main():
     """Executed on run"""
 
     try:
-        input = raw_input
+        io_in = raw_input
     except NameError:
-        pass
+        io_in = input
 
     args = parse_args()
     if args.version:
@@ -114,16 +114,16 @@ def main():
         conf['password'] = args.password
 
     message = None
-    if args.message and not args.file:
+    if args.message and not args.file: # Message in argument
         message = args.message
-    elif args.file:
+    elif args.file: # Read file support
         with open(args.file, 'r') as openfile:
             message = openfile.read()
-    elif not sys.stdin.isatty():
+    elif not sys.stdin.isatty(): # Pipe support
         message = ''
         try:
             while True:
-                message += input()
+                message += io_in()
                 message += '\n'
         except EOFError:
             pass
@@ -145,14 +145,6 @@ def main():
     except KeyError:
       invalid_conf = True
 
-    if args.numbers:
-        if not message:
-          message = ''
-        numbers = elks_conn.list_numbers(all = 'all' in message)
-        for i, number in enumerate(numbers):
-          print("(%s) %s" % (i, number))
-        exit(0)
-
     if not message:
         print(USAGE, file=sys.stderr)
         exit(-1)
@@ -162,20 +154,10 @@ def main():
 
     if invalid_conf:
       print(USAGE, file=sys.stderr)
-      print("\n\nYour configuration is invalid", file=sys.stderr)
+      print("\n\nInvalid configuration", file=sys.stderr)
       exit(-1)
 
-    if args.call:
-        response = elks_conn.make_call(message,
-            conf.get('to', None),
-            conf.get('from', None))
-        if 'debug' in conf:
-            print(response)
-        elif 'verbose' in conf:
-            retval = json.loads(response)
-            print('Made connection to ' + conf['to'])
-    else:
-        send_sms(elks_conn, conf, message)
+    send_sms(elks_conn, conf, message, length=args.length)
 
 def parse_args():
     """Parse the arguments to the application"""
@@ -207,20 +189,26 @@ def parse_args():
                         action='count', help="""
                         Generates a configuration file from the commandline
                         options and exits.""")
+    parser.add_argument('-l', '--length', metavar='length',
+            action='store', type=int, default=160,
+            help='Maximum length of the message')
     parser.add_argument('-c', '--config', dest='configfile',
                         help="""Location of the custom configuration file""")
-    parser.add_argument('--call', '--dial', action='store_true', default=False,
-                        help="""Make a call [TO BE DEPRECATED]""")
-    parser.add_argument('--numbers', action='store_true',
-                        help="Show my numbers [TO BE DEPRECATED]")
     return parser.parse_args()
 
-def send_sms(conn, conf, message):
+def send_sms(conn, conf, message, length=160):
     sender = conf.get('from', 'elkme')
     to = conf.get('to', None)
 
+    if length > 1530 or length < 0:
+        print('Length must be larger than 0 and smaller than 1530')
+        return
+
+    if not isinstance(message, str):
+        message = " ".join(message)
+
     try:
-        response = conn.send_sms(message[:159], to, sender)
+        response = conn.send_sms(message[:length], to, sender)
     except HTTPError as e:
         print(e)
         return
@@ -230,10 +218,10 @@ def send_sms(conn, conf, message):
     elif 'verbose' in conf:
         retval = json.loads(response)
 
-        if len(message) > 160:
+        if len(message) > length:
             print(message)
             print('----')
-            print('Sent first 160 characters to ' + retval['to'])
+            print('Sent first %s characters to %s' % (length, retval['to']))
         else:
             print('Sent "' + retval['message'] + '" to ' + retval['to'])