From 0525493c993930def0befdb13a77f39615f73d00 Mon Sep 17 00:00:00 2001
From: Noam <noamgit@gmail.com>
Date: Sun, 5 Jun 2016 14:39:19 +0300
Subject: [PATCH 1/3] Waffles move from .fm to .ch

---
 data/interfaces/default/config.html |  2 +-
 headphones/deluge.py                |  2 +-
 headphones/searcher.py              | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index ffd6e68d..a22a0ea7 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -593,7 +593,7 @@
 
                                 <fieldset>
                                     <div class="row checkbox left">
-                                        <input id="use_waffles" type="checkbox" class="bigcheck" name="use_waffles" value="1" ${config['use_waffles']} /><label for="use_waffles"><span class="option">Waffles.fm</span></label>
+                                        <input id="use_waffles" type="checkbox" class="bigcheck" name="use_waffles" value="1" ${config['use_waffles']} /><label for="use_waffles"><span class="option">Waffles.ch</span></label>
                                     </div>
                                     <div class="config">
                                         <div class="row">
diff --git a/headphones/deluge.py b/headphones/deluge.py
index 6809dd45..f97063d3 100644
--- a/headphones/deluge.py
+++ b/headphones/deluge.py
@@ -81,7 +81,7 @@ def addTorrent(link, data=None, name=None):
         result = {}
         retid = False
         url_what = ['https://what.cd/', 'http://what.cd/']
-        url_waffles = ['https://waffles.fm/', 'http://waffles.fm/']
+        url_waffles = ['https://waffles.ch/', 'http://waffles.ch/']
 
         if link.lower().startswith('magnet:'):
             logger.debug('Deluge: Got a magnet link: %s' % _scrubber(link))
diff --git a/headphones/searcher.py b/headphones/searcher.py
index 6f71db52..dd1547db 100644
--- a/headphones/searcher.py
+++ b/headphones/searcher.py
@@ -165,7 +165,7 @@ def get_seed_ratio(provider):
         seed_ratio = headphones.CONFIG.PIRATEBAY_RATIO
     elif provider == 'Old Pirate Bay':
         seed_ratio = headphones.CONFIG.OLDPIRATEBAY_RATIO
-    elif provider == 'Waffles.fm':
+    elif provider == 'Waffles.ch':
         seed_ratio = headphones.CONFIG.WAFFLES_RATIO
     elif provider == 'Mininova':
         seed_ratio = headphones.CONFIG.MININOVA_RATIO
@@ -1332,8 +1332,8 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None,
                         logger.exception("Unhandled exception in the KAT parser")
 
     if headphones.CONFIG.WAFFLES:
-        provider = "Waffles.fm"
-        providerurl = fix_url("https://www.waffles.fm/browse.php")
+        provider = "Waffles.ch"
+        providerurl = fix_url("https://www.waffles.ch/browse.php")
 
         bitrate = None
         if headphones.CONFIG.PREFERRED_QUALITY == 3 or losslessOnly:
@@ -1362,7 +1362,7 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None,
             query_items.append('bitrate:"%s"' % bitrate)
 
         # Requesting content
-        logger.info('Parsing results from Waffles.fm')
+        logger.info('Parsing results from Waffles.ch')
 
         params = {
             "uid": headphones.CONFIG.WAFFLES_UID,
@@ -1395,7 +1395,7 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None,
                         logger.info('Found %s. Size: %s', title, helpers.bytes_to_mb(size))
                     except Exception as e:
                         logger.error(
-                            u"An error occurred while trying to parse the response from Waffles.fm: %s",
+                            u"An error occurred while trying to parse the response from Waffles.ch: %s",
                             e)
 
     # rutracker.org

From ecfd3204ffcddc41686629f141010b7673faa9c7 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Tue, 7 Jun 2016 10:49:59 +0100
Subject: [PATCH 2/3] Updated vip server url

---
 headphones/mb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/headphones/mb.py b/headphones/mb.py
index a0f80a30..397e5008 100644
--- a/headphones/mb.py
+++ b/headphones/mb.py
@@ -51,8 +51,8 @@ def startmb():
         mbpass = headphones.CONFIG.CUSTOMPASS
         sleepytime = int(headphones.CONFIG.CUSTOMSLEEP)
     elif headphones.CONFIG.MIRROR == "headphones":
-        mbhost = "codeshy.com"
-        mbport = 8181
+        mbhost = "musicbrainz.codeshy.com"
+        mbport = 80
         mbuser = headphones.CONFIG.HPUSER
         mbpass = headphones.CONFIG.HPPASS
         sleepytime = 0

From 5d6a4adae88b52125f0d0830fde7e29fc3057b6d Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@headphones>
Date: Tue, 7 Jun 2016 10:50:13 +0100
Subject: [PATCH 3/3] Updated changelog for v0.5.15

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4bb2bd4..94486a60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## v0.5.15
+Released 07 June 2016
+
+Hotfix update
+
+Highlights:
+* Fixed: Update vip mirror url to point to new server
+* Fixed: Update waffles url to .ch
+
+The full list of commits can be found [here](https://github.com/rembo10/headphones/compare/v0.5.14...v0.5.15).
+
 ## v0.5.14
 Released 02 June 2016