Compare commits

...
6 Commits
Author SHA1 Message Date
rembo10 e85560952f v0.5.15 2016-06-07 10:53:10 +01:00
rembo10 5d6a4adae8 Updated changelog for v0.5.15 2016-06-07 10:50:13 +01:00
rembo10 ecfd3204ff Updated vip server url 2016-06-07 10:49:59 +01:00
rembo10 f0e6554309 Merge branch 'develop' of https://github.com/rembo10/headphones into develop 2016-06-07 10:48:50 +01:00
AdeHub 995294e605 Merge pull request #2666 from noam09/develop
Waffles move from .fm to .ch
2016-06-06 11:59:58 +12:00
Noam 0525493c99 Waffles move from .fm to .ch 2016-06-05 14:39:19 +03:00
5 changed files with 20 additions and 9 deletions
+11
View File
@@ -1,5 +1,16 @@
# Changelog # 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 ## v0.5.14
Released 02 June 2016 Released 02 June 2016
+1 -1
View File
@@ -593,7 +593,7 @@
<fieldset> <fieldset>
<div class="row checkbox left"> <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>
<div class="config"> <div class="config">
<div class="row"> <div class="row">
+1 -1
View File
@@ -81,7 +81,7 @@ def addTorrent(link, data=None, name=None):
result = {} result = {}
retid = False retid = False
url_what = ['https://what.cd/', 'http://what.cd/'] 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:'): if link.lower().startswith('magnet:'):
logger.debug('Deluge: Got a magnet link: %s' % _scrubber(link)) logger.debug('Deluge: Got a magnet link: %s' % _scrubber(link))
+2 -2
View File
@@ -51,8 +51,8 @@ def startmb():
mbpass = headphones.CONFIG.CUSTOMPASS mbpass = headphones.CONFIG.CUSTOMPASS
sleepytime = int(headphones.CONFIG.CUSTOMSLEEP) sleepytime = int(headphones.CONFIG.CUSTOMSLEEP)
elif headphones.CONFIG.MIRROR == "headphones": elif headphones.CONFIG.MIRROR == "headphones":
mbhost = "codeshy.com" mbhost = "musicbrainz.codeshy.com"
mbport = 8181 mbport = 80
mbuser = headphones.CONFIG.HPUSER mbuser = headphones.CONFIG.HPUSER
mbpass = headphones.CONFIG.HPPASS mbpass = headphones.CONFIG.HPPASS
sleepytime = 0 sleepytime = 0
+5 -5
View File
@@ -165,7 +165,7 @@ def get_seed_ratio(provider):
seed_ratio = headphones.CONFIG.PIRATEBAY_RATIO seed_ratio = headphones.CONFIG.PIRATEBAY_RATIO
elif provider == 'Old Pirate Bay': elif provider == 'Old Pirate Bay':
seed_ratio = headphones.CONFIG.OLDPIRATEBAY_RATIO seed_ratio = headphones.CONFIG.OLDPIRATEBAY_RATIO
elif provider == 'Waffles.fm': elif provider == 'Waffles.ch':
seed_ratio = headphones.CONFIG.WAFFLES_RATIO seed_ratio = headphones.CONFIG.WAFFLES_RATIO
elif provider == 'Mininova': elif provider == 'Mininova':
seed_ratio = headphones.CONFIG.MININOVA_RATIO 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") logger.exception("Unhandled exception in the KAT parser")
if headphones.CONFIG.WAFFLES: if headphones.CONFIG.WAFFLES:
provider = "Waffles.fm" provider = "Waffles.ch"
providerurl = fix_url("https://www.waffles.fm/browse.php") providerurl = fix_url("https://www.waffles.ch/browse.php")
bitrate = None bitrate = None
if headphones.CONFIG.PREFERRED_QUALITY == 3 or losslessOnly: 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) query_items.append('bitrate:"%s"' % bitrate)
# Requesting content # Requesting content
logger.info('Parsing results from Waffles.fm') logger.info('Parsing results from Waffles.ch')
params = { params = {
"uid": headphones.CONFIG.WAFFLES_UID, "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)) logger.info('Found %s. Size: %s', title, helpers.bytes_to_mb(size))
except Exception as e: except Exception as e:
logger.error( 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) e)
# rutracker.org # rutracker.org