Add check enclosures for NoneType (dd239a3e) · Commits · Mirror / Simple OPDS

.idea/workspace.xml

+7 −114

Original line number	Diff line number	Diff line
		@@ -50,8 +50,8 @@
		<file leaf-file-name="feeds.py" pinned="false" current-in-tab="true">
		<entry file="file://$PROJECT_DIR$/opds_catalog/feeds.py">
		<provider selected="true" editor-type-id="text-editor">
		<state vertical-scroll-proportion="0.6365055">
		<caret line="158" column="12" selection-start-line="158" selection-start-column="12" selection-end-line="158" selection-end-column="12" />
		<state vertical-scroll-proportion="0.3153457">
		<caret line="77" column="53" selection-start-line="77" selection-start-column="53" selection-end-line="77" selection-end-column="53" />
		<folding>
		<element signature="e#0#27#0" expanded="true" />
		</folding>
		@@ -325,114 +325,6 @@
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		</PATH>
		<PATH>
		<PATH_ELEMENT>
		<option name="myItemId" value="sopds" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="sopds" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="py" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		</PATH>
		<PATH>
		<PATH_ELEMENT>
		<option name="myItemId" value="sopds" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="sopds" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="opds_catalog" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		</PATH>
		<PATH>
		<PATH_ELEMENT>
		<option name="myItemId" value="sopds" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="sopds" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="opds_catalog" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="templates" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		</PATH>
		<PATH>
		<PATH_ELEMENT>
		<option name="myItemId" value="sopds" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="sopds" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="opds_catalog" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="management" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="commands" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		</PATH>
		<PATH>
		<PATH_ELEMENT>
		<option name="myItemId" value="sopds" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="sopds" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="opds_catalog" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="locale" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="ru" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="LC_MESSAGES" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		</PATH>
		<PATH>
		<PATH_ELEMENT>
		<option name="myItemId" value="sopds" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="sopds" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		<PATH_ELEMENT>
		<option name="myItemId" value="conf" />
		<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
		</PATH_ELEMENT>
		</PATH>
		</subPane>
		</pane>
		<pane id="Scratches" />
		@@ -732,9 +624,9 @@
		<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1401919" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
		<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.13542795" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
		<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936078" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
		<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46478873" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
		<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32719395" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
		<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
		<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2751896" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
		<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2751896" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
		<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
		<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3997833" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
		<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
		@@ -1070,6 +962,7 @@
		<provider selected="true" editor-type-id="text-editor">
		<state vertical-scroll-proportion="0.0">
		<caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
		<folding />
		</state>
		</provider>
		</entry>
		@@ -1237,8 +1130,8 @@
		</entry>
		<entry file="file://$PROJECT_DIR$/opds_catalog/feeds.py">
		<provider selected="true" editor-type-id="text-editor">
		<state vertical-scroll-proportion="0.6365055">
		<caret line="158" column="12" selection-start-line="158" selection-start-column="12" selection-end-line="158" selection-end-column="12" />
		<state vertical-scroll-proportion="0.3153457">
		<caret line="77" column="53" selection-start-line="77" selection-start-column="53" selection-end-line="77" selection-end-column="53" />
		<folding>
		<element signature="e#0#27#0" expanded="true" />
		</folding>

opds_catalog/pycache/feeds.cpython-35.pyc

−46 B (10.7 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

opds_catalog/feeds.py

+10 −12

Original line number	Diff line number	Diff line
		@@ -73,8 +73,8 @@ class opdsFeed(Atom1Feed):
		handler.addQuickElement("link", "", {"href": item['link'], "rel": "alternate"})
		handler.characters("\n")
		# Enclosures.
		if item.get('enclosures') is not None:
		for enclosure in item['enclosures']:
		enclosure = enclosure
		handler.addQuickElement('link', '', {
		'rel': enclosure.rel,
		'href': enclosure.url,
		@@ -98,7 +98,6 @@ class MainFeed(Feed):
		feed_type = opdsFeed
		title = settings.TITLE
		subtitle = settings.SUBTITLE
		guid_prefix = "m:"

		items = [
		{"id":1, "title":_("By catalogs"), "link":"opds_catalog:catalogs", "descr": _("Catalogs: %(catalogs)s, books: %(books)s.")%{"catalogs":Catalog.objects.count(),"books":Book.objects.count()}},
		@@ -139,7 +138,7 @@ class MainFeed(Feed):
		return item['descr']

		def item_guid(self, item):
		return "%s%s"%(self.guid_prefix,item["id"])
		return "m:%s"%item["id"]

		def item_updateddate(self):
		return timezone.now()
		@@ -151,7 +150,6 @@ class CatalogsFeed(Feed):
		feed_type = opdsFeed
		subtitle = settings.SUBTITLE
		description_template = "book_description.html"
		guid_prefix = "с:"

		def get_object(self, request, cat_id=None, page=1):
		if not isinstance(page, int):
		@@ -225,7 +223,7 @@ class CatalogsFeed(Feed):

		def item_guid(self, item):
		if isinstance(item, Catalog):
		gp = self.guid_prefix
		gp = 'c:'
		else:
		gp = 'b:'
		return "%s%s"%(gp,item.id)