From ccd51ea42952f2bccc23a916a9f9514c248539a0 Mon Sep 17 00:00:00 2001
From: acidvegas <acid.vegas@acid.vegas>
Date: Fri, 29 Nov 2024 23:02:21 -0500
Subject: [PATCH] conflicting pypi repo names

---
 README.md                                            | 10 +++++-----
 setup.py                                             | 12 ++++++------
 .../__init__.py                                      |  4 ++--
 .../client.py                                        |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename src/{meshtastic_mqtt => meshtastic_mqtt_json}/__init__.py (86%)
 rename src/{meshtastic_mqtt => meshtastic_mqtt_json}/client.py (99%)

diff --git a/README.md b/README.md
index e383760..3eea6b1 100644
--- a/README.md
+++ b/README.md
@@ -20,16 +20,16 @@ This library connects to a Meshtastic MQTT broker and decodes various message ty
 Install from PyPI:
 
 ```bash
-pip install meshtastic-mqtt
+pip install meshtastic-mqtt-json
 ```
 
 ## usage
 ```bash
-python meshtastic_mqtt [options]
+python meshtastic_mqtt_json [options]
 ```
 
 ```python
-from meshtastic_mqtt import MeshtasticMQTT
+from meshtastic_mqtt_json import MeshtasticMQTT
 client = MeshtasticMQTT()
 client.connect(broker='mqtt.meshtastic.org', port=1883, root='msh/US/2/e/', channel='LongFast', username='meshdev', password='large4cats', key='AQ==')
 ```
@@ -48,7 +48,7 @@ client.connect(broker='mqtt.meshtastic.org', port=1883, root='msh/US/2/e/', chan
 
 ### Filter Example
 ```bash
-python meshtastic_mqtt.py --filter "NODEINFO,POSITION,TEXT_MESSAGE"
+python meshtastic_mqtt_json.py --filter "NODEINFO,POSITION,TEXT_MESSAGE"
 ```
 
 
@@ -91,4 +91,4 @@ The library supports parsing of the following Meshtastic message types:
 
 ___
 
-###### Mirrors for this repository: [acid.vegas](https://git.acid.vegas/meshtastic_mqtt) • [SuperNETs](https://git.supernets.org/acidvegas/meshtastic_mqtt) • [GitHub](https://github.com/acidvegas/meshtastic_mqtt) • [GitLab](https://gitlab.com/acidvegas/meshtastic_mqtt) • [Codeberg](https://codeberg.org/acidvegas/meshtastic_mqtt)
+###### Mirrors for this repository: [acid.vegas](https://git.acid.vegas/meshtastic_mqtt_json) • [SuperNETs](https://git.supernets.org/acidvegas/meshtastic_mqtt_json) • [GitHub](https://github.com/acidvegas/meshtastic_mqtt_json) • [GitLab](https://gitlab.com/acidvegas/meshtastic_mqtt_json) • [Codeberg](https://codeberg.org/acidvegas/meshtastic_mqtt_json)
diff --git a/setup.py b/setup.py
index 83e7daf..23d3e98 100644
--- a/setup.py
+++ b/setup.py
@@ -1,18 +1,18 @@
 from setuptools import setup, find_packages
 
 setup(
-    name="meshtastic_mqtt",
+    name="meshtastic-mqtt-json",
     version='0.1.0',
     author='acidvegas',
     author_email='acid.vegas@acid.vegas',
     description='A lightweight Python library for parsing Meshtastic MQTT messages',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',
-    url='https://github.com/acidvegas/meshtastic_mqtt',
+    url='https://github.com/acidvegas/meshtastic_mqtt_json',
     project_urls={
-        'Bug Tracker'   : 'https://github.com/acidvegas/meshtastic_mqtt/issues',
-        'Documentation' : 'https://github.com/acidvegas/meshtastic_mqtt#readme',
-        'Source Code'   : 'https://github.com/acidvegas/meshtastic_mqtt',
+        'Bug Tracker'   : 'https://github.com/acidvegas/meshtastic_mqtt_json/issues',
+        'Documentation' : 'https://github.com/acidvegas/meshtastic_mqtt_json#readme',
+        'Source Code'   : 'https://github.com/acidvegas/meshtastic_mqtt_json',
     },
     packages=find_packages(where='src'),
     package_dir={'': 'src'},
@@ -37,7 +37,7 @@ setup(
     ],
     entry_points={
         'console_scripts': [
-            'meshtastic-mqtt=meshtastic_mqtt.client:main',
+            'meshtastic-mqtt-json=meshtastic_mqtt_json.client:main',
         ],
     },
 ) 
\ No newline at end of file
diff --git a/src/meshtastic_mqtt/__init__.py b/src/meshtastic_mqtt_json/__init__.py
similarity index 86%
rename from src/meshtastic_mqtt/__init__.py
rename to src/meshtastic_mqtt_json/__init__.py
index f0f5c40..c417344 100644
--- a/src/meshtastic_mqtt/__init__.py
+++ b/src/meshtastic_mqtt_json/__init__.py
@@ -1,6 +1,6 @@
-"""
+''' 
 Meshtastic MQTT Interface - A lightweight Python library for parsing Meshtastic MQTT messages
-"""
+'''
 
 from .client import MeshtasticMQTT
 
diff --git a/src/meshtastic_mqtt/client.py b/src/meshtastic_mqtt_json/client.py
similarity index 99%
rename from src/meshtastic_mqtt/client.py
rename to src/meshtastic_mqtt_json/client.py
index f8434c5..387443f 100644
--- a/src/meshtastic_mqtt/client.py
+++ b/src/meshtastic_mqtt_json/client.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Meshtastic MQTT Interface - Developed by acidvegas in Python (https://acid.vegas/meshtastic)
+# Meshtastic MQTT Interface - Developed by acidvegas in Python (https://acid.vegas/meshtastic_mqtt_json)
 
 import argparse
 import base64