From d2af52b0fd06bf3d208f9775a730d7707388d49e Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Tue, 7 Apr 2015 14:01:59 -0500 Subject: [PATCH] Rename and Reorg to FanFicFare for web service. Not 100%, need to review/change external links especially to GitHub. --- .gitignore | 1 + webservice/Readme.txt | 17 + webservice/allrecent.html | 31 +- webservice/app.yaml | 4 +- webservice/defaults.ini | 2003 +++++++++++++++++++++++++++++++++ webservice/editconfig.html | 47 +- webservice/example.ini | 103 ++ webservice/index.html | 90 +- webservice/login.html | 49 +- webservice/main.py | 4 +- webservice/recent.html | 40 +- webservice/static/favicon.ico | Bin 21792 -> 32030 bytes webservice/status.html | 48 +- 13 files changed, 2174 insertions(+), 263 deletions(-) create mode 100644 webservice/Readme.txt create mode 100644 webservice/defaults.ini create mode 100644 webservice/example.ini diff --git a/.gitignore b/.gitignore index 9ed88b9..b3a6995 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ FanFictionDownLoader.zip *Thumbs.db FanFicFare.zip output +build diff --git a/webservice/Readme.txt b/webservice/Readme.txt new file mode 100644 index 0000000..3a3f3ba --- /dev/null +++ b/webservice/Readme.txt @@ -0,0 +1,17 @@ +Note that the defaults.ini and example.ini files for CLI and +webservice are now separate and will need to be kept synchronized. + +Before uploading the webservice to Google AppEngine, the files here, +along with ../fff_internals and the contents of +../included_dependencies should be copied to a 'build' (or other) +directory. + +rm -rf build +mkdir build + +cp -R * build +cp -R ../fff_internals ../included_dependencies/* build + +cd build + +.../appcfg.py update . diff --git a/webservice/allrecent.html b/webservice/allrecent.html index 477b17b..2915318 100644 --- a/webservice/allrecent.html +++ b/webservice/allrecent.html @@ -2,39 +2,15 @@ - FanFictionDownLoader (fanfiction.net, fanficauthors, fictionalley, ficwad to epub and HTML) + FanFicFare (fanfiction.net, fanficauthors, fictionalley, ficwad to epub and HTML) -

- FanFictionDownLoader + FanFicFare

- - {{yourfile}} @@ -69,9 +45,6 @@ google_ad_height = 60; //--> -
diff --git a/webservice/app.yaml b/webservice/app.yaml index 27ee692..484aa99 100644 --- a/webservice/app.yaml +++ b/webservice/app.yaml @@ -22,8 +22,8 @@ handlers: - url: /css static_dir: css -- url: /js - static_dir: js +# - url: /js +# static_dir: js - url: /static static_dir: static diff --git a/webservice/defaults.ini b/webservice/defaults.ini new file mode 100644 index 0000000..1f25b47 --- /dev/null +++ b/webservice/defaults.ini @@ -0,0 +1,2003 @@ +# Copyright 2013 Fanficdownloader team +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +[defaults] + +## [defaults] section applies to all formats and sites but may be +## overridden at several levels. Example: + +## [defaults] +## titlepage_entries: category,genre, status +## [www.whofic.com] +## # overrides defaults. +## titlepage_entries: category,genre, status,dateUpdated,rating +## [epub] +## # overrides defaults & site section +## titlepage_entries: category,genre, status,datePublished,dateUpdated,dateCreated +## [www.whofic.com:epub] +## # overrides defaults, site section & format section +## titlepage_entries: category,genre, status,datePublished +## [overrides] +## # overrides all other sections +## titlepage_entries: category + +## Some sites also require the user to confirm they are adult for +## adult content. Uncomment by removing '#' in front of is_adult. +#is_adult:true + +## All available titlepage_entries and the label used for them: +## _label: