From 8730e886581e984afff757a4d02dd75d30e8dbfd Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Thu, 25 Feb 2016 18:18:14 -0600 Subject: [PATCH] Update plugin-defaults.ini & copyrights for PR 117. --- calibre-plugin/plugin-defaults.ini | 106 +++++++++++++++++- .../adapters/adapter_andromedawebcom.py | 2 +- fanficfare/adapters/adapter_artemisfowlcom.py | 2 +- fanficfare/adapters/adapter_buffygilescom.py | 2 +- fanficfare/adapters/adapter_lucifaelff.py | 4 +- fanficfare/adapters/adapter_naiceanilmenet.py | 2 +- fanficfare/adapters/adapter_rabidreadercom.py | 2 +- fanficfare/defaults.ini | 2 +- 8 files changed, 113 insertions(+), 9 deletions(-) diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini index 6cee3b1..3cb8c06 100644 --- a/calibre-plugin/plugin-defaults.ini +++ b/calibre-plugin/plugin-defaults.ini @@ -1,4 +1,4 @@ -# Copyright 2015 Fanficdownloader team, 2015 FanFicFare team +# Copyright 2015 Fanficdownloader team, 2016 FanFicFare team # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -2254,6 +2254,110 @@ extracategories:Stargate: Atlantis extra_valid_entries:reviews reviews_label:Reviews +[buffygiles.velocitygrass.com] +## Some sites do not require a login, but do require the user to +## confirm they are adult for adult content. In commandline version, +## this should go in your personal.ini, not defaults.ini. +#is_adult:true + +## Some sites require login (or login for some rated stories) The +## program can prompt you, or you can save it in config. In +## commandline version, this should go in your personal.ini, not +## defaults.ini. +#username:YourName +#password:yourpassword + +## Site dedicated to these categories/characters/ships +extracharacters:Buffy,Giles + +[fanfiction.lucifael.com] +## Some sites do not require a login, but do require the user to +## confirm they are adult for adult content. In commandline version, +## this should go in your personal.ini, not defaults.ini. +#is_adult:true + +## Some sites require login (or login for some rated stories) The +## program can prompt you, or you can save it in config. In +## commandline version, this should go in your personal.ini, not +## defaults.ini. +#username:YourName +#password:yourpassword + + +[rqarchive.com] +## Some sites do not require a login, but do require the user to +## confirm they are adult for adult content. In commandline version, +## this should go in your personal.ini, not defaults.ini. +#is_adult:true + +## Some sites require login (or login for some rated stories) The +## program can prompt you, or you can save it in config. In +## commandline version, this should go in your personal.ini, not +## defaults.ini. +#username:YourName +#password:yourpassword + +[www.andromeda-web.com] +## Some sites do not require a login, but do require the user to +## confirm they are adult for adult content. In commandline version, +## this should go in your personal.ini, not defaults.ini. +#is_adult:true + +## Some sites require login (or login for some rated stories) The +## program can prompt you, or you can save it in config. In +## commandline version, this should go in your personal.ini, not +## defaults.ini. +#username:YourName +#password:yourpassword + +## Site dedicated to these categories/characters/ships +extracategories:Andromeda + +[www.artemis-fowl.com] +## Some sites do not require a login, but do require the user to +## confirm they are adult for adult content. In commandline version, +## this should go in your personal.ini, not defaults.ini. +#is_adult:true + +## Some sites require login (or login for some rated stories) The +## program can prompt you, or you can save it in config. In +## commandline version, this should go in your personal.ini, not +## defaults.ini. +#username:YourName +#password:yourpassword + +## Site dedicated to these categories/characters/ships +extracategories:Artemis Fowl + +[www.therabidreader.com] +## Some sites do not require a login, but do require the user to +## confirm they are adult for adult content. In commandline version, +## this should go in your personal.ini, not defaults.ini. +#is_adult:true + +## Some sites require login (or login for some rated stories) The +## program can prompt you, or you can save it in config. In +## commandline version, this should go in your personal.ini, not +## defaults.ini. +#username:YourName +#password:yourpassword + + +[www.naiceanilme.net] +## Some sites do not require a login, but do require the user to +## confirm they are adult for adult content. In commandline version, +## this should go in your personal.ini, not defaults.ini. +#is_adult:true + +## Some sites require login (or login for some rated stories) The +## program can prompt you, or you can save it in config. In +## commandline version, this should go in your personal.ini, not +## defaults.ini. +#username:YourName +#password:yourpassword + + + [overrides] ## It may sometimes be useful to override all of the specific format, ## site and site:format sections in your private configuration. For diff --git a/fanficfare/adapters/adapter_andromedawebcom.py b/fanficfare/adapters/adapter_andromedawebcom.py index 8cfb9c9..c59a94e 100644 --- a/fanficfare/adapters/adapter_andromedawebcom.py +++ b/fanficfare/adapters/adapter_andromedawebcom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2013 Fanficdownloader team, 2015 FanFicFare team +# Copyright 2016 FanFicFare team # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/fanficfare/adapters/adapter_artemisfowlcom.py b/fanficfare/adapters/adapter_artemisfowlcom.py index 58a5192..9698b3a 100644 --- a/fanficfare/adapters/adapter_artemisfowlcom.py +++ b/fanficfare/adapters/adapter_artemisfowlcom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2013 Fanficdownloader team, 2015 FanFicFare team +# Copyright 2016 FanFicFare team # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/fanficfare/adapters/adapter_buffygilescom.py b/fanficfare/adapters/adapter_buffygilescom.py index 34ae801..6d85a0b 100644 --- a/fanficfare/adapters/adapter_buffygilescom.py +++ b/fanficfare/adapters/adapter_buffygilescom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2013 Fanficdownloader team, 2015 FanFicFare team +# Copyright 2016 FanFicFare team # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/fanficfare/adapters/adapter_lucifaelff.py b/fanficfare/adapters/adapter_lucifaelff.py index df412d0..e7c865a 100644 --- a/fanficfare/adapters/adapter_lucifaelff.py +++ b/fanficfare/adapters/adapter_lucifaelff.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2012 Fanficdownloader team, 2015 FanFicFare team +# Copyright 2016 FanFicFare team # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -296,4 +296,4 @@ class Lucifaelff(BaseSiteAdapter): if None == div: raise exceptions.FailedToDownload("Error downloading Chapter: %s! Missing required element!" % url) - return self.utf8FromSoup(url,div) \ No newline at end of file + return self.utf8FromSoup(url,div) diff --git a/fanficfare/adapters/adapter_naiceanilmenet.py b/fanficfare/adapters/adapter_naiceanilmenet.py index a63f36b..3838f06 100644 --- a/fanficfare/adapters/adapter_naiceanilmenet.py +++ b/fanficfare/adapters/adapter_naiceanilmenet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2015 FanFicFare team +# Copyright 2016 FanFicFare team # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/fanficfare/adapters/adapter_rabidreadercom.py b/fanficfare/adapters/adapter_rabidreadercom.py index 4c71aab..40025a7 100644 --- a/fanficfare/adapters/adapter_rabidreadercom.py +++ b/fanficfare/adapters/adapter_rabidreadercom.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2015 FanFicFare team +# Copyright 2016 FanFicFare team # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini index 0bd9a60..7a4e198 100644 --- a/fanficfare/defaults.ini +++ b/fanficfare/defaults.ini @@ -1,4 +1,4 @@ -# Copyright 2015 Fanficdownloader team, 2015 FanFicFare team +# Copyright 2015 Fanficdownloader team, 2016 FanFicFare team # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.