Merge branch 'BUGFIX/yapsy1.12'

xbnstudios · Jul 21, 2019 · f984fba · f984fba
2 parents e27852b + cae20aa
commit f984fba
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 40 deletions.
diff --git a/conf.py b/conf.py
@@ -20,13 +20,13 @@
 # -- Project information -----------------------------------------------------
 
 project = "Gelo"
-copyright = "2018, s0ph0s"
+copyright = "2019, s0ph0s"
 author = "s0ph0s"
 
 # The short X.Y version
-version = "1.1"
+version = "4.0"
 # The full version, including alpha/beta/rc tags
-release = "v1.1.0"
+release = "v4.0.0"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/gelo.ini.example b/gelo.ini.example
@@ -19,9 +19,9 @@ macro_file=$HOME/.config/gelo/macros.ini
 broadcast_delay = 8.0
 
 #
-# plugin:http_poller: Configure the HTTP poller metadata source
+# plugin:HttpPoller: Configure the HTTP poller metadata source
 #
-[plugin:http_poller]
+[plugin:HttpPoller]
 # poll_url
 # The URL to poll for markers
 poll_url=http://localhost:8080/nowplaying.xsl
@@ -33,9 +33,9 @@ poll_url=http://localhost:8080/nowplaying.xsl
 prefix_file = /tmp/prefix.txt
 
 #
-# plugin:tweeter: Configure the Twitter plugin
+# plugin:Tweeter: Configure the Twitter plugin
 #
-[plugin:tweeter]
+[plugin:Tweeter]
 ########
 # NOTE #
 ########
@@ -77,10 +77,10 @@ announce_string=Now Playing{special}: {marker}
 ;delayed = True
 
 #
-# plugin:now_playing_file: A text file that contains a single line with the
+# plugin:NowPlayingFile: A text file that contains a single line with the
 # current marker data
 #
-[plugin:now_playing_file]
+[plugin:NowPlayingFile]
 # path
 # The path to write the now playing file to.  Environment variable expansion is
 # performed on this string value.
@@ -91,9 +91,9 @@ path=$HOME/Desktop/np.txt
 
 
 #
-# plugin:irc: Configure the IRC client plugin
+# plugin:IRC: Configure the IRC client plugin
 #
-[plugin:irc]
+[plugin:IRC]
 # nick
 # The IRC nick to use when connecting
 nick=gelo
@@ -135,9 +135,9 @@ message=Now Playing{special}: {marker}
 ;delayed = True
 
 #
-# plugin:audacity_labels: Configure the Audacity Labels plugin
+# plugin:AudacityLabels: Configure the Audacity Labels plugin
 #
-[plugin:audacity_labels]
+[plugin:AudacityLabels]
 # path
 # The path to write the file to. Environment variable expansion is performed on
 # this string value, and "{show}" will be replaced by the show that Gelo was
@@ -150,9 +150,9 @@ path=$HOME/Desktop/{show}-{count}.txt
 ;delayed = False
 
 #
-# plugin:http_pusher: Configure the HTTP Pusher plugin
+# plugin:HttpPusher: Configure the HTTP Pusher plugin
 #
-[plugin:http_pusher]
+[plugin:HttpPusher]
 # url
 # The URL to connect to, with no arguments. HTTPS is supported.
 url = https://example.com/now_playing
@@ -176,9 +176,9 @@ marker_param = song
 ;delayed = False
 
 #
-# plugin:somafm: Configure the SomaFM plugin
+# plugin:SomaFM: Configure the SomaFM plugin
 #
-[plugin:somafm]
+[plugin:SomaFM]
 # stream_url
 # The URL of the SomaFM stream to connect to.  Must be a direct link, not a
 # playlist link.  Also, only HTTP MP3 streams are supported, because they're
@@ -202,9 +202,9 @@ marker_prefix = "(Pre-Show) "
 start_disabled = True
 
 #
-# plugin:181fm: Configure the 181.FM plugin
+# plugin:OneEightyOneFM: Configure the 181.FM plugin
 #
-[plugin:one_eighty_one_fm]
+[plugin:OneEightyOneFM]
 # stream_url
 # The URL of the 181.FM stream to connect to.  Must be a direct link, not a
 # playlist link.  Also, only HTTP MP3 streams are supported, because they're

diff --git a/gelo/main.py b/gelo/main.py
@@ -38,7 +38,7 @@ def instanciateElementWithImportInfo(
     ):
         """Instantiate a plugin.
         The typo is intentional, because that's how the framework spells it."""
-        c = self.config.configparser["plugin:" + plugin_module_name]
+        c = self.config.configparser["plugin:" + element_name]
         return element(c, self.mediator, self.show)
 
     def instanciateElement(self, element):

diff --git a/gelo/plugins/audacity_labels.gelo-plugin → gelo/plugins/AudacityLabels.gelo-plugin b/gelo/plugins/audacity_labels.gelo-plugin → gelo/plugins/AudacityLabels.gelo-plugin
@@ -1,6 +1,6 @@
 [Core]
 Name = AudacityLabels
-Module = audacity_labels
+Module = AudacityLabels
 
 [Documentation]
 Description = Create an Audacity label file from the markers.

diff --git a/gelo/plugins/audacity_labels.py → gelo/plugins/AudacityLabels.py b/gelo/plugins/audacity_labels.py → gelo/plugins/AudacityLabels.py
@@ -7,7 +7,7 @@
 class AudacityLabels(arch.IMarkerSink):
     """Write every MarkerType.TRACK marker to a CSV file, but with tabs."""
 
-    PLUGIN_MODULE_NAME = "audacity_labels"
+    PLUGIN_MODULE_NAME = "AudacityLabels"
     LINE_TEMPLATE = "{start}\t{finish}\t{label}\n"
 
     def __init__(self, config, mediator: arch.IMediator, show: str):

diff --git a/gelo/plugins/http_poller.gelo-plugin → gelo/plugins/HttpPoller.gelo-plugin b/gelo/plugins/http_poller.gelo-plugin → gelo/plugins/HttpPoller.gelo-plugin
@@ -1,6 +1,6 @@
 [Core]
 Name = HttpPoller
-Module = http_poller
+Module = HttpPoller
 
 [Documentation]
 Description = Poll an HTTP server for marker data every 0.25 seconds.

diff --git a/gelo/plugins/http_poller.py → gelo/plugins/HttpPoller.py b/gelo/plugins/http_poller.py → gelo/plugins/HttpPoller.py
@@ -8,7 +8,7 @@
 class HttpPoller(arch.IMarkerSource):
     """Poll an HTTP server of some description for markers."""
 
-    PLUGIN_MODULE_NAME = "http_poller"
+    PLUGIN_MODULE_NAME = "HttpPoller"
 
     def __init__(self, config, mediator: arch.IMediator, show: str):
         """Create a new instance of HttpPoller."""

diff --git a/gelo/plugins/http_pusher.gelo-plugin → gelo/plugins/HttpPusher.gelo-plugin b/gelo/plugins/http_pusher.gelo-plugin → gelo/plugins/HttpPusher.gelo-plugin
@@ -1,6 +1,6 @@
 [Core]
 Name = HttpPusher
-Module = http_pusher
+Module = HttpPusher
 
 [Documentation]
 Description = Connect to an HTTP(S) endpoint to send marker data

diff --git a/gelo/plugins/http_pusher.py → gelo/plugins/HttpPusher.py b/gelo/plugins/http_pusher.py → gelo/plugins/HttpPusher.py
@@ -9,7 +9,7 @@
 class HttpPusher(gelo.arch.IMarkerSink):
     """Push the marker to an HTTP endpoint."""
 
-    PLUGIN_MODULE_NAME = "http_pusher"
+    PLUGIN_MODULE_NAME = "HttpPusher"
 
     def __init__(self, config, mediator: gelo.arch.IMediator, show: str):
         """Create a new HttpPusher."""

diff --git a/gelo/plugins/irc.gelo-plugin → gelo/plugins/IRC.gelo-plugin b/gelo/plugins/irc.gelo-plugin → gelo/plugins/IRC.gelo-plugin
@@ -1,6 +1,6 @@
 [Core]
-Name = Irc
-Module = irc
+Name = IRC
+Module = IRC
 
 [Documentation]
 Description = Connect to an IRC server to send chapter marks.

diff --git a/gelo/plugins/irc.py → gelo/plugins/IRC.py b/gelo/plugins/irc.py → gelo/plugins/IRC.py
@@ -11,7 +11,7 @@
 class IRC(gelo.arch.IMarkerSink):
     """Connect to IRC to send track names."""
 
-    PLUGIN_MODULE_NAME = "irc"
+    PLUGIN_MODULE_NAME = "IRC"
 
     def __init__(self, config, mediator: gelo.arch.IMediator, show: str):
         super().__init__(config, mediator, show)

diff --git a/gelo/plugins/now_playing_file.gelo-plugin → gelo/plugins/NowPlayingFile.gelo-plugin b/gelo/plugins/now_playing_file.gelo-plugin → gelo/plugins/NowPlayingFile.gelo-plugin
@@ -1,6 +1,6 @@
 [Core]
 Name = NowPlayingFile
-Module = now_playing_file
+Module = NowPlayingFile
 
 [Documentation]
 Description = Write a single-line text file with the marker name, for BUTT.

diff --git a/gelo/plugins/now_playing_file.py → gelo/plugins/NowPlayingFile.py b/gelo/plugins/now_playing_file.py → gelo/plugins/NowPlayingFile.py
@@ -6,7 +6,7 @@
 class NowPlayingFile(arch.IMarkerSink):
     """Write the current TRACK marker to a text file."""
 
-    PLUGIN_MODULE_NAME = "now_playing_file"
+    PLUGIN_MODULE_NAME = "NowPlayingFile"
 
     def __init__(self, config, med: arch.IMediator, show: str):
         """Create a new NowPlayingFile marker sink."""

diff --git a/gelo/plugins/one_eighty_one_fm.gelo-plugin → gelo/plugins/OneEightyOneFM.gelo-plugin b/gelo/plugins/one_eighty_one_fm.gelo-plugin → gelo/plugins/OneEightyOneFM.gelo-plugin
@@ -1,6 +1,6 @@
 [Core]
 Name = OneEightyOneFM
-Module = one_eighty_one_fm
+Module = OneEightyOneFM
 
 [Documentation]
 Description = Announce track names from 181.FM

diff --git a/gelo/plugins/one_eighty_one_fm.py → gelo/plugins/OneEightyOneFM.py b/gelo/plugins/one_eighty_one_fm.py → gelo/plugins/OneEightyOneFM.py
@@ -10,7 +10,7 @@
 class OneEightyOneFM(arch.IMarkerSource):
     """Connect to a 181.FM stream and announce their markers."""
 
-    PLUGIN_MODULE_NAME = "one_eighty_one_fm"
+    PLUGIN_MODULE_NAME = "OneEightyOneFM"
     HEADERS = {
         "Icy-MetaData": "1",
         "User-Agent": "gelo/3.2, one_eighty_one_fm/1.0: "

diff --git a/gelo/plugins/somafm.gelo-plugin → gelo/plugins/SomaFM.gelo-plugin b/gelo/plugins/somafm.gelo-plugin → gelo/plugins/SomaFM.gelo-plugin
@@ -1,6 +1,6 @@
 [Core]
 Name = SomaFM
-Module = somafm
+Module = SomaFM
 
 [Documentation]
 Description = Announce track names from Soma.FM

diff --git a/gelo/plugins/somafm.py → gelo/plugins/SomaFM.py b/gelo/plugins/somafm.py → gelo/plugins/SomaFM.py
@@ -7,10 +7,10 @@
 from gelo import arch, conf
 
 
-class SomaFm(arch.IMarkerSource):
+class SomaFM(arch.IMarkerSource):
     """Connect to a Soma.FM stream and announce their markers."""
 
-    PLUGIN_MODULE_NAME = "somafm"
+    PLUGIN_MODULE_NAME = "SomaFM"
     HEADERS = {
         "Icy-MetaData": "1",
         "User-Agent": "gelo/3.2, somafm/1.0: https://github.com/s0ph0s-2/gelo",

diff --git a/gelo/plugins/tweeter.gelo-plugin → gelo/plugins/Tweeter.gelo-plugin b/gelo/plugins/tweeter.gelo-plugin → gelo/plugins/Tweeter.gelo-plugin
@@ -1,6 +1,6 @@
 [Core]
 Name = Tweeter
-Module = tweeter
+Module = Tweeter
 
 [Documentation]
 Description = Tweet the marker.

diff --git a/gelo/plugins/tweeter.py → gelo/plugins/Tweeter.py b/gelo/plugins/tweeter.py → gelo/plugins/Tweeter.py
@@ -10,7 +10,7 @@
 class Tweeter(gelo.arch.IMarkerSink):
     """Tweet the tracks that you play."""
 
-    PLUGIN_MODULE_NAME = "tweeter"
+    PLUGIN_MODULE_NAME = "Tweeter"
 
     def __init__(self, config, mediator: gelo.arch.IMediator, show: str):
         """Create a new Tweeter."""

diff --git a/setup.py b/setup.py
@@ -3,15 +3,15 @@
 
 setup(
     name="gelo",
-    version="3.1.1",
+    version="4.0.0",
     description="podcast chapter metadata gathering tool for content creators",
     url="https://github.com/s0ph0s-2/Gelo",
     author="s0ph0s-2",
     license="GPL v2",
     packages=["gelo", "gelo.plugins"],
     package_dir={"gelo": "gelo", "gelo.plugins": "gelo/plugins"},
     package_data={"gelo": ["plugins/*.gelo-plugin"]},
-    install_requires=["yapsy", "requests", "python-twitter", "irc"],
+    install_requires=["yapsy>=1.12", "requests", "python-twitter", "irc"],
     entry_points={
         "console_scripts": [
             "gelo = gelo.command_line:main",