Repository: raspiblitz/raspiblitz

Issue:
Remove ip2tor.com shop
Remove ip2tor shop directory ... add a manual address field ... because ip2tor.com stops operating and the fulmo one is not well maintained either. 

So maybe just offer manual address input there and point to https://github.com/raulcano/docker-ip2tor-shop if people wanna run it themselves or for friends-.


Discussion:

Resolving patch:
diff --git a/home.admin/config.scripts/blitz.subscriptions.ip2tor.py b/home.admin/config.scripts/blitz.subscriptions.ip2tor.py
--- a/home.admin/config.scripts/blitz.subscriptions.ip2tor.py
+++ b/home.admin/config.scripts/blitz.subscriptions.ip2tor.py
@@ -632,30 +632,42 @@ def menuMakeSubscription(blitzServiceName, torAddress, torPort):
         # enter own shop address option
         choices.append(("X", "Enter a new Shop URL"))
 
-        # select dialog
+        # show a dialog info box
         d = Dialog(dialog="dialog", autowidgetsize=True)
         d.set_background_title("IP2TOR - Select Shop")
-        code, selected = d.menu(
-            "\nChoose your IP2Tor provider/shop:",
-            choices=choices, width=75, height=10, title="Select IP2Tor Shop")
+        d.msgbox('''
+At the moment there are no public IP2TOR services to link to.
+You could run one yourself - please check the GitHub repo:
+https://github.com/raulcano/docker-ip2tor-shop''', height=10, width=72)
+
+        # select dialog
+        #d = Dialog(dialog="dialog", autowidgetsize=True)
+        #d.set_background_title("IP2TOR - Select Shop")
+        #code, selected = d.menu(
+        #    "\nChoose your IP2Tor provider/shop:",
+        #    choices=choices, width=75, height=10, title="Select IP2Tor Shop")
 
         # if user canceled
-        if code != d.OK:
-            sys.exit(0)
+        #if code != d.OK:
+        #    sys.exit(0)
 
-        if selected == "A" : shopurl=choice_url_ip2torcom
-        if selected == "B" : shopurl=choice_url_fulmo
-        if selected == "Y" : shopurl=lastusedShop
+        #if selected == "A" : shopurl=choice_url_ip2torcom
+        #if selected == "B" : shopurl=choice_url_fulmo
+        #if selected == "Y" : shopurl=lastusedShop
 
         # input shop url
-        if selected == "X":
-            d = Dialog(dialog="dialog", autowidgetsize=True)
-            d.set_background_title("IP2TOR - Add new Shop")
-            code, shopurl = d.inputbox(
-                "Enter Address of the IP2TOR Shop (OR JUST PRESS OK):",
-                height=10, width=72, init=shopurl,
-                title="Shop Address")
-            if shopurl.find("://") > 0: shopurl = shopurl[shopurl.find("://") + 3:]
+        #if selected == "X":
+        d = Dialog(dialog="dialog", autowidgetsize=True)
+        d.set_background_title("IP2TOR - Add new Shop")
+        code, shopurl = d.inputbox(
+            "Enter Address of the IP2TOR Shop (OR JUST PRESS OK):",
+            height=10, width=72, init=shopurl,
+            title="Shop Address")
+        if shopurl.find("://") > 0: shopurl = shopurl[shopurl.find("://") + 3:]
+
+        # if user choose cancel
+        if code != d.OK:
+            sys.exit(0)
 
         # try & get host list from shop
         os.system('clear')


Test patch: