diff -Nru remindor-common-14.01.1/data/html/preferences.html remindor-common-14.06/data/html/preferences.html --- remindor-common-14.01.1/data/html/preferences.html 2014-04-24 11:13:27.000000000 +0000 +++ remindor-common-14.06/data/html/preferences.html 2014-06-29 01:20:10.000000000 +0000 @@ -426,7 +426,7 @@

Boxcar Email: Email address for your Boxcar account
Boxcar Token: The access token for your Boxcar account
Boxcar Notification: Whether or not to send a notification to Boxcar

diff -Nru remindor-common-14.01.1/debian/changelog remindor-common-14.06/debian/changelog --- remindor-common-14.01.1/debian/changelog 2014-04-24 14:05:56.000000000 +0000 +++ remindor-common-14.06/debian/changelog 2014-07-01 11:10:02.000000000 +0000 @@ -1,3 +1,9 @@ +remindor-common (14.06-0ubuntu1~saucy) saucy; urgency=low + + * Changed from Boxcar 1 to Boxcar 2 + + -- Brian Douglass Sat, 28 Jun 2014 21:12:00 -0500 + remindor-common (14.01.1-0ubuntu1~saucy) saucy; urgency=low * Fixed bug #1312055 diff -Nru remindor-common-14.01.1/debian/copyright remindor-common-14.06/debian/copyright --- remindor-common-14.01.1/debian/copyright 2014-04-24 11:13:27.000000000 +0000 +++ remindor-common-14.06/debian/copyright 2014-06-29 01:17:00.000000000 +0000 @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: remindor-common Upstream-Contact: Brian Douglass -Source: http://bhdouglass.tk/remindor-common/ +Source: http://bhdouglass.com/remindor-common/ Files: * Copyright: (C) 2013 Brian Douglass bhdouglass@gmail.com diff -Nru remindor-common-14.01.1/po/remindor-common.pot remindor-common-14.06/po/remindor-common.pot --- remindor-common-14.01.1/po/remindor-common.pot 2014-04-24 11:56:23.000000000 +0000 +++ remindor-common-14.06/po/remindor-common.pot 2014-06-30 23:43:12.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-24 07:56-0400\n" +"POT-Creation-Date: 2014-06-30 19:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru remindor-common-14.01.1/README.md remindor-common-14.06/README.md --- remindor-common-14.01.1/README.md 2014-04-24 11:13:27.000000000 +0000 +++ remindor-common-14.06/README.md 2014-06-29 01:16:38.000000000 +0000 @@ -1,7 +1,7 @@ Remindor-Common =============== -Common files for [indicator-remindor](http://bhdouglass.tk/indicator-remindor/) and [remindor-qt](http://bhdouglass.tk/remindor-qt/) +Common files for [indicator-remindor](http://bhdouglass.com/indicator-remindor/) and [remindor-qt](http://bhdouglass.com/remindor-qt/) License ======= @@ -13,4 +13,4 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License along with this program. If not, see . \ No newline at end of file +You should have received a copy of the GNU General Public License along with this program. If not, see . diff -Nru remindor-common-14.01.1/remindor_common/config.py remindor-common-14.06/remindor_common/config.py --- remindor-common-14.01.1/remindor_common/config.py 2014-04-24 11:13:27.000000000 +0000 +++ remindor-common-14.06/remindor_common/config.py 2014-06-27 23:23:01.000000000 +0000 @@ -77,7 +77,7 @@ self.simple_dialog = self.get('simple_dialog', False) self.simple_sound = self.get('simple_sound', False) - self.boxcar_email = self.get('boxcar_email', '') + self.boxcar_token = self.get('boxcar_token', '') self.boxcar_notify = self.get('boxcar_notify', 0) self.pushbullet_api_key = self.get('pushbullet_api_key', '') @@ -124,7 +124,7 @@ self.set('simple_popup', self.simple_popup) self.set('simple_dialog', self.simple_dialog) self.set('simple_sound', self.simple_sound) - self.set('boxcar_email', self.boxcar_email) + self.set('boxcar_token', self.boxcar_token) self.set('boxcar_notify', self.boxcar_notify) self.set('pushbullet_api_key', self.pushbullet_api_key) self.set('pushbullet_device', self.pushbullet_device) @@ -182,7 +182,7 @@ self.set('quick_slider', settings.quick_slider) self.set('quick_unit', settings.quick_unit) - self.set('boxcar_email', boxcar_service.email) + #self.set('boxcar_token', boxcar_service.email) self.set('boxcar_notify', boxcar_service.default_notify) self.set('last_news', db.get_internal('news_flash')) diff -Nru remindor-common-14.01.1/remindor_common/constants.py remindor-common-14.06/remindor_common/constants.py --- remindor-common-14.01.1/remindor_common/constants.py 2014-04-24 11:13:27.000000000 +0000 +++ remindor-common-14.06/remindor_common/constants.py 2014-06-29 01:14:59.000000000 +0000 @@ -16,12 +16,12 @@ import os -website = "http://bhdouglass.tk/remindor/indicator/" -website_qt = "http://bhdouglass.tk/remindor/qt/" +website = "http://bhdouglass.com/remindor/indicator/" +website_qt = "http://bhdouglass.com/remindor/qt/" -blogsite = "http://blog.bhdouglass.tk/" -rssfeed = "http://blog.bhdouglass.tk/rss" -donatesite = "http://bhdouglass.tk/remindor/contribute/" +blogsite = "http://blog.bhdouglass.com/" +rssfeed = "http://blog.bhdouglass.com/rss" +donatesite = "http://bhdouglass.com/remindor/contribute/" bugsite = "https://bugs.launchpad.net/indicator-remindor" bugsite_qt = "https://github.com/bhdouglass/remindor-qt/issues" diff -Nru remindor-common-14.01.1/remindor_common/dbus_service.py remindor-common-14.06/remindor_common/dbus_service.py --- remindor-common-14.01.1/remindor_common/dbus_service.py 2014-04-24 11:13:27.000000000 +0000 +++ remindor-common-14.06/remindor_common/dbus_service.py 2014-06-29 01:19:10.000000000 +0000 @@ -22,42 +22,42 @@ import dbus.service class dbus_service(dbus.service.Object): - def __init__(self, bus, path='/tk/bhdouglass/indicator_remindor/object'): + def __init__(self, bus, path='/com/bhdouglass/indicator_remindor/object'): dbus.service.Object.__init__(self, bus, path) self._bus = bus self._path = path - self._interface = 'tk.bhdouglass.indicator_remindor' + self._interface = 'com.bhdouglass.indicator_remindor' - @dbus.service.signal(dbus_interface='tk.bhdouglass.indicator_remindor', signature='s') + @dbus.service.signal(dbus_interface='com.bhdouglass.indicator_remindor', signature='s') def command(self, command): pass - @dbus.service.method(dbus_interface='tk.bhdouglass.indicator_remindor') + @dbus.service.method(dbus_interface='com.bhdouglass.indicator_remindor') def emitUpdate(self): self.command('update') return 'Signal emitted' - @dbus.service.method(dbus_interface='tk.bhdouglass.indicator_remindor') + @dbus.service.method(dbus_interface='com.bhdouglass.indicator_remindor') def emitStop(self): self.command('stop') return 'Signal emitted' - @dbus.service.method(dbus_interface='tk.bhdouglass.indicator_remindor') + @dbus.service.method(dbus_interface='com.bhdouglass.indicator_remindor') def emitManage(self): self.command('manage') return 'Signal emitted' - @dbus.service.method(dbus_interface='tk.bhdouglass.indicator_remindor') + @dbus.service.method(dbus_interface='com.bhdouglass.indicator_remindor') def emitAttention(self): self.command('attention') return 'Signal emitted' - @dbus.service.method(dbus_interface='tk.bhdouglass.indicator_remindor') + @dbus.service.method(dbus_interface='com.bhdouglass.indicator_remindor') def emitActive(self): self.command('active') return 'Signal emitted' - @dbus.service.method(dbus_interface='tk.bhdouglass.indicator_remindor') + @dbus.service.method(dbus_interface='com.bhdouglass.indicator_remindor') def emitClose(self): self.command('close') return 'Signal emitted' diff -Nru remindor-common-14.01.1/remindor_common/helpers.py remindor-common-14.06/remindor_common/helpers.py --- remindor-common-14.01.1/remindor_common/helpers.py 2014-04-24 11:13:27.000000000 +0000 +++ remindor-common-14.06/remindor_common/helpers.py 2014-06-27 23:22:21.000000000 +0000 @@ -485,7 +485,7 @@ self.popup = self.settings.popup self.dialog = self.settings.dialog self.boxcar = self.settings.boxcar_notify - self.boxcar_ok = self.settings.boxcar_email != '' + self.boxcar_ok = self.settings.boxcar_token != '' self.pushbullet_api_key = self.settings.pushbullet_api_key self.pushbullet_device = self.settings.pushbullet_device self.pushbullet_devices = self.settings.pushbullet_devices @@ -843,6 +843,7 @@ return self.ok + ''' def validate_boxcar(self, boxcar_email, boxcar_notify, boxcar_original): return_status = self.boxcar_add @@ -859,3 +860,4 @@ return_status = self.boxcar_delete return return_status + ''' diff -Nru remindor-common-14.01.1/remindor_common/__init__.py remindor-common-14.06/remindor_common/__init__.py --- remindor-common-14.01.1/remindor_common/__init__.py 2014-04-24 11:46:56.000000000 +0000 +++ remindor-common-14.06/remindor_common/__init__.py 2014-06-29 01:21:39.000000000 +0000 @@ -15,4 +15,4 @@ ### END LICENSE def version(): - return '14.01.1' + return '14.06' diff -Nru remindor-common-14.01.1/remindor_common/scheduler.py remindor-common-14.06/remindor_common/scheduler.py --- remindor-common-14.01.1/remindor_common/scheduler.py 2014-04-24 11:13:27.000000000 +0000 +++ remindor-common-14.06/remindor_common/scheduler.py 2014-06-27 23:21:02.000000000 +0000 @@ -116,9 +116,9 @@ def popup_dialog(self, label, notes): raise NotImplementedError("Need to implement popup_dialog!") - def run_boxcar(self, boxcar_email, label, notes): + def run_boxcar(self, boxcar_token, label, notes): logger.debug("scheduler: run_boxcar") - Boxcar(boxcar_email).notify(label, notes) + Boxcar(boxcar_token).notify(label, notes) def run_pushbullet(self, pushbullet_api_key, pushbullet_device, label, notes): logger.debug("scheduler: run_pushbullet") @@ -161,8 +161,8 @@ if a.dialog: self.popup_dialog(label, notes) - if a.boxcar and settings.boxcar_email != "": - self.run_boxcar(settings.boxcar_email, a.label, notes) + if a.boxcar and settings.boxcar_token != "": + self.run_boxcar(settings.boxcar_token, a.label, notes) if a.pushbullet_device and settings.pushbullet_api_key: self.run_pushbullet(settings.pushbullet_api_key, a.pushbullet_device, a.label, notes) diff -Nru remindor-common-14.01.1/remindor_common/services/boxcar.py remindor-common-14.06/remindor_common/services/boxcar.py --- remindor-common-14.01.1/remindor_common/services/boxcar.py 2014-04-24 11:13:27.000000000 +0000 +++ remindor-common-14.06/remindor_common/services/boxcar.py 2014-06-29 01:15:50.000000000 +0000 @@ -23,31 +23,13 @@ from remindor_common.services.post import Post class Boxcar(): - api_key = '2KXkozIJdhwT9tyvukKf' - api_url = 'http://boxcar.io/devices/providers/' - ir_url = 'http://bhdouglass.tk/remindor/' - icon_url = 'http://bhdouglass.tk/assets/img/ir_iphone_57.png' - email = '' + api_url = 'https://new.boxcar.io/api/notifications' - def __init__(self, email): - self.email = email + def __init__(self, token): + self.token = token - def subscribe(self): - #probably shouldn't thread this, we need to know if it fails or not - status = -1 - try: - r = requests.post(self.build_url('/notifications/subscribe'), params={'email': self.email}) - status = r.status_code - except: - logger.debug('exception caught trying subscribe to boxcar: ' + str(sys.exc_info()[0])) - - return status - - def notify(self, screen_name, message, callback = None, err_callback = None): - data = {'email': self.email, 'notification[from_screen_name]': screen_name, - 'notification[message]': message, 'notification[source_url]': self.ir_url} - b = Post(self.build_url('/notifications'), data) + def notify(self, title, message, callback = None, err_callback = None): + data = {'user_credentials': self.token, 'notification[title]': title, + 'notification[long_message]': message, 'notification[source_name]': 'Remindor'} + b = Post(self.api_url, data) b.start() - - def build_url(self, route): - return self.api_url + self.api_key + route diff -Nru remindor-common-14.01.1/remindor_common/services/post.py remindor-common-14.06/remindor_common/services/post.py --- remindor-common-14.01.1/remindor_common/services/post.py 2014-04-24 11:13:27.000000000 +0000 +++ remindor-common-14.06/remindor_common/services/post.py 2014-06-29 01:07:13.000000000 +0000 @@ -48,7 +48,7 @@ logger.debug("Post request status: " + str(status)) - if status != 200: + if status < 200 and status > 202: if self.err_callback is None: raise Exception('%d response recieved while posting to %s' % (status, self.url)) else: diff -Nru remindor-common-14.01.1/remindor_common/services.py remindor-common-14.06/remindor_common/services.py --- remindor-common-14.01.1/remindor_common/services.py 2014-04-24 11:13:27.000000000 +0000 +++ remindor-common-14.06/remindor_common/services.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- -### BEGIN LICENSE -# Copyright (C) 2013 Brian Douglass bhdouglass@gmail.com -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 3, as published -# by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranties of -# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -### END LICENSE - -import requests -import sys - -import logging -logger = logging.getLogger('remindor_common') - -from remindor_common import threads - -boxcar_api_key = "2KXkozIJdhwT9tyvukKf" -boxcar_url = "http://boxcar.io/devices/providers/" -ir_url = "http://bhdouglass.tk/remindor/" -icon_url = "http://bhdouglass.tk/assets/img/ir_iphone_57.png" - -def boxcar_subscribe(email): - #probably shouldn't thread this, we need to know if it fails or not - status = -1 - try: - data = {"email":email} - url = boxcar_url + boxcar_api_key + "/notifications/subscribe" - r = requests.post(url, params=data) - status = r.status_code - except: - logger.debug("exception caught trying subscribe to boxcar: " + str(sys.exc_info()[0])) - - return status - -def boxcar_notify(email, screen_name, message): - data = {"email":email, "notification[from_screen_name]":screen_name, - "notification[message]":message, "notification[source_url]":ir_url} - url = boxcar_url + boxcar_api_key + "/notifications" - - b = threads.PostRequest(url, data) - b.start() - - '''status = -1 - try: - data = {"email":email, "notification[from_screen_name]":screen_name, - "notification[message]":message, "notification[source_url]":ir_url} - url = boxcar_url + boxcar_api_key + "/notifications" - r = requests.post(url, params=data) - logger.debug(r.content) - status = r.status_code - except: - logger.debug("exception caught trying send boxcar notification") - - return status''' diff -Nru remindor-common-14.01.1/setup.py remindor-common-14.06/setup.py --- remindor-common-14.01.1/setup.py 2014-04-24 11:46:40.000000000 +0000 +++ remindor-common-14.06/setup.py 2014-06-29 01:21:47.000000000 +0000 @@ -27,11 +27,11 @@ DistUtilsExtra.auto.setup( name='remindor-common', - version='14.01.1', + version='14.06', license='GPL-3', author='Brian Douglass', author_email='bhdouglass@gmail.com', description='Common files for indicator-remindor and remindor-qt.', - url='http://bhdouglass.tk/remindor/', + url='http://bhdouglass.com/remindor/', long_description='Common files for indicator-remindor and remindor-qt.' )