Some changes in urls.py (8552f8a7) · Commits · Mirror / Simple OPDS

.idea/workspace.xml

+15 −16

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@
		<list default="true" id="a18ea2b9-bbc4-496b-b324-f0c9ff012408" name="Default" comment="">
		<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/opds_catalog/templates/opensearch.html" />
		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/my_notes.md" afterPath="$PROJECT_DIR$/my_notes.md" />
		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/feeds.py" afterPath="$PROJECT_DIR$/opds_catalog/feeds.py" />
		<change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/urls.py" afterPath="$PROJECT_DIR$/opds_catalog/urls.py" />
		</list>
		@@ -51,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.5413153">
		<caret line="244" column="30" selection-start-line="244" selection-start-column="30" selection-end-line="244" selection-end-column="30" />
		<state vertical-scroll-proportion="0.311973">
		<caret line="107" column="16" selection-start-line="107" selection-start-column="16" selection-end-line="107" selection-end-column="16" />
		<folding>
		<element signature="e#0#27#0" expanded="true" />
		</folding>
		@@ -128,7 +127,7 @@
		<entry file="file://$PROJECT_DIR$/opds_catalog/urls.py">
		<provider selected="true" editor-type-id="text-editor">
		<state vertical-scroll-proportion="0.0">
		<caret line="15" column="18" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
		<caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
		<folding>
		<element signature="e#1#33#0" expanded="true" />
		</folding>
		@@ -1134,16 +1133,6 @@
		</state>
		</provider>
		</entry>
		<entry file="file://$PROJECT_DIR$/opds_catalog/urls.py">
		<provider selected="true" editor-type-id="text-editor">
		<state vertical-scroll-proportion="0.0">
		<caret line="15" column="18" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
		<folding>
		<element signature="e#1#33#0" expanded="true" />
		</folding>
		</state>
		</provider>
		</entry>
		<entry file="file://$PROJECT_DIR$/my_notes.md">
		<provider editor-type-id="MultiMarkdownFxPreviewEditor">
		<state />
		@@ -1158,10 +1147,20 @@
		</state>
		</provider>
		</entry>
		<entry file="file://$PROJECT_DIR$/opds_catalog/urls.py">
		<provider selected="true" editor-type-id="text-editor">
		<state vertical-scroll-proportion="0.0">
		<caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
		<folding>
		<element signature="e#1#33#0" expanded="true" />
		</folding>
		</state>
		</provider>
		</entry>
		<entry file="file://$PROJECT_DIR$/opds_catalog/feeds.py">
		<provider selected="true" editor-type-id="text-editor">
		<state vertical-scroll-proportion="0.5413153">
		<caret line="244" column="30" selection-start-line="244" selection-start-column="30" selection-end-line="244" selection-end-column="30" />
		<state vertical-scroll-proportion="0.311973">
		<caret line="107" column="16" selection-start-line="107" selection-start-column="16" selection-end-line="107" selection-end-column="16" />
		<folding>
		<element signature="e#0#27#0" expanded="true" />
		</folding>

opds_catalog/pycache/feeds.cpython-35.pyc

−33 B (15.3 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

opds_catalog/pycache/urls.cpython-35.pyc

+13 B (1.26 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

opds_catalog/feeds.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ class MainFeed(Feed):
		def feed_extra_kwargs(self, obj):
		return {
		"searchTerm_url":"/opds/search/{searchTerms}/",
		#"searchTerm_url":reverse("opds_catalog:searchtypes",kwargs={"searchterms":"{searchTerms}"}),
		"start_url":reverse("opds_catalog:main"),
		"description_mime_type":"text",
		}
		@@ -138,7 +139,7 @@ class MainFeed(Feed):
		def item_enclosures(self, item):
		return (opdsEnclosure(reverse(item['link']),"application/atom+xml;profile=opds-catalog;kind=navigation", "subsection"),)

		def Search(request):
		def OpenSearch(request):
		"""
		Выводим шаблон поиска
		"""

opds_catalog/urls.py

+4 −4

Original line number	Diff line number	Diff line
		@@ -11,10 +11,10 @@ urlpatterns = [
		url(r'^genres/',feeds.MainFeed(), name='genres'),
		url(r'^series/',feeds.MainFeed(), name='series'),
		url(r'^bookshelf/',feeds.MainFeed(), name='bookshelf'),
		url(r'^search/(?P<searchtype>\w+)/(?P<searchterms>\w+)/(?P<page>\d+)/',feeds.SearchBooksFeed(), name='searchterms'),
		url(r'^search/(?P<searchtype>\w+)/(?P<searchterms>\w+)/',feeds.SearchBooksFeed(), name='searchterms'),
		url(r'^search/(?P<searchterms>\S+)/',feeds.SearchTypesFeed(), name='searchtypes'),
		url(r'^search/$',feeds.Search, name='opensearch'),
		url(r'^search/(?P<searchtype>\w+)/(?P<searchterms>[\w ]+)/(?P<page>\d+)/',feeds.SearchBooksFeed(), name='searchterms'),
		url(r'^search/(?P<searchtype>\w+)/(?P<searchterms>[\w ]+)/',feeds.SearchBooksFeed(), name='searchterms'),
		url(r'^search/(?P<searchterms>[\S ]+)/',feeds.SearchTypesFeed(), name='searchtypes'),
		url(r'^search/$',feeds.OpenSearch, name='opensearch'),
		url(r'^download/(?P<book_id>[0-9]+)/(?P<zip>[0-1])/$',dl.Download, name='download'),
		url(r'^cover/(?P<book_id>[0-9]+)/$',dl.Cover, name='cover'),
		url(r'^',feeds.MainFeed(), name='main'),