Commit 5b9b8876 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

First working result for item -Catalogs-

parent a6a49c44

.idea/workspace.xml

+116 −130
Original line number Diff line number Diff line
@@ -6,8 +6,10 @@ 
      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/opds_catalog/utils.py" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />

      <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/locale/ru/LC_MESSAGES/django.po" afterPath="$PROJECT_DIR$/opds_catalog/locale/ru/LC_MESSAGES/django.po" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/settings.py" afterPath="$PROJECT_DIR$/opds_catalog/settings.py" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/sopdscan.py" afterPath="$PROJECT_DIR$/opds_catalog/sopdscan.py" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/templates/book_description.html" afterPath="$PROJECT_DIR$/opds_catalog/templates/book_description.html" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/urls.py" afterPath="$PROJECT_DIR$/opds_catalog/urls.py" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/views.py" afterPath="$PROJECT_DIR$/opds_catalog/views.py" />

    </list>
@@ -55,23 +57,23 @@ 
  </component>

  <component name="FileEditorManager">

    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">

      <file leaf-file-name="feeds.py" pinned="false" current-in-tab="true">

      <file leaf-file-name="feeds.py" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/opds_catalog/feeds.py">

          <provider selected="true" editor-type-id="text-editor">

            <state vertical-scroll-proportion="0.76609445">

              <caret line="36" column="47" selection-start-line="36" selection-start-column="47" selection-end-line="36" selection-end-column="47" />

            <state vertical-scroll-proportion="-11.551724">

              <caret line="198" column="37" selection-start-line="198" selection-start-column="37" selection-end-line="198" selection-end-column="37" />

              <folding>

                <element signature="e#0#50#0" expanded="true" />

                <element signature="e#0#27#0" expanded="true" />

              </folding>

            </state>

          </provider>

        </entry>

      </file>

      <file leaf-file-name="xmlutils.py" pinned="false" current-in-tab="false">

        <entry file="file://C:/Program Files (x86)/Python35-32/Lib/site-packages/django/utils/xmlutils.py">

      <file leaf-file-name="django.po" pinned="false" current-in-tab="true">

        <entry file="file://$PROJECT_DIR$/opds_catalog/locale/ru/LC_MESSAGES/django.po">

          <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" />

            <state vertical-scroll-proportion="0.68075114">

              <caret line="104" column="20" selection-start-line="104" selection-start-column="20" selection-end-line="104" selection-end-column="20" />

              <folding />

            </state>

          </provider>
@@ -81,9 +83,8 @@ 
        <entry file="file://$PROJECT_DIR$/opds_catalog/models.py">

          <provider selected="true" editor-type-id="text-editor">

            <state vertical-scroll-proportion="0.0">

              <caret line="12" column="16" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="16" />

              <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="24" />

              <folding>

                <element signature="e#0#40#0" expanded="true" />

                <marker date="1457633159286" expanded="true" signature="2121:2311" placeholder="select SQL_C... missing_value" />

                <marker date="1457633159286" expanded="true" signature="2121:2521" placeholder="select SQL_C... " />

                <marker date="1457633159286" expanded="true" signature="2345:2521" placeholder="select 2,boo... missing_value" />
@@ -92,46 +93,12 @@ 
          </provider>

        </entry>

      </file>

      <file leaf-file-name="dl.py" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/opds_catalog/dl.py">

          <provider selected="true" editor-type-id="text-editor">

            <state vertical-scroll-proportion="0.0">

              <caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />

              <folding>

                <element signature="e#25#34#0" expanded="true" />

              </folding>

            </state>

          </provider>

        </entry>

      </file>

      <file leaf-file-name="sopdscli.py" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/py/sopdscli.py">

          <provider selected="true" editor-type-id="text-editor">

            <state vertical-scroll-proportion="0.0">

              <caret line="733" column="67" selection-start-line="733" selection-start-column="67" selection-end-line="733" selection-end-column="67" />

              <folding>

                <element signature="e#48#58#0" expanded="true" />

              </folding>

            </state>

          </provider>

        </entry>

      </file>

      <file leaf-file-name="sopdswrap.py" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/py/sopdswrap.py">

          <provider selected="true" editor-type-id="text-editor">

            <state vertical-scroll-proportion="0.0">

              <caret line="53" column="15" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="89" />

              <folding />

            </state>

          </provider>

        </entry>

      </file>

      <file leaf-file-name="my_notes.md" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/my_notes.md">

          <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">

            <state split_layout="FIRST">

              <first_editor vertical-scroll-proportion="0.0">

                <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="62" />

              <first_editor vertical-scroll-proportion="0.26198632">

                <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="52" />

                <folding />

              </first_editor>

              <second_editor />
@@ -142,16 +109,6 @@ 
          </provider>

        </entry>

      </file>

      <file leaf-file-name="settings.py" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/opds_catalog/settings.py">

          <provider selected="true" editor-type-id="text-editor">

            <state vertical-scroll-proportion="0.0">

              <caret line="29" column="58" selection-start-line="29" selection-start-column="58" selection-end-line="29" selection-end-column="58" />

              <folding />

            </state>

          </provider>

        </entry>

      </file>

      <file leaf-file-name="urls.py" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/opds_catalog/urls.py">

          <provider selected="true" editor-type-id="text-editor">
@@ -191,12 +148,10 @@ 
        <option value="$PROJECT_DIR$/.gitignore" />

        <option value="$PROJECT_DIR$/scan.log" />

        <option value="$PROJECT_DIR$/sopds/urls.py" />

        <option value="$PROJECT_DIR$/opds_catalog/locale/ru/LC_MESSAGES/django.po" />

        <option value="$PROJECT_DIR$/sopds/settings.py" />

        <option value="$PROJECT_DIR$/opds_catalog/opdsdb.py" />

        <option value="$PROJECT_DIR$/opds_catalog/models.py" />

        <option value="$PROJECT_DIR$/my_notes.md" />

        <option value="$PROJECT_DIR$/opds_catalog/templates/book_description.html" />

        <option value="$PROJECT_DIR$/opds_catalog/utils.py" />

        <option value="$PROJECT_DIR$/opds_catalog/sopdscan.py" />

        <option value="$PROJECT_DIR$/opds_catalog/views.py" />
@@ -204,6 +159,8 @@ 
        <option value="$PROJECT_DIR$/opds_catalog/urls.py" />

        <option value="$PROJECT_DIR$/opds_catalog/dl.py" />

        <option value="$PROJECT_DIR$/opds_catalog/feeds.py" />

        <option value="$PROJECT_DIR$/opds_catalog/templates/book_description.html" />

        <option value="$PROJECT_DIR$/opds_catalog/locale/ru/LC_MESSAGES/django.po" />

      </list>

    </option>

  </component>
@@ -343,6 +300,32 @@ 
              <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" />
@@ -649,7 +632,7 @@ 
  </component>

  <component name="ToolWindowManager">

    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />

    <editor active="true" />

    <editor active="false" />

    <layout>

      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24786781" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />

      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -657,9 +640,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.836403" 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.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />

      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" 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="false" show_stripe_button="true" weight="0.46478873" 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="false" show_stripe_button="true" weight="0.27813852" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />

      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27735645" 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" />
@@ -882,13 +865,6 @@ 
        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/py/sopdstempl.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="76" column="45" selection-start-line="76" selection-start-column="45" selection-end-line="76" selection-end-column="45" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/scan.log">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">
@@ -943,13 +919,6 @@ 
        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/locale/ru/LC_MESSAGES/django.po">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/sopds/settings.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">
@@ -962,13 +931,7 @@ 
      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="21" column="84" selection-start-line="21" selection-start-column="61" selection-end-line="21" selection-end-column="84" />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/templates/book_description.html">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="-2.6153846">

          <caret line="4" column="111" selection-start-line="4" selection-start-column="111" selection-end-line="4" selection-end-column="111" />

          <folding />

        </state>

      </provider>

    </entry>
@@ -1009,24 +972,6 @@ 
        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/py/sopdscli.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="733" column="67" selection-start-line="733" selection-start-column="67" selection-end-line="733" selection-end-column="67" />

          <folding>

            <element signature="e#48#58#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/py/sopdswrap.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="53" column="15" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="89" />

          <folding />

        </state>

      </provider>

    </entry>

    <entry file="dbDummy://dbtable:/969a8559/283b7468-e73d-4870-b736-6befce21aadb/opds_catalog_book">

      <provider editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">
@@ -1049,37 +994,26 @@ 
        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/my_notes.md">

      <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">

        <state split_layout="FIRST">

          <first_editor vertical-scroll-proportion="0.0">

            <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="62" />

    <entry file="file://$PROJECT_DIR$/opds_catalog/settings.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="29" column="58" selection-start-line="29" selection-start-column="58" selection-end-line="29" selection-end-column="58" />

          <folding />

          </first_editor>

          <second_editor />

        </state>

      </provider>

      <provider editor-type-id="MultiMarkdownFxPreviewEditor">

        <state />

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/models.py">

    <entry file="file://C:/Program Files (x86)/Python35-32/Lib/xml/sax/saxutils.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="12" column="16" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="16" />

          <folding>

            <element signature="e#0#40#0" expanded="true" />

            <marker date="1457633159286" expanded="true" signature="2121:2311" placeholder="select SQL_C... missing_value" />

            <marker date="1457633159286" expanded="true" signature="2121:2521" placeholder="select SQL_C... " />

            <marker date="1457633159286" expanded="true" signature="2345:2521" placeholder="select 2,boo... missing_value" />

          </folding>

        <state vertical-scroll-proportion="0.44851258">

          <caret line="123" column="34" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="34" />

          <folding />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/settings.py">

    <entry file="file://C:/Program Files (x86)/Python35-32/Lib/site-packages/django/utils/xmlutils.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="29" column="58" selection-start-line="29" selection-start-column="58" selection-end-line="29" selection-end-column="58" />

          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />

          <folding />

        </state>

      </provider>
@@ -1094,31 +1028,83 @@ 
        </state>

      </provider>

    </entry>

    <entry file="file://C:/Program Files (x86)/Python35-32/Lib/xml/sax/saxutils.py">

    <entry file="file://$PROJECT_DIR$/opds_catalog/models.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.44851258">

          <caret line="123" column="34" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="34" />

        <state vertical-scroll-proportion="0.0">

          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="24" />

          <folding>

            <marker date="1457633159286" expanded="true" signature="2121:2311" placeholder="select SQL_C... missing_value" />

            <marker date="1457633159286" expanded="true" signature="2121:2521" placeholder="select SQL_C... " />

            <marker date="1457633159286" expanded="true" signature="2345:2521" placeholder="select 2,boo... missing_value" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/py/sopdscli.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="-7.0">

          <caret line="597" column="32" selection-start-line="597" selection-start-column="13" selection-end-line="597" selection-end-column="32" />

          <folding>

            <element signature="e#48#58#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/py/sopdswrap.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="-7.0">

          <caret line="64" column="32" selection-start-line="64" selection-start-column="13" selection-end-line="64" selection-end-column="32" />

          <folding />

        </state>

      </provider>

    </entry>

    <entry file="file://C:/Program Files (x86)/Python35-32/Lib/site-packages/django/utils/xmlutils.py">

    <entry file="file://$PROJECT_DIR$/py/sopdstempl.py">

      <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" />

          <caret line="76" column="45" selection-start-line="76" selection-start-column="45" selection-end-line="76" selection-end-column="45" />

          <folding />

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/my_notes.md">

      <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">

        <state split_layout="FIRST">

          <first_editor vertical-scroll-proportion="0.26198632">

            <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="52" />

            <folding />

          </first_editor>

          <second_editor />

        </state>

      </provider>

      <provider editor-type-id="MultiMarkdownFxPreviewEditor">

        <state />

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/templates/book_description.html">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.24959217">

          <caret line="9" column="35" selection-start-line="9" selection-start-column="35" selection-end-line="9" selection-end-column="35" />

          <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.76609445">

          <caret line="36" column="47" selection-start-line="36" selection-start-column="47" selection-end-line="36" selection-end-column="47" />

        <state vertical-scroll-proportion="-11.551724">

          <caret line="198" column="37" selection-start-line="198" selection-start-column="37" selection-end-line="198" selection-end-column="37" />

          <folding>

            <element signature="e#0#50#0" expanded="true" />

            <element signature="e#0#27#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/locale/ru/LC_MESSAGES/django.po">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.68075114">

          <caret line="104" column="20" selection-start-line="104" selection-start-column="20" selection-end-line="104" selection-end-column="20" />

          <folding />

        </state>

      </provider>

    </entry>

  </component>

</project>
 
 No newline at end of file

opds_catalog/feeds.py

+54 −16

File changed.

Preview size limit exceeded, changes collapsed.

opds_catalog/locale/ru/LC_MESSAGES/django.po

+41 −17

File changed.

Preview size limit exceeded, changes collapsed.