add on sql position for folder and bookmarks for ordering

Author: andriyor

SQL/sqlalchemy/mptt/CRUD.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+import os
 
 import bookmarks_parser
 from sqlalchemy import create_engine
@@ -7,7 +8,7 @@
 
 from SQL.sqlalchemy.mptt.model import Folder, Bookmark
 
-engine = create_engine('postgresql://postgres:password@localhost/olimp')
+engine = create_engine(os.environ.get('PG_DATABASE_URL'))
 Session = mptt_sessionmaker(sessionmaker(bind=engine))
 session = Session()
 
@@ -45,15 +46,23 @@ def save2db(child, prev_db_folder=None):
     bookmarks = bookmarks_parser.parse("/home/andriy/PycharmProjects/bookmarks2db/chrome_bookmarks.html")
     save2db(bookmarks)
 
-    # move folder with all nested bookmarks and folders
-    def move(folder, dest_folder):
+    # move folder with all nested bookmarks and folders to other folder and set position
+    def move_folder(folder, dest_folder):
         f = session.query(Folder).filter(Folder.title == folder).one()
-        print(f.id)
         dest = session.query(Folder).filter(Folder.title == dest_folder).one()
-        print(dest.id)
-        f.move_inside(dest.id)
+        f.move_after(dest.id)
         session.commit()
-    move('First level bookmark bar folder', 'folder on other')
+    move_folder('folder on other', 'First level bookmark bar folder')
+
+    # move bookmark between folder and position
+    def move_bookmark_before(bookmark_title, folder_title, before_bookmark_title):
+        bookmark = session.query(Bookmark).filter(Bookmark.title == bookmark_title).one()
+        folder = session.query(Folder).filter(Folder.title == folder_title).one()
+        after_bookmark = session.query(Bookmark).filter(Bookmark.title == before_bookmark_title).one()
+        folder.bookmarks.insert(after_bookmark.position, bookmark)
+        session.commit()
+
+    move_bookmark_before('reddit: the front page of the internet', 'Second level bookmark bar folder', 'Google Перекладач')
 
     # remove folder with all nested bookmarks and folders
     node = session.query(Folder).filter(Folder.title == 'First level bookmark bar folder').one()

SQL/sqlalchemy/mptt/model.py

@@ -1,13 +1,17 @@
+import os
+
 from sqlalchemy import Column, Integer, create_engine, orm, String, DateTime, func, ARRAY, ForeignKey
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.orderinglist import ordering_list
 from sqlalchemy.orm import sessionmaker, relationship
 from sqlalchemy_mptt import mptt_sessionmaker
 
 from sqlalchemy_mptt.mixins import BaseNestedSets
 
-engine = create_engine('postgresql://postgres:password@localhost/db')
+engine = create_engine(os.environ.get('PG_DATABASE_URL'))
 connection = engine.connect()
 Base = declarative_base()
+Base.metadata.bind = engine
 
 
 class Folder(Base, BaseNestedSets):
@@ -17,7 +21,8 @@ class Folder(Base, BaseNestedSets):
     title = Column(String, nullable=False)
     add_date = Column(DateTime, default=func.now())
     last_modified = Column(DateTime, default=func.now())
-    bookmarks = relationship("Bookmark", cascade="all")
+    bookmarks = relationship("Bookmark", cascade="all", order_by="Bookmark.position",
+                             collection_class=ordering_list('position'))
 
 
 class Bookmark(Base):
@@ -30,21 +35,17 @@ class Bookmark(Base):
     icon_uri = Column(String)
     tags = Column(ARRAY(Integer))
     parent_id = Column(Integer, ForeignKey('folder_mptt.id'))
+    position = Column(Integer)
 
 
 if __name__ == '__main__':
     Session = mptt_sessionmaker(sessionmaker(bind=engine))
     session = Session()
 
     orm.configure_mappers()
-    session.query(Bookmark).delete()
-    session.query(Folder).delete()
-    session.commit()
-
-    # Folder.__table__.drop()
-    Base.metadata.create_all(connection)
-    #
-    # node = Folder(title='First level')
-    # session.add(node)
-    # session.commit()
+
+    # Base.metadata.create_all(connection)
+    Bookmark.__table__.drop()
+    Folder.__table__.drop()
+    # Base.metadata.create_all(connection)
 

SQL/sqlalchemy/postgresql_ltree/CRUD.py

@@ -1,3 +1,4 @@
+import os
 from datetime import datetime
 
 import bookmarks_parser
@@ -8,7 +9,7 @@
 from SQL.sqlalchemy.postgresql_ltree.model import Folder, Bookmark, Base
 from slugify import slugify
 
-engine = create_engine('postgresql://postgres:password@localhost/db')
+engine = create_engine(os.environ.get('PG_DATABASE_URL'))
 Base.metadata.bind = engine
 
 Session = sessionmaker(bind=engine)
@@ -30,6 +31,9 @@ def save2db(child, prev_dict_folder=None, prev_db_folder=None):
             else:
                 bookmark['path'] = slugify(bookmark['title'], separator="_")
             folder = Folder(title=title, add_date=add_date, last_modified=last_modified, path=Ltree(bookmark['path']))
+            if prev_db_folder:
+                prev_db_folder.folders.append(folder)
+
             session.add(folder)
             session.commit()
             if bookmark['children']:
@@ -49,19 +53,32 @@ def save2db(child, prev_dict_folder=None, prev_db_folder=None):
     bookmarks = bookmarks_parser.parse("/home/andriy/PycharmProjects/bookmarks2db/chrome_bookmarks.html")
     save2db(bookmarks)
 
-    # move folder with all nested bookmarks and folders
-    first_level_folder = session.query(Folder).filter(Folder.title == 'First level bookmark bar folder').one()
-    index = first_level_folder.path.index(first_level_folder.path[-1])
-    move_to_folder_on_other = session.query(Folder).filter(Folder.title == 'folder on other').one()
+    # move folder with all nested bookmarks and folders to other folder aster certain position
+    folder_on_other = session.query(Folder).filter(Folder.title == 'folder on other').one()
+    index = folder_on_other.path.index(folder_on_other.path[-1])
+    move_to_first_level_folder = session.query(Folder).filter(Folder.title == 'First level bookmark bar folder').one()
 
-    first_level_folders = session.query(Folder).filter(Folder.path.descendant_of(first_level_folder.path)).all()
+    first_level_folders = session.query(Folder).filter(Folder.path.descendant_of(folder_on_other.path)).all()
     for folder in first_level_folders:
         path = folder.path[index:]
-        folder.path = move_to_folder_on_other.path + path
+        folder.path = move_to_first_level_folder.path + path
         session.add(folder)
+
+    first_level_parent = session.query(Folder).filter(Folder.id == move_to_first_level_folder.parent_id).one()
+    first_level_parent.folders.insert(move_to_first_level_folder.position + 1, folder_on_other)
     session.commit()
 
-    # # remove folder with all nested bookmarks and folders
+    # move bookmark to other folder and certain position
+    def move_bookmark_before(bookmark_title, folder_title, after_bookmark_title):
+        bookmark = session.query(Bookmark).filter(Bookmark.title == bookmark_title).one()
+        folder = session.query(Folder).filter(Folder.title == folder_title).one()
+        after_bookmark = session.query(Bookmark).filter(Bookmark.title == after_bookmark_title).one()
+        folder.bookmarks.insert(after_bookmark.position, bookmark)
+        session.commit()
+
+    move_bookmark_before('reddit: the front page of the internet', 'Second level bookmark bar folder', 'Google Перекладач')
+
+    # remove folder with all nested bookmarks and folders
     first_level_folder = session.query(Folder).filter(Folder.title == 'First level bookmark bar folder').one()
     first_level_folders = session.query(Folder).filter(Folder.path.descendant_of(first_level_folder.path)).all()
     for folder in first_level_folders:

SQL/sqlalchemy/postgresql_ltree/model.py

@@ -1,10 +1,13 @@
+import os
+
 import sqlalchemy as sa
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.orderinglist import ordering_list
 from sqlalchemy.orm import sessionmaker, relationship
 from sqlalchemy_utils import LtreeType, URLType
 
-engine = create_engine('postgresql://postgres:password@localhost/db')
+engine = create_engine(os.environ.get('PG_DATABASE_URL'))
 connection = engine.connect()
 Base = declarative_base()
 
@@ -16,7 +19,12 @@ class Folder(Base):
     add_date = sa.Column(sa.DateTime, default=sa.func.now())
     last_modified = sa.Column(sa.DateTime, default=sa.func.now())
     path = sa.Column(LtreeType)
-    bookmarks = relationship("Bookmark", cascade="all")
+    position = sa.Column(sa.Integer)
+    parent_id = sa.Column(sa.Integer, sa.ForeignKey('folder.id'))
+    folders = relationship("Folder", cascade="all", order_by="Folder.position",
+                           collection_class=ordering_list('position'))
+    bookmarks = relationship("Bookmark", cascade="all", order_by="Bookmark.position",
+                             collection_class=ordering_list('position'))
 
 
 class Bookmark(Base):
@@ -29,6 +37,7 @@ class Bookmark(Base):
     icon_uri = sa.Column(URLType)
     tags = sa.Column(sa.ARRAY(sa.Integer))
     parent_id = sa.Column(sa.Integer, sa.ForeignKey('folder.id'))
+    position = sa.Column(sa.Integer)
 
 
 if __name__ == '__main__':