diff --git a/README.md b/README.md index 0c55bee..cecf270 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ After that, you can run `hackertray` from anywhere and it will run. You can now add it to your OS dependent session autostart method. In Ubuntu, you can access it via: -1. System > Preferences > Sessions +1. System > Preferences > Sessions (OR) 2. System > Preferences > Startup Applications @@ -60,7 +60,6 @@ HackerTray accepts its various options via the command line. Run `hackertray -h` 1. `-c`: Enables comments support. Clicking on links will also open the comments page on HN. Can be switched off via the UI, but the setting is not remembered. 2. `--chrome PROFILE-PATH`: Specifying a profile path to a chrome directory will make HackerTray read the Chrome History file to mark links as read. Links are checked once every 5 minutes, which is when the History file is copied (to override the lock in case Chrome is open), searched using sqlite and deleted. This feature is still experimental. 3. `--firefox PROFILE-PATH`: Specify path to a firefox profile directory. HackerTray will read your firefox history from this profile, and use it to mark links as read. -4. `--dnt`: Disable analytics. Hackertray will no longer collect any sort of analytics. I'd prefer it if you left out this switch, as it helps me improve hackertray by understanding how its being used. Note that the `--chrome` and `--firefox` options are independent, and can be used together. However, they cannot be specified multiple times (so reading from 2 chrome profiles is not possible). @@ -103,7 +102,7 @@ To develop on hackertray, or to test out experimental versions, do the following ## Analytics -To help improve the project and learn how its being used, I've added Analytics in hackertray. The `--dnt` switch disables all analytics so that you can opt-out if desired. All data is collected anonymously, with no machine id or user-identifying information being sent back. To learn more, and see which events are being tracked, see the [Analytics](https://github.com/captn3m0/hackertray/wiki/Analytics) wiki page. +**No more tracking**. All data every collected for this project has been deleted. You can see [the wiki](https://github.com/captn3m0/hackertray/wiki/Analytics) for what all was collected earlier. ## Credits diff --git a/hackertray/__init__.py b/hackertray/__init__.py index e33c1bb..6cc0212 100644 --- a/hackertray/__init__.py +++ b/hackertray/__init__.py @@ -29,14 +29,12 @@ from .hackernews import HackerNews from .chrome import Chrome from .firefox import Firefox from .version import Version -from .analytics import Analytics class HackerNewsApp: HN_URL_PREFIX = "https://news.ycombinator.com/item?id=" UPDATE_URL = "https://github.com/captn3m0/hackertray#upgrade" ABOUT_URL = "https://github.com/captn3m0/hackertray" - MIXPANEL_TOKEN = "51a04e37dad59393c7371407e84a8050" def __init__(self, args): # Load the database @@ -49,9 +47,6 @@ class HackerNewsApp: except ValueError: self.db = set() - # Setup analytics - self.tracker = Analytics(args.dnt, HackerNewsApp.MIXPANEL_TOKEN) - # create an indicator applet self.ind = appindicator.Indicator("Hacker Tray", "hacker-tray", appindicator.CATEGORY_APPLICATION_STATUS) self.ind.set_status(appindicator.STATUS_ACTIVE) @@ -111,7 +106,7 @@ class HackerNewsApp: launch_data['browser'] = subprocess.check_output(["xdg-settings", "get", "default-web-browser"]).strip() except subprocess.CalledProcessError as e: launch_data['browser'] = "unknown" - self.tracker.track('launch', launch_data) + def toggleComments(self, widget): """Whether comments page is opened or not""" @@ -122,12 +117,10 @@ class HackerNewsApp: webbrowser.open(HackerNewsApp.UPDATE_URL) # Remove the update button once clicked self.menu.remove(widget) - self.tracker.visit(HackerNewsApp.UPDATE_URL) def showAbout(self, widget): """Handle the about btn""" webbrowser.open(HackerNewsApp.ABOUT_URL) - self.tracker.visit(HackerNewsApp.ABOUT_URL) # ToDo: Handle keyboard interrupt properly def quit(self, widget, data=None): @@ -140,7 +133,6 @@ class HackerNewsApp: file.write(json.dumps(l)) gtk.main_quit() - self.tracker.track('quit') def run(self): signal.signal(signal.SIGINT, self.quit) @@ -161,7 +153,6 @@ class HackerNewsApp: if self.commentState: webbrowser.open(self.HN_URL_PREFIX + str(widget.hn_id)) - self.tracker.visit(widget.url) def addItem(self, item): """Adds an item to the menu""" @@ -230,7 +221,6 @@ def main(): parser.add_argument('-c', '--comments', dest='comments', action='store_true', help="Load the HN comments link for the article as well") parser.add_argument('--chrome', dest='chrome', help="Specify a Google Chrome Profile directory to use for matching chrome history") parser.add_argument('--firefox', dest='firefox', help="Specify a Firefox Profile directory to use for matching firefox history") - parser.add_argument('--dnt', dest='dnt', action='store_true', help="Disable all analytics (Do Not Track)") parser.set_defaults(comments=False) parser.set_defaults(dnt=False) args = parser.parse_args() diff --git a/hackertray/analytics.py b/hackertray/analytics.py deleted file mode 100644 index 8498b6c..0000000 --- a/hackertray/analytics.py +++ /dev/null @@ -1,27 +0,0 @@ -from mixpanel import Mixpanel - - -class Analytics: - # Setup analytics. - # dnt - do not track. Disables tracking if True - # token - The mixpanel token - - def __init__(self, dnt, token): - self.dnt = dnt - self.tracker = Mixpanel(token) - if(self.dnt == True): - print("[+] Analytics disabled") - # Track an event - # event - string containing the event name - # data - data related to the event, defaults to {} - - def track(self, event, data={}): - if(self.dnt == False): - # All events are tracked anonymously - self.tracker.track("anonymous", event, data) - # Track a visit to a URL - # The url maybe an HN submission or - # some meta-url pertaining to hackertray - - def visit(self, url): - self.track('visit', {"link": url}) diff --git a/setup.py b/setup.py index 8c2ce08..c259950 100644 --- a/setup.py +++ b/setup.py @@ -3,10 +3,7 @@ import sys from setuptools import setup from setuptools import find_packages - requirements = ['requests'] -if sys.version_info < (2, 7): - requirements.append('argparse') setup(name='hackertray', version='3.0.0', @@ -22,8 +19,7 @@ setup(name='hackertray', 'hackertray.data': ['hacker-tray.png'] }, install_requires=[ - 'requests>=2.2.1', - 'mixpanel-py>=3.0.0' + 'requests>=2.23.0' ], entry_points={ 'console_scripts': ['hackertray = hackertray:main'],