Update app.py

app.py

@@ -7,39 +7,43 @@ import base64
 import os
 from datetime import datetime, timedelta
 import math
+from matplotlib.patches import FancyBboxPatch
 from pypinyin import lazy_pinyin, Style
 from matplotlib.backends.backend_pdf import PdfPages
 
 def get_font(size=14):
-    """Finds an available SimHei font for Chinese character support."""
+    """Loads the SimHei font for Chinese character support."""
     font_path = "simHei.ttc"
     if not os.path.exists(font_path):
+        # Fallback for different OS or font naming
         font_path = "SimHei.ttf"
+    if not os.path.exists(font_path):
+        # If font is still not found, return None and let matplotlib use its default
+        st.warning(f"Font file not found at {font_path}. Chinese characters may not display correctly.")
+        return None
     return font_manager.FontProperties(fname=font_path, size=size)
 
 def get_pinyin_abbr(text):
-    """Gets the first letter of the Pinyin for the first two Chinese characters of a text."""
+    """获取文本前两个汉字的拼音首字母"""
     if not text:
         return ""
-    # Extract the first two Chinese characters
+    # 提取前两个汉字
     chars = [c for c in text if '\u4e00' <= c <= '\u9fff']
     if len(chars) < 2:
         chars = chars + [''] * (2 - len(chars))
     else:
         chars = chars[:2]
-    # Get the first letter of the Pinyin
+    # 获取拼音首字母
     pinyin_list = lazy_pinyin(chars, style=Style.FIRST_LETTER)
     return ''.join(pinyin_list).upper()
 
 def process_schedule(file):
-    """Processes the uploaded Excel file to extract and clean movie schedule data."""
+    """Processes the uploaded Excel file to extract and clean schedule data."""
     try:
-        # Try to read the date from the specified cell
         date_df = pd.read_excel(file, header=None, skiprows=7, nrows=1, usecols=[3])
         date_str = pd.to_datetime(date_df.iloc[0, 0]).strftime('%Y-%m-%d')
         base_date = pd.to_datetime(date_str).date()
-    except:
-        # Fallback to the current date if reading fails
+    except Exception:
         date_str = datetime.today().strftime('%Y-%m-%d')
         base_date = datetime.today().date()
     
@@ -49,19 +53,15 @@ def process_schedule(file):
         df['Hall'] = df['Hall'].ffill()
         df.dropna(subset=['StartTime', 'EndTime', 'Movie'], inplace=True)
         df['Hall'] = df['Hall'].astype(str).str.extract(r'(\d+号)')
-        
-        # Convert times to datetime objects
         df['StartTime_dt'] = pd.to_datetime(df['StartTime'], format='%H:%M', errors='coerce').apply(
             lambda t: t.replace(year=base_date.year, month=base_date.month, day=base_date.day) if pd.notnull(t) else t
         )
         df['EndTime_dt'] = pd.to_datetime(df['EndTime'], format='%H:%M', errors='coerce').apply(
             lambda t: t.replace(year=base_date.year, month=base_date.month, day=base_date.day) if pd.notnull(t) else t
         )
-        # Handle overnight screenings
         df.loc[df['EndTime_dt'] < df['StartTime_dt'], 'EndTime_dt'] += timedelta(days=1)
         df = df.sort_values(['Hall', 'StartTime_dt'])
         
-        # Merge consecutive screenings of the same movie
         merged_rows = []
         for hall, group in df.groupby('Hall'):
             group = group.sort_values('StartTime_dt')
@@ -80,7 +80,7 @@ def process_schedule(file):
         
         merged_df = pd.DataFrame(merged_rows)
         
-        # Adjust start and end times
+        # 将开始时间统一提前10分钟，结束时间统一提前5分钟
         merged_df['StartTime_dt'] = merged_df['StartTime_dt'] - timedelta(minutes=10)
         merged_df['EndTime_dt'] = merged_df['EndTime_dt'] - timedelta(minutes=5)
         
@@ -89,15 +89,15 @@ def process_schedule(file):
         
         return merged_df[['Hall', 'Movie', 'StartTime_str', 'EndTime_str']], date_str
     except Exception as e:
-        st.error(f"An error occurred during data processing: {e}")
+        st.error(f"Error processing schedule data: {e}")
         return None, date_str
 
 def create_print_layout(data, date_str):
-    """Creates PNG and PDF layouts of the schedule, replacing boxes with separator lines."""
+    """Generates the print-friendly PDF and PNG layouts from the schedule data."""
     if data is None or data.empty:
         return None
     
-    # --- Create figures for PNG and PDF ---
+    # Create figures for PNG and PDF output with A4 dimensions
     png_fig = plt.figure(figsize=(8.27, 11.69), dpi=300)
     png_ax = png_fig.add_subplot(111)
     png_ax.set_axis_off()
@@ -108,81 +108,90 @@ def create_print_layout(data, date_str):
     pdf_ax.set_axis_off()
     pdf_fig.subplots_adjust(left=0.02, right=0.98, top=0.98, bottom=0.02)
     
-    def process_figure(fig, ax):
-        # --- Font and Layout Setup ---
-        date_font = get_font(12)
-        # Increased font size to better fill the page
-        font_size_multiplier = 1.3
-        movie_font_size = 14 * font_size_multiplier
-        hall_font_size = movie_font_size * 0.8
-        hall_font = get_font(hall_font_size)
-        movie_font = get_font(movie_font_size)
+    def process_figure(fig, ax, is_pdf=False):
+        """The core drawing function to render the schedule onto a matplotlib axis."""
+        ax.set_ylim(0, 1) # Use a 0-1 coordinate system for consistent positioning
+
+        # Sort halls numerically
+        halls = sorted(data['Hall'].unique(), key=lambda h: int(h.replace('号', '')) if h and h.replace('号', '').isdigit() else 0)
+        num_halls = len(halls)
+        num_movie_rows = len(data)
         
-        ax.text(0.00, 1.00, date_str, fontsize=12 * font_size_multiplier, color='#A9A9A9',
-                ha='left', va='top', fontproperties=date_font, transform=ax.transAxes, zorder=2)
+        # 1. Calculate total vertical slots required to fill the page
+        num_separators = num_halls - 1 if num_halls > 1 else 0
+        total_slots = num_movie_rows + num_separators + 2  # movies + separators + top/bottom padding
         
-        halls = sorted(data['Hall'].unique(), key=lambda h: int(h.replace('号','')) if h else 0)
+        if total_slots == 0: return
+
+        # 2. Calculate the height of each slot
+        slot_height = 1.0 / total_slots
         
-        # --- Dynamic Layout Calculation ---
-        num_movie_lines = len(data)
-        num_gaps = len(halls) - 1
-        total_lines = num_movie_lines + num_gaps if num_gaps > 0 else num_movie_lines
+        # 3. Calculate font size to be 90% of the slot height
+        figure_height_inches = 11.69
+        font_size_points = (slot_height * figure_height_inches) * 0.9 * 72 # (height in inches) * 90% * 72 points/inch
+        movie_font_size = font_size_points
+        hall_font_size = movie_font_size * 0.8
         
-        available_height = 0.95  # Use 95% of vertical space
-        y_start = 0.98
-        line_height = available_height / total_lines if total_lines > 0 else 0.04
-        y_position = y_start
+        date_font = get_font(12)
+        hall_font = get_font(hall_font_size)
+        movie_font = get_font(movie_font_size)
         
-        # --- Drawing Loop ---
+        # Draw the date at the top
+        ax.text(0.00, 1.00, date_str, fontsize=12, color='#A9A9A9',
+                ha='left', va='top', fontproperties=date_font, transform=ax.transAxes, zorder=3)
+
+        # 4. Initialize Y position, starting below the top padding slot
+        y_position = 1.0 - slot_height
+
+        # 5. Loop through each hall and its movies to draw the schedule
         for i, hall in enumerate(halls):
             hall_data = data[data['Hall'] == hall]
-            hall_num = hall.replace("号", "")
-            hall_text = f"${hall_num}^{{\\#}}$"
+            movie_count = 1
             
-            for movie_idx, (_, row) in enumerate(hall_data.iterrows()):
-                # Print hall number (only for the first movie in the block)
-                if movie_idx == 0:
+            for _, row in hall_data.iterrows():
+                # Draw Hall Number (only for the first movie of the hall)
+                if movie_count == 1:
+                    hall_num = hall.replace("号", "")
+                    hall_text = f"${hall_num}^{{\\#}}$"  # Use LaTeX for superscript '#'
                     ax.text(0.03, y_position, hall_text,
                             fontsize=hall_font_size, fontweight='bold',
                             ha='left', va='top', fontproperties=hall_font,
                             transform=ax.transAxes, zorder=2)
-                
+
+                # Draw Pinyin Abbreviation and Movie Title
                 pinyin_abbr = get_pinyin_abbr(row['Movie'])
-                
-                # Print movie name
-                ax.text(0.20, y_position, f"{movie_idx + 1}. {pinyin_abbr} {row['Movie']}",
+                ax.text(0.20, y_position, f"{movie_count}. {pinyin_abbr} {row['Movie']}",
                         fontsize=movie_font_size, ha='left', va='top', fontproperties=movie_font,
-                        transform=ax.transAxes, zorder=2, clip_on=True,
-                        bbox=dict(boxstyle="square,pad=0.0", fc="none", ec="none", alpha=0))
-                
-                # Print time information
+                        transform=ax.transAxes, zorder=2, clip_on=True)
+
+                # Draw Time Information
                 ax.text(0.95, y_position, f"{row['StartTime_str']} - {row['EndTime_str']}",
                         fontsize=movie_font_size, ha='right', va='top', fontproperties=movie_font,
                         transform=ax.transAxes, zorder=2)
                 
-                y_position -= line_height
+                y_position -= slot_height # Move down for the next movie
+                movie_count += 1
             
-            # After a hall's movies, add a black separator line
-            if i < len(halls) - 1:
-                # The line is drawn in the middle of the allocated gap space
-                line_y = y_position + (line_height / 2)
-                ax.plot([0.03, 0.97], [line_y, line_y], color='black', linewidth=1, transform=ax.transAxes, zorder=1)
+            # After a hall's schedule, draw a separator line (if not the last hall)
+            if i < num_halls - 1:
+                # The line is drawn in the middle of the dedicated separator slot
+                line_y = y_position - (slot_height / 2)
+                ax.plot([0.03, 0.97], [line_y, line_y], color='black', linewidth=0.8, transform=ax.transAxes, zorder=1)
                 
-                # Move position down to account for the gap
-                y_position -= line_height
+                y_position -= slot_height # Move down past the separator slot
 
-    # --- Process and Save Figures ---
+    # Process and render the layout for both figure objects
     process_figure(png_fig, png_ax)
-    process_figure(pdf_fig, pdf_ax)
+    process_figure(pdf_fig, pdf_ax, is_pdf=True)
     
-    # Save PNG to buffer
+    # Save PNG to a buffer
     png_buffer = io.BytesIO()
     png_fig.savefig(png_buffer, format='png', bbox_inches='tight', pad_inches=0.05)
     png_buffer.seek(0)
     image_base64 = base64.b64encode(png_buffer.getvalue()).decode()
     plt.close(png_fig)
     
-    # Save PDF to buffer
+    # Save PDF to a buffer
     pdf_buffer = io.BytesIO()
     with PdfPages(pdf_buffer) as pdf:
         pdf.savefig(pdf_fig, bbox_inches='tight', pad_inches=0.05)
@@ -196,30 +205,45 @@ def create_print_layout(data, date_str):
     }
 
 def display_pdf(base64_pdf):
-    """Embeds the PDF in an iframe for display in Streamlit."""
-    pdf_display = f'<iframe src="{base64_pdf}" width="100%" height="800" type="application/pdf"></iframe>'
+    """Generates the HTML to embed and display a PDF in Streamlit."""
+    pdf_display = f"""
+    <iframe src="{base64_pdf}" width="100%" height="800" type="application/pdf"></iframe>
+    """
     return pdf_display
 
-# --- Streamlit App UI ---
-st.set_page_config(page_title="LED Screen Schedule Print", layout="wide")
-st.title("LED Screen Schedule Print")
+# --- Streamlit App Main ---
+st.set_page_config(page_title="LED 屏幕时间表打印", layout="wide")
+st.title("LED 屏幕时间表打印")
 
-uploaded_file = st.file_uploader("Select 'Screening Time Checklist.xls' file", type=["xls"])
+uploaded_file = st.file_uploader("选择打开【放映时间核对表.xls】文件", accept_multiple_files=False, type=["xls", "xlsx"])
 
 if uploaded_file:
-    with st.spinner("Processing file, please wait..."):
+    with st.spinner("文件正在处理中，请稍候..."):
         schedule, date_str = process_schedule(uploaded_file)
         if schedule is not None and not schedule.empty:
             output = create_print_layout(schedule, date_str)
             
-            # Create tabs for PDF and PNG previews
-            tab1, tab2 = st.tabs(["PDF Preview", "PNG Preview"])
+            st.success("处理完成！请在下方预览和下载。")
+            
+            # Create tabs to switch between PDF and PNG views
+            tab1, tab2 = st.tabs(["PDF 预览 (推荐打印)", "PNG 预览"])
             
             with tab1:
                 st.markdown(display_pdf(output['pdf']), unsafe_allow_html=True)
+                st.download_button(
+                    label="下载 PDF 文件",
+                    data=base64.b64decode(output['pdf'].split(',')[1]),
+                    file_name=f"Schedule_{date_str}.pdf",
+                    mime="application/pdf"
+                )
             
             with tab2:
                 st.image(output['png'], use_container_width=True)
+                st.download_button(
+                    label="下载 PNG 图像",
+                    data=base64.b64decode(output['png'].split(',')[1]),
+                    file_name=f"Schedule_{date_str}.png",
+                    mime="image/png"
+                )
         else:
-            st.error("Could not process the file. Please check if the file format or content is correct.")
-            
+            st.error("无法处理文件，或文件中没有找到有效排期。请检查文件格式或内容是否正确。")