Update app.py

app.py

@@ -7,12 +7,11 @@ 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):
-    """Fetches the font properties for the SimHei font."""
+    """Finds an available SimHei font for Chinese character support."""
     font_path = "simHei.ttc"
     if not os.path.exists(font_path):
         font_path = "SimHei.ttf"
@@ -33,12 +32,14 @@ def get_pinyin_abbr(text):
     return ''.join(pinyin_list).upper()
 
 def process_schedule(file):
-    """Processes the uploaded schedule file to extract and format movie showtimes."""
+    """Processes the uploaded Excel file to extract and clean movie 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
         date_str = datetime.today().strftime('%Y-%m-%d')
         base_date = datetime.today().date()
     
@@ -48,15 +49,19 @@ 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')
@@ -75,7 +80,7 @@ def process_schedule(file):
         
         merged_df = pd.DataFrame(merged_rows)
         
-        # Adjust start time 10 minutes earlier, end time 5 minutes earlier
+        # Adjust start and end times
         merged_df['StartTime_dt'] = merged_df['StartTime_dt'] - timedelta(minutes=10)
         merged_df['EndTime_dt'] = merged_df['EndTime_dt'] - timedelta(minutes=5)
         
@@ -83,31 +88,31 @@ def process_schedule(file):
         merged_df['EndTime_str'] = merged_df['EndTime_dt'].dt.strftime('%H:%M')
         
         return merged_df[['Hall', 'Movie', 'StartTime_str', 'EndTime_str']], date_str
-    except:
+    except Exception as e:
+        st.error(f"An error occurred during data processing: {e}")
         return None, date_str
 
 def create_print_layout(data, date_str):
-    """Creates the PNG and PDF print layouts for the schedule."""
+    """Creates PNG and PDF layouts of the schedule, replacing boxes with separator lines."""
     if data is None or data.empty:
         return None
     
-    # Create PNG image - A4 size, maximized content
+    # --- Create figures for PNG and PDF ---
     png_fig = plt.figure(figsize=(8.27, 11.69), dpi=300)
     png_ax = png_fig.add_subplot(111)
     png_ax.set_axis_off()
     png_fig.subplots_adjust(left=0.02, right=0.98, top=0.98, bottom=0.02)
     
-    # Create PDF image - A4 size
     pdf_fig = plt.figure(figsize=(8.27, 11.69), dpi=300)
     pdf_ax = pdf_fig.add_subplot(111)
     pdf_ax.set_axis_off()
     pdf_fig.subplots_adjust(left=0.02, right=0.98, top=0.98, bottom=0.02)
     
-    # Common function to process both figures
-    def process_figure(fig, ax, is_pdf=False):
-        # Pre-load fonts
+    def process_figure(fig, ax):
+        # --- Font and Layout Setup ---
         date_font = get_font(12)
-        font_size_multiplier = 1.2
+        # 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)
@@ -118,69 +123,66 @@ def create_print_layout(data, date_str):
         
         halls = sorted(data['Hall'].unique(), key=lambda h: int(h.replace('号','')) if h else 0)
         
-        total_lines = sum(len(data[data['Hall'] == hall]) for hall in halls) + (len(halls) - 1)
-        available_height = 0.98 - 0.02
-        line_spacing = available_height / total_lines if total_lines > 0 else 0.04
-        y_position = 0.98
+        # --- 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
+        
+        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
         
-        for hall in halls:
+        # --- Drawing Loop ---
+        for i, hall in enumerate(halls):
             hall_data = data[data['Hall'] == hall]
-            y_block_top = y_position
             hall_num = hall.replace("号", "")
-            hall_text_template = f"${hall_num}^{{\\#}}$"
-            movie_count = 1
+            hall_text = f"${hall_num}^{{\\#}}$"
             
-            for _, row in hall_data.iterrows():
+            for movie_idx, (_, row) in enumerate(hall_data.iterrows()):
+                # Print hall number (only for the first movie in the block)
+                if movie_idx == 0:
+                    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)
+                
                 pinyin_abbr = get_pinyin_abbr(row['Movie'])
-                hall_text = hall_text_template if movie_count == 1 else ""
-
-                # Draw a line of dots underneath the text
-                dots = '·' * 300  # A large number of dots
-                ax.text(0.03, y_position, dots,
-                        fontsize=movie_font_size, color='gray',
-                        ha='left', va='top', fontproperties=movie_font,
-                        transform=ax.transAxes, zorder=1.5, clip_on=True)
-
-                # Draw Hall, Movie, and Time text with a white background to create the leader effect
-                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,
-                        bbox=dict(boxstyle="square,pad=0.1", fc="white", ec="none"))
                 
-                ax.text(0.20, y_position, f"{movie_count}. {pinyin_abbr} {row['Movie']}",
+                # Print movie name
+                ax.text(0.20, y_position, f"{movie_idx + 1}. {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.1", fc="white", ec="none"))
+                        bbox=dict(boxstyle="square,pad=0.0", fc="none", ec="none", alpha=0))
                 
+                # Print 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,
-                        bbox=dict(boxstyle="square,pad=0.1", fc="white", ec="none"))
+                        transform=ax.transAxes, zorder=2)
                 
-                y_position -= line_spacing
-                movie_count += 1
+                y_position -= line_height
             
-            y_block_bottom = y_position
-            y_position -= line_spacing
-            rect = FancyBboxPatch((0.03, y_block_bottom), 0.94, y_block_top - y_block_bottom,
-                                  boxstyle="round,pad=0.005,rounding_size=0.005",
-                                  edgecolor='gray', facecolor='white',
-                                  linewidth=0.8, zorder=1, transform=ax.transAxes)
-            ax.add_patch(rect)
-    
-    # Process the figures
+            # 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)
+                
+                # Move position down to account for the gap
+                y_position -= line_height
+
+    # --- Process and Save Figures ---
     process_figure(png_fig, png_ax)
-    process_figure(pdf_fig, pdf_ax, is_pdf=True)
+    process_figure(pdf_fig, pdf_ax)
     
-    # Save PNG image
+    # Save PNG to 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 file
+    # Save PDF to buffer
     pdf_buffer = io.BytesIO()
     with PdfPages(pdf_buffer) as pdf:
         pdf.savefig(pdf_fig, bbox_inches='tight', pad_inches=0.05)
@@ -194,26 +196,24 @@ def create_print_layout(data, date_str):
     }
 
 def display_pdf(base64_pdf):
-    """Generates the HTML to display a base64 encoded PDF in Streamlit."""
-    pdf_display = f"""
-    <iframe src="{base64_pdf}" width="100%" height="800" type="application/pdf"></iframe>
-    """
+    """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>'
     return pdf_display
 
-# --- Streamlit App ---
-st.set_page_config(page_title="LED 屏幕时间表打印", layout="wide")
-st.title("LED 屏幕时间表打印")
+# --- Streamlit App UI ---
+st.set_page_config(page_title="LED Screen Schedule Print", layout="wide")
+st.title("LED Screen Schedule Print")
 
-uploaded_file = st.file_uploader("选择打开【放映时间核对表.xls】文件", accept_multiple_files=False, type=["xls"])
+uploaded_file = st.file_uploader("Select 'Screening Time Checklist.xls' file", type=["xls"])
 
 if uploaded_file:
-    with st.spinner("文件正在处理中，请稍候..."):
+    with st.spinner("Processing file, please wait..."):
         schedule, date_str = process_schedule(uploaded_file)
-        if schedule is not None:
+        if schedule is not None and not schedule.empty:
             output = create_print_layout(schedule, date_str)
             
-            # Create tabs for PDF and PNG views
-            tab1, tab2 = st.tabs(["PDF 预览", "PNG 预览"])
+            # Create tabs for PDF and PNG previews
+            tab1, tab2 = st.tabs(["PDF Preview", "PNG Preview"])
             
             with tab1:
                 st.markdown(display_pdf(output['pdf']), unsafe_allow_html=True)
@@ -221,4 +221,5 @@ if uploaded_file:
             with tab2:
                 st.image(output['png'], use_container_width=True)
         else:
-            st.error("无法处理文件，请检查文件格式或内容是否正确。")
+            st.error("Could not process the file. Please check if the file format or content is correct.")
+