[chirp_users] Patch for Bug #6381

[j j]

Hello All,

I created a patch for Bug #6381 (DMR-Marc repeater download problem) and
attached it here.  The URL and format changed.  I just followed the links
in a web browser and fixed the format parsing.  Let me know if there is a
better process for this.  I tried to follow the Wiki process, but couldn't
get the automatic email from the command line working.

--Jeff


# HG changeset patch
# User Jeff Johnson <jeffjohnson0 at gmail.com>
# Date 1573797619 28800
#      Thu Nov 14 22:00:19 2019 -0800
# Node ID cbf3ce3272c77006a84980cea99d4c38b25cb5a5
# Parent  067b69c9b7d04d49462f390d99bc7f80c4b1b5d2
Bug #6381 Added new link and JSON structure for DMR-Marc repeaters.

diff --git a/chirp/dmrmarc.py b/chirp/dmrmarc.py
--- a/chirp/dmrmarc.py
+++ b/chirp/dmrmarc.py
@@ -35,8 +35,7 @@
     VENDOR = "DMR-MARC"
     MODEL = "Repeater database"

-    URL = "http://www.dmr-marc.net/cgi-bin/trbo-database/datadump.cgi?" \
-          "table=repeaters&format=json"
+    URL = "https://www.radioid.net/static/rptrs.json"

     def __init__(self, *args, **kwargs):
         chirp_common.NetworkSourceRadio.__init__(self, *args, **kwargs)
@@ -54,7 +53,7 @@
         filename, headers = urllib.urlretrieve(self.URL, fn)
         with open(fn, 'r') as f:
             try:
-                self._repeaters = json.load(f)['repeaters']
+                self._repeaters = json.load(f)['rptrs']
             except AttributeError:
                 raise errors.RadioError(
                     "Unexpected response from %s" % self.URL)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://intrepid.danplanet.com/pipermail/chirp_users/attachments/20191205/6880e939/attachment.html 
-------------- next part --------------
# HG changeset patch
# User Jeff Johnson <jeffjohnson0 at gmail.com>
# Date 1573797619 28800
#      Thu Nov 14 22:00:19 2019 -0800
# Node ID cbf3ce3272c77006a84980cea99d4c38b25cb5a5
# Parent  067b69c9b7d04d49462f390d99bc7f80c4b1b5d2
Bug #6381 Added new link and JSON structure for DMR-Marc repeaters.

diff --git a/chirp/dmrmarc.py b/chirp/dmrmarc.py
--- a/chirp/dmrmarc.py
+++ b/chirp/dmrmarc.py
@@ -35,8 +35,7 @@
     VENDOR = "DMR-MARC"
     MODEL = "Repeater database"
 
-    URL = "http://www.dmr-marc.net/cgi-bin/trbo-database/datadump.cgi?" \
-          "table=repeaters&format=json"
+    URL = "https://www.radioid.net/static/rptrs.json"
 
     def __init__(self, *args, **kwargs):
         chirp_common.NetworkSourceRadio.__init__(self, *args, **kwargs)
@@ -54,7 +53,7 @@
         filename, headers = urllib.urlretrieve(self.URL, fn)
         with open(fn, 'r') as f:
             try:
-                self._repeaters = json.load(f)['repeaters']
+                self._repeaters = json.load(f)['rptrs']
             except AttributeError:
                 raise errors.RadioError(
                     "Unexpected response from %s" % self.URL)