flexget 3.22.0__tar.gz → 3.22.2__tar.gz

{flexget-3.22.0 → flexget-3.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: flexget
-Version: 3.22.0
+Version: 3.22.2
 Summary: FlexGet is a program aimed to automate downloading or processing content (torrents, podcasts, etc.) from different sources like RSS-feeds, html-pages, various sites and more.
 Project-URL: Issue Tracker, https://github.com/Flexget/Flexget/issues
 Project-URL: Forum, https://github.com/Flexget/Flexget/discussions
@@ -238,7 +238,7 @@ Requires-Dist: tzlocal==5.4.4; extra == 'locked'
 Requires-Dist: urllib3==2.8.0; extra == 'locked'
 Requires-Dist: vcrpy==8.3.0; extra == 'locked'
 Requires-Dist: webencodings==0.6.1; extra == 'locked'
-Requires-Dist: werkzeug==3.1.8; extra == 'locked'
+Requires-Dist: werkzeug==3.1.9; extra == 'locked'
 Requires-Dist: win32-setctime==1.2.0; (sys_platform == 'win32') and extra == 'locked'
 Requires-Dist: wrapt==2.4.1; extra == 'locked'
 Requires-Dist: zc-lockfile==4.0; extra == 'locked'

{flexget-3.22.0 → flexget-3.22.2}/flexget/_version.py

@@ -10,4 +10,4 @@ and update the version again for continued development.
 NOTE: Should always have all three parts of the version, even on major and minor bumps. i.e. 4.0.0.dev, not 4.0.dev
 """
 
-__version__ = '3.22.0'
+__version__ = '3.22.2'

{flexget-3.22.0 → flexget-3.22.2}/flexget/components/archive/db.py

@@ -1,10 +1,12 @@
+from __future__ import annotations
+
 import re
 from datetime import datetime, timedelta
 
 from loguru import logger
-from sqlalchemy import Column, DateTime, ForeignKey, Index, Integer, Table, Unicode
+from sqlalchemy import Column, ForeignKey, Index, Table
 from sqlalchemy.exc import NoResultFound
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from flexget import db_schema
 from flexget.event import event
@@ -19,16 +21,16 @@ Base = db_schema.versioned_base('archive', SCHEMA_VER)
 archive_tags_table = Table(
     'archive_entry_tags',
     Base.metadata,
-    Column('entry_id', Integer, ForeignKey('archive_entry.id')),
-    Column('tag_id', Integer, ForeignKey('archive_tag.id')),
+    Column('entry_id', ForeignKey('archive_entry.id')),
+    Column('tag_id', ForeignKey('archive_tag.id')),
     Index('ix_archive_tags', 'entry_id', 'tag_id'),
 )
 
 archive_sources_table = Table(
     'archive_entry_sources',
     Base.metadata,
-    Column('entry_id', Integer, ForeignKey('archive_entry.id')),
-    Column('source_id', Integer, ForeignKey('archive_source.id')),
+    Column('entry_id', ForeignKey('archive_entry.id')),
+    Column('source_id', ForeignKey('archive_source.id')),
     Index('ix_archive_sources', 'entry_id', 'source_id'),
 )
 
@@ -40,21 +42,20 @@ class ArchiveEntry(Base):
     __tablename__ = 'archive_entry'
     __table_args__ = (Index('ix_archive_title_url', 'title', 'url'),)
 
-    id = Column(Integer, primary_key=True)
-    title = Column(Unicode, index=True)
-    url = Column(Unicode, index=True)
-    description = Column(Unicode)
-    task = Column('feed', Unicode)  # DEPRECATED, but SQLite does not support drop column
-    added = Column(DateTime, index=True)
-
-    tags = relationship('ArchiveTag', secondary=archive_tags_table)
-    sources = relationship(
-        'ArchiveSource', secondary=archive_sources_table, backref='archive_entries'
+    id: Mapped[int] = mapped_column(primary_key=True)
+    title: Mapped[str | None] = mapped_column(index=True)
+    url: Mapped[str | None] = mapped_column(index=True)
+    description: Mapped[str | None]
+    task: Mapped[str | None] = mapped_column(
+        'feed'
+    )  # DEPRECATED, but SQLite does not support drop column
+    added: Mapped[datetime | None] = mapped_column(index=True, default=datetime.now)
+
+    tags: Mapped[list[ArchiveTag]] = relationship(secondary=archive_tags_table)
+    sources: Mapped[list[ArchiveSource]] = relationship(
+        secondary=archive_sources_table, back_populates='archive_entries'
     )
 
-    def __init__(self):
-        self.added = datetime.now()
-
     def __str__(self):
         return '<ArchiveEntry(title={},url={},task={},added={})>'.format(
             self.title,
@@ -67,8 +68,8 @@ class ArchiveEntry(Base):
 class ArchiveTag(Base):
     __tablename__ = 'archive_tag'
 
-    id = Column(Integer, primary_key=True)
-    name = Column(Unicode, index=True)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    name: Mapped[str | None] = mapped_column(index=True)
 
     def __init__(self, name):
         self.name = name
@@ -80,8 +81,11 @@ class ArchiveTag(Base):
 class ArchiveSource(Base):
     __tablename__ = 'archive_source'
 
-    id = Column(Integer, primary_key=True)
-    name = Column(Unicode, index=True)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    name: Mapped[str | None] = mapped_column(index=True)
+    archive_entries: Mapped[list[ArchiveEntry]] = relationship(
+        secondary=archive_sources_table, back_populates='sources'
+    )
 
     def __init__(self, name):
         self.name = name

{flexget-3.22.0 → flexget-3.22.2}/flexget/components/backlog/db.py

@@ -2,7 +2,8 @@ import pickle
 from datetime import datetime
 
 from loguru import logger
-from sqlalchemy import Column, DateTime, Index, Integer, String, Unicode, column, select
+from sqlalchemy import Index, Unicode, column, select
+from sqlalchemy.orm import Mapped, mapped_column
 
 from flexget import db_schema
 from flexget.entry import Entry
@@ -17,11 +18,11 @@ Base = db_schema.versioned_base('backlog', 3)
 class BacklogEntry(Base):
     __tablename__ = 'backlog'
 
-    id = Column(Integer, primary_key=True)
-    task = Column('feed', String)
-    title = Column(String)
-    expire = Column(DateTime)
-    _json = Column('json', Unicode)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    task: Mapped[str | None] = mapped_column('feed')
+    title: Mapped[str | None]
+    expire: Mapped[datetime | None]
+    _json: Mapped[str | None] = mapped_column('json')
     entry = entry_synonym('_json')
 
     def __repr__(self):

{flexget-3.22.0 → flexget-3.22.2}/flexget/components/failed/db.py

@@ -1,7 +1,8 @@
 from datetime import datetime, timedelta
 
 from loguru import logger
-from sqlalchemy import Column, DateTime, Integer, String, Unicode
+from sqlalchemy import DateTime, Unicode
+from sqlalchemy.orm import Mapped, mapped_column
 from sqlalchemy.schema import Index
 
 from flexget import db_schema
@@ -31,19 +32,18 @@ def upgrade(ver, session):
 class FailedEntry(Base):
     __tablename__ = 'failed'
 
-    id = Column(Integer, primary_key=True)
-    title = Column(Unicode)
-    url = Column(String)
-    tof = Column(DateTime)
-    reason = Column(Unicode)
-    count = Column(Integer, default=1)
-    retry_time = Column(DateTime)
+    id: Mapped[int] = mapped_column(primary_key=True)
+    title: Mapped[str | None]
+    url: Mapped[str | None]
+    tof: Mapped[datetime | None] = mapped_column(default=datetime.now)
+    reason: Mapped[str | None]
+    count: Mapped[int | None] = mapped_column(default=1)
+    retry_time: Mapped[datetime | None]
 
     def __init__(self, title, url, reason=None):
         self.title = title
         self.url = url
         self.reason = reason
-        self.tof = datetime.now()
 
     def __str__(self):
         return f'<Failed(title={self.title})>'