From 9c06895d1efdf30e831d02cf4389446506d174c0 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Tue, 2 May 2017 17:08:28 +0100 Subject: [PATCH] Change provider Transmithe.net is now Nebulance. --- CHANGES.md | 7 ++++- gui/slick/images/providers/nebulance.png | Bin 0 -> 1011 bytes gui/slick/images/providers/transmithe_net.png | Bin 982 -> 0 bytes sickbeard/__init__.py | 2 +- sickbeard/config.py | 26 +++++++++++++++++- sickbeard/providers/__init__.py | 6 ++-- .../{transmithe_net.py => nebulance.py} | 10 +++---- 7 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 gui/slick/images/providers/nebulance.png delete mode 100644 gui/slick/images/providers/transmithe_net.png rename sickbeard/providers/{transmithe_net.py => nebulance.py} (96%) diff --git a/CHANGES.md b/CHANGES.md index 726af412..f612912f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,9 @@ -### 0.12.13 (2017-04-23 18:50:00 UTC) +### 0.12.14 (2017-05-02 17:10:00 UTC) + +* Change provider Transmithe.net is now Nebulance + + +### 0.12.13 (2017-04-23 18:50:00 UTC) * Change add filter for thetvdb show overview * Change remove SpeedCD 'inspeed_uid' cookie requirement diff --git a/gui/slick/images/providers/nebulance.png b/gui/slick/images/providers/nebulance.png new file mode 100644 index 0000000000000000000000000000000000000000..a0a3141ff8df5bb3f5e58bace55e9c92d0b61776 GIT binary patch literal 1011 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TYUEh@HVM_X*)*vyztOa&Jeu8sEy+_HMm${|$-hEGOKKkF(J*5V$ z2?lZ|Jy(n<-?rN>sM0ZW;+?}@sdKIem#i2tE2VtR9&BAWv8 zXTF*qT)goi&@R=iNe>Ilmj3(i6y0}^A+hU5ZCK@=|5BQ^;oTShaYxl3du12WUK~+( zd~$rp<-f^YH~xEPuXv%L=N@b3Us0lL=;cwr|36Fm#3$_m`O8l+L^YjXmE8C6zphJm zQ|FO?y!NpZR=Q^|&rj^R`#+}T;{WL8^Z!BewvoMe>?0<`*hX~UWMF4k0!D}U|NsA4 z8NzB#FAA$W^Iyw0C0pG-*+I!TBt59|*wl#TOaFtbj)HM`!@2)1sZ0MFcoc_tRHri=Mt&P;8%Vu&cFQVe>JQ4GPmqahxENF_PAxPPYbR)_usGdz<=M8{r`jO z&i}WGo%P7VzuniTXwPq5r|f+5h-sUQol?^o{7R4Ty60?rsO6Bm)vx??p;PMW|6(e3 zQQqap=lGNz`|neJ;=g;|&JS9)+3^mkEA#A_mB^}BZ(MEPjE6eTExBWNu z$<6>900QRG^BrXLLt24McK3oK{u<6Dt(wl2lMO?rZnjKVeb+c-+C4EHCvo%Gg_^b* zJ6@ZF&HSrx;@H1;n>ZSi90PdGmRb@Ojh4HGQ?^_5B6RVpp8B z%Rcm9)3stLSQ8wmc(CgRPMKp8v--cbSNC5<>%#T&rm4k>*4f!=&ULMF=BcfcN-lE7 z(JSt2`Se}j64e4_E>vI;w%AlZV%Y}$h~?jn<2L*^h+O_(H)z%;4WGWn3YJ;&AT=7U h4e_G#_E60X3;=CXc6@~qJ2n6S002ovPDHLkV1jF32UP$7 literal 0 HcmV?d00001 diff --git a/gui/slick/images/providers/transmithe_net.png b/gui/slick/images/providers/transmithe_net.png deleted file mode 100644 index 2ccfcfaa5e9f02d031b5fb48c992d6cb3a9c85de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 982 zcmV;{11bE8P)Nklz>A|_!106evD6?jY-V6rQAr^PF!OFZ6nWv#%v%@yW;uzS?iPeHFVppf@R(fz-}1N;-#v`k2DHP#{7+X#S^MjBh^()zje6Vd9A&0`P{wRqE6=iy=dDu31os5 z>z+S!<<2)Dn0o5?9k+rVQN`UJ@fB5C8X>1;6U0{w?#}64W7bXc0hG%c#QENV1p9jQcMa{QfG&y7*c9xPYm&FxQ*-0XZ$ z+BLsw+9=+g4IE%w>jT4&2J>yvP}Ah}EG{oE!L>hr2gh;X)bKDY-dv-!8bVc7qc7}> z6c1(9qZ8LEBl}w28NQl%{q*tPdW;q>=_iNY5M!r5gH%fk^!N9}(BL2>5(yw8Y)!Rb zS5GgXTW6Qnf`Jvs@G98w4O9I3&S)eQtkfMX^FSXMh5-Wu1CUOqVQlPk7#;nDCMGVD z9*zJ4fX0YI-1oj)@*f`j9yDgVo&dX??|=M||ICSJp{Xej*=!a(&x2h%df?T;S8#Rd zIyQwhS9*>+xhA%LE2*M8>Re2Qg^l-pTv|wIPSdHrO=?dijge2sAbajCoEaa3tE=TI zsG(Xem*bc7QRPZCto&(3bPokK^7^8ou?#=){B!Z~mE``iCC$F1Wp%d3u(Vl%J-c_A zZ_PGXZ_hOvKUP`-zm$z|Sq4?X7%B{)CY8nr)DH+j&Id`=K6Z93(NX-Nw%HR47t@cu z9NKd7{Q4#Z80P`oB?v1BL<9s#J^=>MbrV6F7wZ(ybsGMYrnhx|su+%4ScBNX=A4&S zg}vrPbWH^yLXZRifPesCOMo`btnBSj4zswf^7)!RrE@tHQzSG9l9{Agu_UWH#NmGt zAV`5goQq$_=L3utiUrEszznQ?8E2KeBZ0L=n6*-o+>?Kc|IR)EdIYR$`FM}MIull; z&DJ+INKrrr{IaQ%RS^t9a8Q3P=mz5)|Dyp7#h1;xG`oUjt6W^4DYzWij?PX79>AtZ z_2y-4TL3)>2xK`^NX`I&hzI}_-z>E2cINK5-_@Rs?fI4-JmYu>0=Ys_g&@e~vAoU2 zcCBKjG~23LLG>S>2mp2N-o9E2O-&a#2m}ZS0sw@+0Kc)XyN5|N-2eap07*qoM6N<$ Ef@$2;WdHyG diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 14a102cc..71c6bb5b 100755 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -59,7 +59,7 @@ CFG = None CONFIG_FILE = None # This is the version of the config we EXPECT to find -CONFIG_VERSION = 14 +CONFIG_VERSION = 15 # Default encryption version (0 for None) ENCRYPTION_VERSION = 0 diff --git a/sickbeard/config.py b/sickbeard/config.py index f9b17504..fee47514 100644 --- a/sickbeard/config.py +++ b/sickbeard/config.py @@ -448,7 +448,8 @@ class ConfigMigrator(): 11: 'Migrate anime split view to new layout', 12: 'Add "hevc" and some non-english languages to ignore words if not found', 13: 'Change default dereferrer url to blank', - 14: 'Convert Trakt to multi-account'} + 14: 'Convert Trakt to multi-account', + 15: 'Transmithe.net rebranded Nebulance'} def migrate_config(self): """ Calls each successive migration until the config is the same version as SG expects """ @@ -783,3 +784,26 @@ class ConfigMigrator(): old_refresh_token = check_setting_str(self.config_obj, 'Trakt', 'trakt_refresh_token', '') if old_token and old_refresh_token: TraktAPI.add_account(old_token, old_refresh_token, None) + + # Migration v15: Transmithe.net variables + def _migrate_v15(self): + try: + neb = filter(lambda p: 'Nebulance' in p.name, sickbeard.providers.sortedProviderList())[0] + except (StandardError, Exception): + return + # get the old settings from the file and store them in the new variable names + old_id = 'transmithe_net' + old_id_uc = old_id.upper() + neb.enabled = bool(check_setting_int(self.config_obj, old_id_uc, old_id, 0)) + setattr(neb, 'username', check_setting_str(self.config_obj, old_id_uc, old_id + '_username', '')) + neb.password = check_setting_str(self.config_obj, old_id_uc, old_id + '_password', '') + neb.minseed = check_setting_int(self.config_obj, old_id_uc, old_id + '_minseed', 0) + neb.minleech = check_setting_int(self.config_obj, old_id_uc, old_id + '_minleech', 0) + neb.freeleech = bool(check_setting_int(self.config_obj, old_id_uc, old_id + '_freeleech', 0)) + neb.enable_recentsearch = bool(check_setting_int( + self.config_obj, old_id_uc, old_id + '_enable_recentsearch', 1)) or not getattr(neb, 'supports_backlog') + neb.enable_backlog = bool(check_setting_int(self.config_obj, old_id_uc, old_id + '_enable_backlog', 1)) + neb.search_mode = check_setting_str(self.config_obj, old_id_uc, old_id + '_search_mode', 'eponly') + neb.search_fallback = bool(check_setting_int(self.config_obj, old_id_uc, old_id + '_search_fallback', 0)) + neb.seed_time = check_setting_int(self.config_obj, old_id_uc, old_id + '_seed_time', '') + neb._seed_ratio = check_setting_str(self.config_obj, old_id_uc, old_id + '_seed_ratio', '') diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index 584be572..759da2f7 100755 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -28,10 +28,10 @@ from . import newznab, omgwtfnzbs # torrent from . import alpharatio, beyondhd, bithdtv, bitmetv, btn, btscene, dh, extratorrent, \ fano, filelist, freshontv, funfile, gftracker, grabtheinfo, hd4free, hdbits, hdspace, hdtorrents, \ - iptorrents, limetorrents, morethan, ncore, pisexy, pretome, privatehd, ptf, \ + iptorrents, limetorrents, morethan, nebulance, ncore, pisexy, pretome, privatehd, ptf, \ rarbg, revtt, scc, scenetime, shazbat, speedcd, \ thepiratebay, torlock, torrentday, torrenting, torrentleech, \ - torrentz2, transmithe_net, tvchaosuk, zooqle + torrentz2, tvchaosuk, zooqle # anime from . import anizb, nyaatorrents, tokyotoshokan # custom @@ -64,6 +64,7 @@ __all__ = ['omgwtfnzbs', 'iptorrents', 'limetorrents', 'morethan', + 'nebulance', 'ncore', 'pisexy', 'pretome', @@ -81,7 +82,6 @@ __all__ = ['omgwtfnzbs', 'torrenting', 'torrentleech', 'torrentz2', - 'transmithe_net', 'tvchaosuk', 'zooqle', 'nyaatorrents', diff --git a/sickbeard/providers/transmithe_net.py b/sickbeard/providers/nebulance.py similarity index 96% rename from sickbeard/providers/transmithe_net.py rename to sickbeard/providers/nebulance.py index 8bd9ecd4..5273d147 100644 --- a/sickbeard/providers/transmithe_net.py +++ b/sickbeard/providers/nebulance.py @@ -25,12 +25,12 @@ from sickbeard.helpers import tryInt from lib.unidecode import unidecode -class TransmithenetProvider(generic.TorrentProvider): +class NebulanceProvider(generic.TorrentProvider): def __init__(self): - generic.TorrentProvider.__init__(self, 'Transmithe.net', cache_update_freq=17) + generic.TorrentProvider.__init__(self, 'Nebulance', cache_update_freq=17) - self.url_base = 'https://transmithe.net/' + self.url_base = 'https://nebulance.io/' self.urls = {'config_provider_home_uri': self.url_base, 'login_action': self.url_base + 'login.php', 'user': self.url_base + 'ajax.php?action=index', @@ -46,7 +46,7 @@ class TransmithenetProvider(generic.TorrentProvider): def _authorised(self, **kwargs): - if not super(TransmithenetProvider, self)._authorised( + if not super(NebulanceProvider, self)._authorised( logged_in=(lambda y=None: self.has_all_cookies('session')), post_params={'keeplogged': '1', 'form_tmpl': True}): return False @@ -166,4 +166,4 @@ class TransmithenetProvider(generic.TorrentProvider): return generic.TorrentProvider._episode_strings(self, ep_obj, scene=False, **kwargs) -provider = TransmithenetProvider() +provider = NebulanceProvider()