diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini index 68da9bdf..c818b03d 100644 --- a/calibre-plugin/plugin-defaults.ini +++ b/calibre-plugin/plugin-defaults.ini @@ -1989,7 +1989,7 @@ add_to_output_css: white-space: pre-wrap; } -extra_valid_entries:dedication,authorcomment,likes,follows,reviews,numCollections,pages,numAwards,classification +extra_valid_entries:dedication,authorcomment,likes,follows,reviews,numCollections,pages,numAwards,classification,universe dedication_label:Dedication authorcomment_label:Author Comment @@ -2001,6 +2001,7 @@ pages_label:Pages numAwards_label:Awards awards_label:Awards classification_label:FBN Category +universe_label:Universe add_to_wide_titlepage_entries:,dedication,authorcomment add_to_comma_entries:,likes,follows,reviews,numAwards,numCollections diff --git a/fanficfare/adapters/adapter_ficbooknet.py b/fanficfare/adapters/adapter_ficbooknet.py index 1a9a2b09..fba55f98 100644 --- a/fanficfare/adapters/adapter_ficbooknet.py +++ b/fanficfare/adapters/adapter_ficbooknet.py @@ -59,7 +59,7 @@ class FicBookNetAdapter(BaseSiteAdapter): # The date format will vary from site to site. # http://docs.python.org/library/datetime.html#strftime-strptime-behavior - self.dateformat = "%d %m %Y %H:%M" + self.dateformat = u"%d %m %Y г., %H:%M" @staticmethod # must be @staticmethod, don't remove it. def getSiteDomain(): @@ -229,6 +229,11 @@ class FicBookNetAdapter(BaseSiteAdapter): else: self.story.setMetadata('status', 'In-Progress') + try: + self.story.setMetadata('universe', stripHTML(dlinfo.find('a', href=re.compile('/fandom_universe/')))) + except AttributeError: + pass + paircharsdt = soup.find('strong',string='Пэйринг и персонажи:') # site keeps both ships and indiv chars in /pairings/ links. if paircharsdt: diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini index 970348d6..28a4de81 100644 --- a/fanficfare/defaults.ini +++ b/fanficfare/defaults.ini @@ -1982,7 +1982,7 @@ add_to_output_css: white-space: pre-wrap; } -extra_valid_entries:dedication,authorcomment,likes,follows,reviews,numCollections,pages,numAwards,classification +extra_valid_entries:dedication,authorcomment,likes,follows,reviews,numCollections,pages,numAwards,classification,universe dedication_label:Dedication authorcomment_label:Author Comment @@ -1994,6 +1994,7 @@ pages_label:Pages numAwards_label:Awards awards_label:Awards classification_label:FBN Category +universe_label:Universe add_to_wide_titlepage_entries:,dedication,authorcomment add_to_comma_entries:,likes,follows,reviews,numAwards,numCollections