From eb0dd827b1f46a66f0038fe7ed8124f2d23412bf Mon Sep 17 00:00:00 2001
From: Jack <jack@robisonservice.com>
Date: Tue, 24 May 2016 17:54:44 -0400
Subject: [PATCH] delete old unused app and move uri handler to lbry-osx-app

---
 .../lbrynet_daemon/Apps/LBRYOSXStatusBar.py   | 108 ------------------
 lbrynet/lbrynet_daemon/Apps/LBRYURIHandler.py |  60 ----------
 .../{Apps => daemon_scripts}/__init__.py      |   0
 setup_uri_handler.py                          |  25 ----
 4 files changed, 193 deletions(-)
 delete mode 100644 lbrynet/lbrynet_daemon/Apps/LBRYOSXStatusBar.py
 delete mode 100644 lbrynet/lbrynet_daemon/Apps/LBRYURIHandler.py
 rename lbrynet/lbrynet_daemon/{Apps => daemon_scripts}/__init__.py (100%)
 delete mode 100644 setup_uri_handler.py

diff --git a/lbrynet/lbrynet_daemon/Apps/LBRYOSXStatusBar.py b/lbrynet/lbrynet_daemon/Apps/LBRYOSXStatusBar.py
deleted file mode 100644
index 5ca433f72..000000000
--- a/lbrynet/lbrynet_daemon/Apps/LBRYOSXStatusBar.py
+++ /dev/null
@@ -1,108 +0,0 @@
-import rumps
-import xmlrpclib
-import os
-import webbrowser
-import subprocess
-import argparse
-
-
-class DaemonStatusBarApp(rumps.App):
-    def __init__(self):
-        icon_path = 'app.icns'
-        if os.path.isfile(icon_path):
-            rumps.App.__init__(self, name="LBRY", icon=icon_path, quit_button=None,
-                                menu=["Open", "Preferences", "View balance", "Quit"])
-        else:
-            rumps.App.__init__(self, name="LBRY", title="LBRY", quit_button=None,
-                                menu=["Open", "Preferences", "View balance", "Quit"])
-
-    @rumps.timer(1)
-    def alert_daemon_start(self):
-        daemon = xmlrpclib.ServerProxy("http://localhost:7080/")
-        try:
-            start_msg = daemon.is_running()
-            if isinstance(start_msg, str):
-                rumps.notification(title='LBRY', subtitle='', message=str(start_msg), sound=True)
-                update_info = daemon.check_for_new_version()
-                update_msg = ""
-                for p in update_info:
-                    if not p[0]:
-                        update_msg += p[1] + "\n"
-                if update_msg:
-                    update_msg += "\n Try running the installer again to fix this"
-                    rumps.notification(title='LBRY', subtitle='', message=update_msg, sound=True)
-        except:
-            pass
-
-    @rumps.clicked('Open')
-    def get_ui(self):
-        daemon = xmlrpclib.ServerProxy("http://localhost:7080/")
-        try:
-            daemon.is_running()
-            webbrowser.get('safari').open("lbry://lbry")
-        except:
-            try:
-                rumps.notification(title='LBRY', subtitle='', message="Couldn't connect to lbrynet daemon", sound=True)
-            except:
-                rumps.alert(title='LBRY', message="Couldn't connect to lbrynet daemon")
-
-    @rumps.clicked("Preferences")
-    def prefs(self):
-        daemon = xmlrpclib.ServerProxy("http://localhost:7080/")
-        try:
-            daemon.is_running()
-            webbrowser.get('safari').open("lbry://settings")
-        except:
-            rumps.notification(title='LBRY', subtitle='', message="Couldn't connect to lbrynet daemon", sound=True)
-
-    @rumps.clicked("View balance")
-    def disp_balance(self):
-        daemon = xmlrpclib.ServerProxy("http://localhost:7080/")
-        try:
-            balance = daemon.get_balance()
-            r = round(float(balance), 2)
-            try:
-                rumps.notification(title='LBRY', subtitle='', message=str("Your balance is %.2f LBC" % r), sound=False)
-            except:
-                rumps.alert(title='LBRY',  message=str("Your balance is %.2f LBC" % r))
-
-        except:
-            try:
-                rumps.notification(title='LBRY', subtitle='', message="Couldn't connect to lbrynet daemon", sound=True)
-            except:
-                rumps.alert(title='LBRY', message="Couldn't connect to lbrynet daemon")
-
-    @rumps.clicked('Quit')
-    def clean_quit(self):
-        daemon = xmlrpclib.ServerProxy("http://localhost:7080/")
-        try:
-            daemon.stop()
-        except:
-            pass
-        rumps.quit_application()
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Launch lbrynet status bar application")
-    parser.add_argument("--startdaemon",
-                        help="true or false, default true",
-                        type=str,
-                        default="true")
-    args = parser.parse_args()
-
-    if str(args.startdaemon).lower() == "true":
-        daemon = xmlrpclib.ServerProxy('http://localhost:7080')
-        try:
-            daemon.is_running()
-        except:
-            subprocess.Popen("screen -dmS lbrynet bash -c "
-                             "'PYTHONPATH=$PYTHONPATH:`cat /Users/${USER}/Library/Application\ Support/lbrynet/.python_path`; "
-                             "PATH=$PATH:`cat /Users/${USER}/Library/Application\ Support/lbrynet/.lbry_bin_path`; "
-                             "lbrynet-daemon --update=False'", shell=True)
-
-    status_app = DaemonStatusBarApp()
-    status_app.run()
-
-
-if __name__ == '__main__':
-    main()
\ No newline at end of file
diff --git a/lbrynet/lbrynet_daemon/Apps/LBRYURIHandler.py b/lbrynet/lbrynet_daemon/Apps/LBRYURIHandler.py
deleted file mode 100644
index f6990cfea..000000000
--- a/lbrynet/lbrynet_daemon/Apps/LBRYURIHandler.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import os
-import json
-import webbrowser
-import subprocess
-import sys
-
-from time import sleep
-from jsonrpc.proxy import JSONRPCProxy
-
-API_CONNECTION_STRING = "http://localhost:5279/lbryapi"
-UI_ADDRESS = "http://localhost:5279"
-
-
-class LBRYURIHandler(object):
-    def __init__(self):
-        self.started_daemon = False
-        self.daemon = JSONRPCProxy.from_url(API_CONNECTION_STRING)
-
-    def handle_osx(self, lbry_name):
-        try:
-            status = self.daemon.is_running()
-        except:
-            os.system("open /Applications/LBRY.app")
-            sleep(3)
-
-        if lbry_name == "lbry" or lbry_name == "":
-            webbrowser.open(UI_ADDRESS)
-        else:
-            webbrowser.open(UI_ADDRESS + "/?watch=" + lbry_name)
-
-    def handle_linux(self, lbry_name):
-        try:
-            status = self.daemon.is_running()
-        except:
-            cmd = r'DIR = "$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"' \
-                  r'if [-z "$(pgrep lbrynet-daemon)"]; then' \
-                    r'echo "running lbrynet-daemon..."' \
-                    r'$DIR / lbrynet - daemon &' \
-                    r'sleep 3  # let the daemon load before connecting' \
-                  r'fi'
-            subprocess.Popen(cmd, shell=True)
-
-        if lbry_name == "lbry" or lbry_name == "":
-            webbrowser.open(UI_ADDRESS)
-        else:
-            webbrowser.open(UI_ADDRESS + "/?watch=" + lbry_name)
-
-
-def main(args):
-    if len(args) != 1:
-        args = ['lbry://lbry']
-
-    name = args[0][7:]
-    if sys.platform == "darwin":
-        LBRYURIHandler().handle_osx(lbry_name=name)
-    else:
-        LBRYURIHandler().handle_linux(lbry_name=name)
-
-if __name__ == "__main__":
-   main(sys.argv[1:])
diff --git a/lbrynet/lbrynet_daemon/Apps/__init__.py b/lbrynet/lbrynet_daemon/daemon_scripts/__init__.py
similarity index 100%
rename from lbrynet/lbrynet_daemon/Apps/__init__.py
rename to lbrynet/lbrynet_daemon/daemon_scripts/__init__.py
diff --git a/setup_uri_handler.py b/setup_uri_handler.py
deleted file mode 100644
index e9ba6749c..000000000
--- a/setup_uri_handler.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from setuptools import setup
-import os
-
-APP = [os.path.join('lbrynet', 'lbrynet_daemon', 'Apps', 'LBRYURIHandler.py')]
-DATA_FILES = []
-OPTIONS = {'argv_emulation': True,
-           'packages': ['jsonrpc'],
-           'plist': {
-               'LSUIElement': True,
-               'CFBundleIdentifier': 'io.lbry.LBRYURIHandler',
-               'CFBundleURLTypes': [
-                    {
-                    'CFBundleURLTypes': 'LBRYURIHandler',
-                    'CFBundleURLSchemes': ['lbry']
-                    }
-               ]
-           }
-        }
-
-setup(
-    app=APP,
-    data_files=DATA_FILES,
-    options={'py2app': OPTIONS},
-    setup_requires=['py2app'],
-)
\ No newline at end of file