noticecard 0.1.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

noticecard/__init__.py

@@ -1,3 +1,3 @@
 """NoticeCard Server - A FastAPI-based card management system."""
 
-__version__ = "0.1.0"
+__version__ = "0.2.1"

noticecard/app.py

@@ -32,6 +32,10 @@ def create_app(db_path: str) -> FastAPI:
     """Create and configure FastAPI application."""
     global _session_maker, _db_path
     
+    # Check and migrate database if needed
+    from .migrations import check_and_migrate
+    check_and_migrate(db_path)
+    
     _db_path = db_path
     engine = init_db(db_path)
     _session_maker = get_session_maker(engine)
@@ -81,7 +85,7 @@ def create_app(db_path: str) -> FastAPI:
                             },
                             "serverInfo": {
                                 "name": "noticecard",
-                                "version": "0.1.0"
+                                "version": "0.2.1"
                             }
                         }
                     }
@@ -100,8 +104,7 @@ def create_app(db_path: str) -> FastAPI:
                                         "type": "object",
                                         "properties": {
                                             "title": {"type": "string", "description": "卡片标题"},
-                                            "desc1": {"type": "string", "description": "描述1（可选）"},
-                                            "desc2": {"type": "string", "description": "描述2（可选）"}
+                                            "description": {"type": "string", "description": "卡片描述（可选）"}
                                         },
                                         "required": ["title"]
                                     }
@@ -136,8 +139,7 @@ def create_app(db_path: str) -> FastAPI:
                                         "properties": {
                                             "card_id": {"type": "number", "description": "卡片ID"},
                                             "title": {"type": "string", "description": "新标题（可选）"},
-                                            "desc1": {"type": "string", "description": "新描述1（可选）"},
-                                            "desc2": {"type": "string", "description": "新描述2（可选）"}
+                                            "description": {"type": "string", "description": "新描述（可选）"}
                                         },
                                         "required": ["card_id"]
                                     }
@@ -175,7 +177,7 @@ def create_app(db_path: str) -> FastAPI:
                                 "result": {
                                     "content": [{
                                         "type": "text",
-                                        "text": f"✅ 创建成功！\nID: {card.id}\n标题: {card.title}\n描述1: {card.desc1 or '无'}\n描述2: {card.desc2 or '无'}"
+                                        "text": f"✅ 创建成功！\nID: {card.id}\n标题: {card.title}\n描述: {card.description or '无'}"
                                     }]
                                 }
                             }
@@ -217,7 +219,7 @@ def create_app(db_path: str) -> FastAPI:
                                     "result": {
                                         "content": [{
                                             "type": "text",
-                                            "text": f"📄 卡片详情\n\nID: {card.id}\n标题: {card.title}\n描述1: {card.desc1 or '无'}\n描述2: {card.desc2 or '无'}\n创建时间: {card.created_at}\n更新时间: {card.updated_at}"
+                                            "text": f"📄 卡片详情\n\nID: {card.id}\n标题: {card.title}\n描述: {card.description or '无'}\n创建时间: {card.created_at}\n更新时间: {card.updated_at}"
                                         }]
                                     }
                                 }

noticecard/cli.py

@@ -7,7 +7,7 @@ import uvicorn
 
 
 @click.group()
-@click.version_option(version="0.1.0")
+@click.version_option(version="0.2.1")
 def main():
     """NoticeCard 服务端命令行工具"""
     pass
@@ -76,5 +76,25 @@ def init(work_dir: str):
     click.echo(f"数据库已初始化: {db_path}")
 
 
+@main.command()
+@click.option("--dir", "work_dir", default=".", help="工作目录")
+def migrate(work_dir: str):
+    """迁移数据库到最新版本"""
+    work_path = Path(work_dir).resolve()
+    db_path = work_path / "noticecard.db"
+    
+    if not db_path.exists():
+        click.echo(f"数据库不存在: {db_path}")
+        return
+    
+    from .migrations import migrate_to_v2
+    
+    try:
+        migrate_to_v2(str(db_path))
+        click.echo(f"✅ 数据库迁移成功: {db_path}")
+    except Exception as e:
+        click.echo(f"❌ 迁移失败: {e}", err=True)
+
+
 if __name__ == "__main__":
     main()

noticecard/migrations.py

@@ -0,0 +1,84 @@
+"""Database migration utilities."""
+
+import sqlite3
+from pathlib import Path
+
+
+def migrate_to_v2(db_path: str):
+    """Migrate database from v1 (desc1, desc2) to v2 (description)."""
+    conn = sqlite3.connect(db_path)
+    cursor = conn.cursor()
+    
+    try:
+        # Check if we need to migrate
+        cursor.execute("PRAGMA table_info(cards)")
+        columns = [col[1] for col in cursor.fetchall()]
+        
+        if 'description' in columns:
+            print("Database already migrated to v2")
+            return
+        
+        if 'desc1' not in columns:
+            print("Database is already in correct format")
+            return
+        
+        print("Migrating database to v2...")
+        
+        # Create new table with description field
+        cursor.execute("""
+            CREATE TABLE cards_new (
+                id INTEGER PRIMARY KEY AUTOINCREMENT,
+                title TEXT NOT NULL,
+                description TEXT,
+                created_at TIMESTAMP NOT NULL,
+                updated_at TIMESTAMP NOT NULL
+            )
+        """)
+        
+        # Migrate data: combine desc1 and desc2 into description
+        cursor.execute("""
+            INSERT INTO cards_new (id, title, description, created_at, updated_at)
+            SELECT 
+                id, 
+                title,
+                CASE 
+                    WHEN desc1 IS NOT NULL AND desc2 IS NOT NULL THEN desc1 || '\n' || desc2
+                    WHEN desc1 IS NOT NULL THEN desc1
+                    WHEN desc2 IS NOT NULL THEN desc2
+                    ELSE NULL
+                END as description,
+                created_at,
+                updated_at
+            FROM cards
+        """)
+        
+        # Drop old table and rename new one
+        cursor.execute("DROP TABLE cards")
+        cursor.execute("ALTER TABLE cards_new RENAME TO cards")
+        
+        # Create index
+        cursor.execute("CREATE INDEX ix_cards_title ON cards (title)")
+        cursor.execute("CREATE INDEX ix_cards_id ON cards (id)")
+        
+        conn.commit()
+        print("Migration completed successfully!")
+        
+    except Exception as e:
+        conn.rollback()
+        print(f"Migration failed: {e}")
+        raise
+    finally:
+        conn.close()
+
+
+def check_and_migrate(db_path: str):
+    """Check database version and migrate if needed."""
+    if not Path(db_path).exists():
+        # New database, no migration needed
+        return
+    
+    try:
+        migrate_to_v2(db_path)
+    except Exception as e:
+        print(f"Warning: Could not migrate database: {e}")
+        print("You may need to delete the old database and start fresh.")

noticecard/models.py

@@ -17,8 +17,7 @@ class Card(Base):
     
     id = Column(Integer, primary_key=True, index=True, autoincrement=True)
     title = Column(String, nullable=False, index=True)
-    desc1 = Column(String, nullable=True)
-    desc2 = Column(String, nullable=True)
+    description = Column(String, nullable=True)
     created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), nullable=False)
     updated_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), nullable=False)
 

noticecard/schemas.py

@@ -8,8 +8,7 @@ from pydantic import BaseModel, Field
 class CardBase(BaseModel):
     """Base card schema."""
     title: str = Field(..., min_length=1, max_length=200, description="Card title")
-    desc1: Optional[str] = Field(None, max_length=500, description="First description")
-    desc2: Optional[str] = Field(None, max_length=500, description="Second description")
+    description: Optional[str] = Field(None, max_length=1000, description="Card description")
 
 
 class CardCreate(CardBase):
@@ -20,8 +19,7 @@ class CardCreate(CardBase):
             "examples": [
                 {
                     "title": "会议通知",
-                    "desc1": "下午两点",
-                    "desc2": "一号会议室"
+                    "description": "明天下午2点在一号会议室"
                 }
             ]
         }
@@ -31,15 +29,14 @@ class CardCreate(CardBase):
 class CardUpdate(BaseModel):
     """Schema for updating an existing card."""
     title: Optional[str] = Field(None, min_length=1, max_length=200, description="Card title")
-    desc1: Optional[str] = Field(None, max_length=500, description="First description")
-    desc2: Optional[str] = Field(None, max_length=500, description="Second description")
+    description: Optional[str] = Field(None, max_length=1000, description="Card description")
     
     model_config = {
         "json_schema_extra": {
             "examples": [
                 {
                     "title": "更新后的标题",
-                    "desc1": "更新后的描述1"
+                    "description": "更新后的描述"
                 }
             ]
         }

noticecard/templates.py

@@ -193,14 +193,9 @@ def get_index_html() -> str:
                             <small id="titleHint" class="form-hint">必填，最多200字符</small>
                         </div>
                         <div class="mb-3">
-                            <label for="desc1" class="form-label">描述1</label>
-                            <textarea class="form-control" id="desc1" name="desc1" rows="2" maxlength="500" aria-describedby="desc1Hint"></textarea>
-                            <small id="desc1Hint" class="form-hint">可选，最多500字符</small>
-                        </div>
-                        <div class="mb-3">
-                            <label for="desc2" class="form-label">描述2</label>
-                            <textarea class="form-control" id="desc2" name="desc2" rows="2" maxlength="500" aria-describedby="desc2Hint"></textarea>
-                            <small id="desc2Hint" class="form-hint">可选，最多500字符</small>
+                            <label for="description" class="form-label">描述</label>
+                            <textarea class="form-control" id="description" name="description" rows="4" maxlength="1000" aria-describedby="descriptionHint"></textarea>
+                            <small id="descriptionHint" class="form-hint">可选，最多1000字符</small>
                         </div>
                     </form>
                 </div>
@@ -260,8 +255,7 @@ def get_index_html() -> str:
                 <article class="notice-card" data-card-id="${card.id}" role="listitem">
                     <div class="card-body">
                         <h3 class="card-title heading">${escapeHtml(card.title)}</h3>
-                        ${card.desc1 ? `<p class="text-muted mb-2">${escapeHtml(card.desc1)}</p>` : ''}
-                        ${card.desc2 ? `<p class="text-muted mb-0">${escapeHtml(card.desc2)}</p>` : ''}
+                        ${card.description ? `<p class="text-muted mb-0">${escapeHtml(card.description)}</p>` : ''}
                     </div>
                     <div class="card-footer">
                         <div class="d-flex justify-content-between align-items-center">
@@ -308,8 +302,7 @@ def get_index_html() -> str:
                 document.getElementById('modalTitle').textContent = '编辑卡片';
                 document.getElementById('cardId').value = card.id;
                 document.getElementById('title').value = card.title;
-                document.getElementById('desc1').value = card.desc1 || '';
-                document.getElementById('desc2').value = card.desc2 || '';
+                document.getElementById('description').value = card.description || '';
                 
                 modal.show();
             } catch (error) {
@@ -329,8 +322,7 @@ def get_index_html() -> str:
             const id = document.getElementById('cardId').value;
             const data = {
                 title: document.getElementById('title').value.trim(),
-                desc1: document.getElementById('desc1').value.trim() || null,
-                desc2: document.getElementById('desc2').value.trim() || null
+                description: document.getElementById('description').value.trim() || null
             };
             
             const spinner = document.getElementById('saveSpinner');

{noticecard-0.1.0.dist-info → noticecard-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: noticecard
-Version: 0.1.0
+Version: 0.2.1
 Summary: NoticeCard server with RESTful API and web UI
 Author: NoticeCard Team
 License: MIT
@@ -115,8 +115,7 @@ curl -X POST "http://localhost:3143/cards/" \
   -H "Content-Type: application/json" \
   -d '{
     "title": "会议通知",
-    "desc1": "下午两点",
-    "desc2": "一号会议室"
+    "description": "明天下午2点在一号会议室"
   }'
 ```
 
@@ -136,8 +135,7 @@ curl "http://localhost:3143/cards/?skip=0&limit=10"
 |------|------|------|
 | id | Integer | 主键，自动生成 |
 | title | String | 标题（必填） |
-| desc1 | String | 描述1（可选） |
-| desc2 | String | 描述2（可选） |
+| description | String | 描述（可选） |
 | created_at | DateTime | 创建时间 |
 | updated_at | DateTime | 更新时间 |
 

noticecard-0.2.1.dist-info/RECORD

@@ -0,0 +1,12 @@
+noticecard/__init__.py,sha256=wx4Y1_IMhWSuRhcAJ8tUmdBV1YxQdEihvzS2TY4BDno,92
+noticecard/app.py,sha256=HAg43uB0nS2aNViBq3eJFqTuY26s5O-_i5sGarHz4Bc,18746
+noticecard/cli.py,sha256=rS0mlJ72TbBm2Y0sQH908nAiwiD8jnAu1wLV1Fj_Glc,3156
+noticecard/migrations.py,sha256=YM8-CPZA-a2cTRCsBKP1ZljqXyTYLykrydxswOfP-9o,2731
+noticecard/models.py,sha256=P6eirD7tVwOjAatA5MOZHDnjPr4-GJ_5zYCPMp0tFZs,1475
+noticecard/schemas.py,sha256=FMEKNcnMR078F9T2hgEsygOVQgyJykHPRhlN_WSGU5A,1491
+noticecard/templates.py,sha256=TCOr9Jv44I45GmrEPwQ_2JWRdXZNL-nRS6FKkU-65z4,19162
+noticecard-0.2.1.dist-info/METADATA,sha256=mBQcsTDOELA1ACpHbqbCNI6KIAllbMNVV-aiv4Ulmgc,5553
+noticecard-0.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+noticecard-0.2.1.dist-info/entry_points.txt,sha256=j-F8uQSatTV2uyMh0JM3iXjTX2PiTIHX5FozbGy-u1A,46
+noticecard-0.2.1.dist-info/top_level.txt,sha256=WvuJAJMD8eTfRfGdeMAzSLXiv8UYjlfUBa5mw9g7Mqg,11
+noticecard-0.2.1.dist-info/RECORD,,

noticecard-0.1.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-noticecard/__init__.py,sha256=UC1UfxkAo2--veC7cav9Udf2fSk8_ZMty0wcr-g3EXc,92
-noticecard/app.py,sha256=CWNRM-I7D-OiY5uKU2jyBIo_KR6NdjPnpy0-LfPu3mM,18882
-noticecard/cli.py,sha256=xxikKsKvFeL8lssC5j24wwi3lbJOjnm6syz0gQVnGK4,2556
-noticecard/models.py,sha256=B4XY9xLkI7JYSQwF1y7rYMZfbNsd7hprZ7bm6-ohWks,1512
-noticecard/schemas.py,sha256=70Wn_1NGMxFL-34DnmSNr7_grYBNiHzuAMxCJYF6kkQ,1675
-noticecard/templates.py,sha256=IihqLS823JXGcCKHRkxiAcsMqn5L94x_Bs3M9i-HMNE,19766
-noticecard-0.1.0.dist-info/METADATA,sha256=sA8kqjey-1hYPAWahyAb7Qw2iOAjw4JwONjh7-YqyQg,5595
-noticecard-0.1.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-noticecard-0.1.0.dist-info/entry_points.txt,sha256=j-F8uQSatTV2uyMh0JM3iXjTX2PiTIHX5FozbGy-u1A,46
-noticecard-0.1.0.dist-info/top_level.txt,sha256=WvuJAJMD8eTfRfGdeMAzSLXiv8UYjlfUBa5mw9g7Mqg,11
-noticecard-0.1.0.dist-info/RECORD,,