Commit 28f73eac authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Some changes in opdsFeed Class, MainFeed and CatalogsFeed

parent 454fd042

.idea/workspace.xml

+60 −105
Original line number Diff line number Diff line
@@ -3,14 +3,8 @@ 
  <component name="ChangeListManager">

    <list default="true" id="a18ea2b9-bbc4-496b-b324-f0c9ff012408" name="Default" comment="">

      <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/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/models.py" afterPath="$PROJECT_DIR$/opds_catalog/models.py" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/opdsdb.py" afterPath="$PROJECT_DIR$/opds_catalog/opdsdb.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/urls.py" afterPath="$PROJECT_DIR$/opds_catalog/urls.py" />

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

    </list>

    <ignored path="sopds.iws" />

    <ignored path=".idea/workspace.xml" />
@@ -41,10 +35,6 @@ 
        <option name="myItemId" />

        <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$Root" />

      </PATH_ELEMENT>

      <PATH_ELEMENT>

        <option name="myItemId" value="db" />

        <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />

      </PATH_ELEMENT>

    </PATH>

  </component>

  <component name="DjangoConsoleOptions" custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)">
@@ -59,8 +49,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="1.2710706">

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

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

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

              <folding>

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

              </folding>
@@ -68,28 +58,16 @@ 
          </provider>

        </entry>

      </file>

      <file leaf-file-name="opds_catalog_catalog" pinned="false" current-in-tab="false">

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

          <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">

            <state>

              <filtering enabled="true" />

            </state>

          </provider>

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

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

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

              <folding />

            </state>

          </provider>

        </entry>

      </file>

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

        <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="55" column="1" selection-start-line="55" selection-start-column="1" selection-end-line="55" selection-end-column="1" />

              <caret line="44" column="28" selection-start-line="44" selection-start-column="28" selection-end-line="44" selection-end-column="28" />

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

          </provider>
@@ -120,12 +98,22 @@ 
          </provider>

        </entry>

      </file>

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

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

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

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

              <caret line="124" column="41" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="44" />

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

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

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

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

                <folding />

              </first_editor>

              <second_editor />
@@ -136,26 +124,6 @@ 
          </provider>

        </entry>

      </file>

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

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

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

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

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

              <folding />

            </state>

          </provider>

        </entry>

      </file>

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

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

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

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

              <caret line="124" column="41" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="44" />

              <folding />

            </state>

          </provider>

        </entry>

      </file>

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

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

          <provider selected="true" editor-type-id="text-editor">
@@ -166,16 +134,6 @@ 
          </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">

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

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

              <folding />

            </state>

          </provider>

        </entry>

      </file>

    </leaf>

  </component>

  <component name="FileTemplateManagerImpl">
@@ -205,12 +163,12 @@ 
        <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$/opds_catalog/models.py" />

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

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

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

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

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

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

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

      </list>

    </option>
@@ -251,6 +209,7 @@ 
      <foldersAlwaysOnTop value="true" />

    </navigator>

    <panes>

      <pane id="Scope" />

      <pane id="ProjectPane">

        <subPane>

          <PATH>
@@ -340,7 +299,6 @@ 
        </subPane>

      </pane>

      <pane id="Scratches" />

      <pane id="Scope" />

    </panes>

  </component>

  <component name="PropertiesComponent">
@@ -630,15 +588,15 @@ 
    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />

    <editor active="true" />

    <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.2761194" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />

      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2857143" 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" />

      <window_info id="Event Log" 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="true" content_ui="tabs" />

      <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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32827735" 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.32827735" 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.49404117" 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.27843988" 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" />
@@ -956,7 +914,6 @@ 
      <provider selected="true" editor-type-id="text-editor">

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

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

          <folding />

        </state>

      </provider>

    </entry>
@@ -964,7 +921,6 @@ 
      <provider selected="true" editor-type-id="text-editor">

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

          <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="10" selection-end-column="92" />

          <folding />

        </state>

      </provider>

    </entry>
@@ -972,7 +928,6 @@ 
      <provider selected="true" editor-type-id="text-editor">

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

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

          <folding />

        </state>

      </provider>

    </entry>
@@ -980,7 +935,6 @@ 
      <provider selected="true" editor-type-id="text-editor">

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

          <caret line="265" column="43" selection-start-line="265" selection-start-column="43" selection-end-line="265" selection-end-column="43" />

          <folding />

        </state>

      </provider>

    </entry>
@@ -988,29 +942,13 @@ 
      <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" />

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

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

            <folding />

          </first_editor>

          <second_editor />

        </state>

      </provider>

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

        <state />

      </provider>

    </entry>

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

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

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

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

          <folding />

        </state>

      </provider>

    </entry>
@@ -1022,14 +960,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="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />

          <folding />

        </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">
@@ -1038,16 +968,6 @@ 
        </state>

      </provider>

    </entry>

    <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="55" column="1" selection-start-line="55" selection-start-column="1" selection-end-line="55" selection-end-column="1" />

          <folding>

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

          </folding>

        </state>

      </provider>

    </entry>

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

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

        <state vertical-scroll-proportion="0.0">
@@ -1077,6 +997,14 @@ 
        </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="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />

          <folding />

        </state>

      </provider>

    </entry>

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

      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">

        <state>
@@ -1090,10 +1018,37 @@ 
        </state>

      </provider>

    </entry>

    <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="44" column="28" selection-start-line="44" selection-start-column="28" selection-end-line="44" selection-end-column="28" />

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

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

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

            <folding />

          </first_editor>

          <second_editor />

        </state>

      </provider>

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

        <state />

      </provider>

    </entry>

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

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

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

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

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

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

          <folding>

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

          </folding>

opds_catalog/feeds.py

+68 −32

File changed.

Preview size limit exceeded, changes collapsed.

opds_catalog/models.py

+4 −3
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ class bookshelf(models.Model): 
    book = models.ForeignKey(Book)

    readtime = models.DateTimeField(null=False, default=utils.timezone.now)



#class CatalogManager(models.Manager):

#    def catalogs_and_files(self, cat):



class Catalog_Book_Serialiser(models.Model):

    pass

#    query = 'select 1 as t,cat_id,cat_name,path,now(),cat_name as title,'' as docdate,'' as annotation,'cat' as format, 0 as filesize, '' as cover, '' as cover_type from "+TBL_CATALOGS+" where parent_id="+str(cat_id)+" union all "

#    "select 2,book_id,filename,path,registerdate,title,annotation,docdate,format,filesize,cover,cover_type from "+TBL_BOOKS+" where cat_id="+str(cat_id)+" and avail!=0 order by 1,6 "+limitstr)