Update app.py

app.py

@@ -9,20 +9,41 @@ import os
 from datetime import datetime, timedelta
 from pypinyin import lazy_pinyin, Style
 from matplotlib.backends.backend_pdf import PdfPages
-
-def get_font(size=14):
-    """Loads a specific TrueType font, defaulting to a common Chinese font."""
-    font_path = "simHei.ttc"
-    if not os.path.exists(font_path):
-        font_path = "SimHei.ttf"
+import matplotlib.gridspec as gridspec
+import math
+
+# --- 常量定义 ---
+SPLIT_TIME = "17:30"
+BUSINESS_START = "09:30"
+BUSINESS_END = "01:30"
+BORDER_COLOR = 'grey'
+DATE_COLOR = '#A9A9A9'
+A5_WIDTH_IN = 5.83
+A5_HEIGHT_IN = 8.27
+NUM_COLS = 3
+
+# --- 字体加载与文本处理函数 ---
+
+def get_font_regular(size=14):
+    """加载思源黑体-常规 (SimHei.ttf)"""
+    font_path = "SimHei.ttf"
     if os.path.exists(font_path):
         return font_manager.FontProperties(fname=font_path, size=size)
     else:
-        st.warning("SimHei font not found. Display may not be correct. Please add simHei.ttc or SimHei.ttf.")
+        st.warning("警告：未找到字体文件 'SimHei.ttf'，LED屏排片表显示可能不正确。")
         return font_manager.FontProperties(family='sans-serif', size=size)
 
+def get_font_bold(size=14):
+    """加载思源黑体-粗体 (SourceHanSansOLD-Heavy-2.otf)"""
+    font_path = "SourceHanSansOLD-Heavy-2.otf"
+    if os.path.exists(font_path):
+        return font_manager.FontProperties(fname=font_path, size=size)
+    else:
+        st.warning("警告：未找到字体文件 'SourceHanSansOLD-Heavy-2.otf'，散场时间表显示可能不正确。")
+        return font_manager.FontProperties(family='sans-serif', size=size, weight='bold')
+
 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 ""
     chars = [c for c in text if '\u4e00' <= c <= '\u9fff'][:2]
@@ -32,22 +53,19 @@ def get_pinyin_abbr(text):
     return ''.join(pinyin_list).upper()
 
 def format_seq(n):
-    """Converts an integer to a circled number string (e.g., 1 -> ①)."""
+    """将数字转换为带圈序号 (①, ②, ③...)"""
     if not isinstance(n, int) or n <= 0:
         return str(n)
-    # Unicode characters for circled numbers 1-50
     circled_chars = "①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮⑯⑰⑱⑲⑳" \
                     "㉑㉒㉓㉔㉕㉖㉗㉘㉙㉚㉛㉜㉝㉞㉟" \
                     "㊱㊲㊳㊴㊵㊶㊷㊸㊹㊺㊻㊼㊽㊾㊿"
     if 1 <= n <= 50:
-        return circled_chars[n-1]
-    return f'({n})'  # Fallback for numbers greater than 50
+        return circled_chars[n - 1]
+    return f'({n})'
 
-def process_schedule(file):
-    """
-    Processes the uploaded Excel file to extract and clean the movie schedule data.
-    Adds a sequence number for movies within each hall.
-    """
+# --- '放映时间核对表' 处理函数 ---
+def process_schedule_led(file):
+    """处理 '放映时间核对表.xls' 文件"""
     try:
         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')
@@ -59,20 +77,15 @@ def process_schedule(file):
     try:
         df = pd.read_excel(file, header=9, usecols=[1, 2, 4, 5])
         df.columns = ['Hall', 'StartTime', 'EndTime', 'Movie']
-        
         df['Hall'] = df['Hall'].ffill()
         df.dropna(subset=['StartTime', 'EndTime', 'Movie'], inplace=True)
         df['Hall'] = df['Hall'].astype(str).str.extract(r'(\d+号)')
-        
         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
-        )
+            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
-        )
+            lambda t: t.replace(year=base_date.year, month=base_date.month, day=base_date.day) if pd.notnull(t) else t)
         df.loc[df['EndTime_dt'] < df['StartTime_dt'], 'EndTime_dt'] += timedelta(days=1)
         df = df.sort_values(['Hall', 'StartTime_dt'])
-
         merged_rows = []
         for _, group in df.groupby('Hall'):
             current = None
@@ -86,134 +99,90 @@ def process_schedule(file):
                     current = row.copy()
             if current is not None:
                 merged_rows.append(current)
-        
         merged_df = pd.DataFrame(merged_rows)
-        
         merged_df['StartTime_dt'] -= timedelta(minutes=10)
         merged_df['EndTime_dt'] -= timedelta(minutes=5)
-        
         merged_df['Seq'] = merged_df.groupby('Hall').cumcount() + 1
-        
         merged_df['StartTime_str'] = merged_df['StartTime_dt'].dt.strftime('%H:%M')
         merged_df['EndTime_str'] = merged_df['EndTime_dt'].dt.strftime('%H:%M')
-        
         return merged_df[['Hall', 'Seq', 'Movie', 'StartTime_str', 'EndTime_str']], date_str
     except Exception as e:
-        st.error(f"Error processing schedule data: {e}. Please check the file format.")
+        st.error(f"处理数据出错: {e}。请检查文件格式是否正确。")
         return None, date_str
 
-
-def create_print_layout(data, date_str):
-    """
-    Generates PNG and PDF print layouts for the movie schedule based on a dynamic grid.
-    """
+def create_print_layout_led(data, date_str):
+    """为 '放映时间核对表' 生成打印布局 (使用 Regular 字体)"""
     if data is None or data.empty:
         return None
-
-    # --- 1. Layout and Column Calculation ---
     A4_width_in, A4_height_in = 8.27, 11.69
     dpi = 300
-
     total_content_rows = len(data)
     totalA = total_content_rows + 2
     row_height = A4_height_in / totalA
-
-    # Prepare data strings for width calculation
     data = data.reset_index(drop=True)
-    # Format Hall number with LaTeX for superscript
     data['hall_str'] = '$' + data['Hall'].str.replace('号', '') + '^{\#}$'
-    # Format sequence number as circled character
     data['seq_str'] = data['Seq'].apply(format_seq)
     data['pinyin_abbr'] = data['Movie'].apply(get_pinyin_abbr)
     data['time_str'] = data['StartTime_str'] + ' - ' + data['EndTime_str']
-
     temp_fig = plt.figure(figsize=(A4_width_in, A4_height_in), dpi=dpi)
     renderer = temp_fig.canvas.get_renderer()
-
     base_font_size_pt = (row_height * 0.9) * 72
-    # Specific font size for circled numbers (50% of row height)
     seq_font_size_pt = (row_height * 0.5) * 72
-    
+
     def get_col_width_in(series, font_size_pt, is_math=False):
-        """Calculates the required width for a column in inches."""
-        if series.empty:
-            return 0
-        font_prop = get_font(font_size_pt)
+        if series.empty: return 0
+        font_prop = get_font_regular(font_size_pt) # 使用 Regular 字体
         longest_str_idx = series.astype(str).str.len().idxmax()
         max_content = str(series.loc[longest_str_idx])
         text_width_px, _, _ = renderer.get_text_width_height_descent(max_content, font_prop, ismath=is_math)
         return (text_width_px / dpi) * 1.1
 
-    # Calculate widths for all columns
     margin_col_width = row_height
-    # Pass is_math=True for hall number width calculation
     hall_col_width = get_col_width_in(data['hall_str'], base_font_size_pt, is_math=True)
-    # Use the smaller font size for sequence number width calculation
     seq_col_width = get_col_width_in(data['seq_str'], seq_font_size_pt)
     pinyin_col_width = get_col_width_in(data['pinyin_abbr'], base_font_size_pt)
     time_col_width = get_col_width_in(data['time_str'], base_font_size_pt)
-
-    movie_col_width = A4_width_in - (margin_col_width * 2 + hall_col_width + seq_col_width + pinyin_col_width + time_col_width)
-    
+    movie_col_width = A4_width_in - (
+            margin_col_width * 2 + hall_col_width + seq_col_width + pinyin_col_width + time_col_width)
     plt.close(temp_fig)
-
-    col_widths = {'hall': hall_col_width, 'seq': seq_col_width, 'movie': movie_col_width, 'pinyin': pinyin_col_width, 'time': time_col_width}
+    col_widths = {'hall': hall_col_width, 'seq': seq_col_width, 'movie': movie_col_width, 'pinyin': pinyin_col_width,
+                  'time': time_col_width}
     col_x_starts = {}
     current_x = margin_col_width
     for col_name in ['hall', 'seq', 'movie', 'pinyin', 'time']:
         col_x_starts[col_name] = current_x
         current_x += col_widths[col_name]
 
-    # --- 2. Drawing ---
     def draw_figure(fig, ax):
         renderer = fig.canvas.get_renderer()
-        
         for col_name in ['hall', 'seq', 'movie', 'pinyin']:
             x_line = col_x_starts[col_name] + col_widths[col_name]
             line_top_y, line_bottom_y = A4_height_in - row_height, row_height
             ax.add_line(Line2D([x_line, x_line], [line_bottom_y, line_top_y], color='gray', linestyle=':', linewidth=0.5))
-
         last_hall_drawn = None
         for i, row in data.iterrows():
             y_bottom = A4_height_in - (i + 2) * row_height
             y_center = y_bottom + row_height / 2
-
-            # --- Draw Cell Content ---
-            # Hall Number (renders superscript)
             if row['Hall'] != last_hall_drawn:
                 ax.text(col_x_starts['hall'] + col_widths['hall'] / 2, y_center, row['hall_str'],
-                        fontproperties=get_font(base_font_size_pt), ha='center', va='center')
+                        fontproperties=get_font_regular(base_font_size_pt), ha='center', va='center')
                 last_hall_drawn = row['Hall']
-
-            # Sequence Number (with smaller, specific font size)
             ax.text(col_x_starts['seq'] + col_widths['seq'] / 2, y_center, row['seq_str'],
-                    fontproperties=get_font(seq_font_size_pt), ha='center', va='center')
-
-            # Pinyin Abbreviation
+                    fontproperties=get_font_regular(seq_font_size_pt), ha='center', va='center')
             ax.text(col_x_starts['pinyin'] + col_widths['pinyin'] / 2, y_center, row['pinyin_abbr'],
-                    fontproperties=get_font(base_font_size_pt), ha='center', va='center')
-
-            # Time String
+                    fontproperties=get_font_regular(base_font_size_pt), ha='center', va='center')
             ax.text(col_x_starts['time'] + col_widths['time'] / 2, y_center, row['time_str'],
-                    fontproperties=get_font(base_font_size_pt), ha='center', va='center')
-
-            # Movie Title (with font scaling)
+                    fontproperties=get_font_regular(base_font_size_pt), ha='center', va='center')
             movie_font_size = base_font_size_pt
-            movie_font_prop = get_font(movie_font_size)
+            movie_font_prop = get_font_regular(movie_font_size)
             text_w_px, _, _ = renderer.get_text_width_height_descent(row['Movie'], movie_font_prop, ismath=False)
             text_w_in = text_w_px / dpi
-            
             max_width_in = col_widths['movie'] * 0.9
             if text_w_in > max_width_in:
                 movie_font_size *= (max_width_in / text_w_in)
-                movie_font_prop = get_font(movie_font_size)
-            
-            ax.text(col_x_starts['movie'] + 0.05, y_center, row['Movie'],
-                    fontproperties=movie_font_prop, ha='left', va='center')
-
-            # --- Draw Horizontal Lines ---
+                movie_font_prop = get_font_regular(movie_font_size)
+            ax.text(col_x_starts['movie'] + 0.05, y_center, row['Movie'], fontproperties=movie_font_prop, ha='left', va='center')
             is_last_in_hall = (i == len(data) - 1) or (row['Hall'] != data.loc[i + 1, 'Hall'])
-            
             line_start_x = margin_col_width
             line_end_x = A4_width_in - margin_col_width
             if is_last_in_hall:
@@ -221,7 +190,6 @@ def create_print_layout(data, date_str):
             else:
                 ax.add_line(Line2D([line_start_x, line_end_x], [y_bottom, y_bottom], color='gray', linestyle=':', linewidth=0.5))
 
-    # --- 3. Setup Figures and Generate Output ---
     outputs = {}
     for format_type in ['png', 'pdf']:
         fig = plt.figure(figsize=(A4_width_in, A4_height_in), dpi=dpi)
@@ -229,47 +197,195 @@ def create_print_layout(data, date_str):
         ax.set_axis_off()
         ax.set_xlim(0, A4_width_in)
         ax.set_ylim(0, A4_height_in)
-        
-        ax.text(margin_col_width, A4_height_in - (row_height/2), date_str, 
-                fontproperties=get_font(10), color='#A9A9A9', ha='left', va='center')
-
+        ax.text(margin_col_width, A4_height_in - (row_height / 2), date_str,
+                fontproperties=get_font_regular(10), color='#A9A9A9', ha='left', va='center')
         draw_figure(fig, ax)
-        
         buf = io.BytesIO()
         fig.savefig(buf, format=format_type, dpi=dpi, bbox_inches='tight', pad_inches=0)
         buf.seek(0)
-        
         data_uri = base64.b64encode(buf.getvalue()).decode()
         mime_type = 'image/png' if format_type == 'png' else 'application/pdf'
         outputs[format_type] = f"data:{mime_type};base64,{data_uri}"
-        
         plt.close(fig)
-
     return outputs
 
+# --- '放映场次核对表' 处理函数 ---
+def process_schedule_times(file):
+    """处理 '放映场次核对表.xls' 文件"""
+    try:
+        df = pd.read_excel(file, skiprows=8)
+        df = df.iloc[:, [6, 7, 9]]
+        df.columns = ['Hall', 'StartTime', 'EndTime']
+        df = df.dropna(subset=['Hall', 'StartTime', 'EndTime'])
+        df['Hall'] = df['Hall'].str.extract(r'(\d+)号').astype(str) + ' '
+        base_date = datetime.today().date()
+        df['StartTime'] = pd.to_datetime(df['StartTime'])
+        df['EndTime'] = pd.to_datetime(df['EndTime'])
+        business_start = datetime.strptime(f"{base_date} {BUSINESS_START}", "%Y-%m-%d %H:%M")
+        business_end = datetime.strptime(f"{base_date} {BUSINESS_END}", "%Y-%m-%d %H:%M")
+        if business_end < business_start:
+            business_end += timedelta(days=1)
+        for idx, row in df.iterrows():
+            end_time = row['EndTime']
+            if end_time.hour < 9:
+                df.at[idx, 'EndTime'] = end_time + timedelta(days=1)
+            if row['StartTime'].hour >= 21 and end_time.hour < 9:
+                df.at[idx, 'EndTime'] = end_time + timedelta(days=1)
+        df['time_for_comparison'] = df['EndTime'].apply(lambda x: datetime.combine(base_date, x.time()))
+        df.loc[df['time_for_comparison'].dt.hour < 9, 'time_for_comparison'] += timedelta(days=1)
+        valid_times = (((df['time_for_comparison'] >= datetime.combine(base_date, business_start.time())) &
+                        (df['time_for_comparison'] <= datetime.combine(base_date + timedelta(days=1), business_end.time()))))
+        df = df[valid_times]
+        df = df.sort_values('EndTime')
+        split_time = datetime.strptime(f"{base_date} {SPLIT_TIME}", "%Y-%m-%d %H:%M")
+        split_time_for_comparison = df['time_for_comparison'].apply(lambda x: datetime.combine(base_date, split_time.time()))
+        part1 = df[df['time_for_comparison'] <= split_time_for_comparison].copy()
+        part2 = df[df['time_for_comparison'] > split_time_for_comparison].copy()
+        for part in [part1, part2]:
+            part['EndTime'] = part['EndTime'].dt.strftime('%-H:%M')
+        date_df = pd.read_excel(file, skiprows=5, nrows=1, usecols=[2], header=None)
+        date_cell = date_df.iloc[0, 0]
+        try:
+            if isinstance(date_cell, str):
+                date_str = datetime.strptime(date_cell, '%Y-%m-%d').strftime('%Y-%m-%d')
+            else:
+                date_str = pd.to_datetime(date_cell).strftime('%Y-%m-%d')
+        except:
+            date_str = datetime.today().strftime('%Y-%m-%d')
+        return part1[['Hall', 'EndTime']], part2[['Hall', 'EndTime']], date_str
+    except Exception as e:
+        st.error(f"处理文件出错: {str(e)}")
+        return None, None, None
+
+def create_print_layout_times(data, title, date_str):
+    """为 '放映场次核对表' 生成打印布局 (使用 Bold 字体)"""
+    if data.empty:
+        return None
+
+    def generate_figure():
+        total_items = len(data)
+        num_rows = math.ceil(total_items / NUM_COLS) if total_items > 0 else 1
+        date_header_height_in = 0.3
+        data_area_height_in = A5_HEIGHT_IN - date_header_height_in
+        cell_width_in = A5_WIDTH_IN / NUM_COLS
+        cell_height_in = data_area_height_in / num_rows
+        cell_width_pt = cell_width_in * 72
+        cell_height_pt = cell_height_in * 72
+        target_text_width_pt = cell_width_pt * 0.9
+        fontsize_from_width = target_text_width_pt / (8 * 0.6)
+        fontsize_from_height = cell_height_pt * 0.8
+        base_fontsize = min(fontsize_from_width, fontsize_from_height)
+        fig = plt.figure(figsize=(A5_WIDTH_IN, A5_HEIGHT_IN), dpi=300)
+        fig.subplots_adjust(left=0, right=1, top=1, bottom=0)
+        
+        gs = gridspec.GridSpec(
+            num_rows + 1, NUM_COLS,
+            hspace=0, wspace=0,
+            height_ratios=[date_header_height_in] + [cell_height_in] * num_rows,
+            figure=fig)
+        data_values = data.values.tolist()
+        while len(data_values) % NUM_COLS != 0:
+            data_values.append(['', ''])
+        rows_per_col_layout = math.ceil(len(data_values) / NUM_COLS)
+        sorted_data = [['', '']] * len(data_values)
+        for i, item in enumerate(data_values):
+            if item[0] and item[1]:
+                row_in_col = i % rows_per_col_layout
+                col_idx = i // rows_per_col_layout
+                new_index = row_in_col * NUM_COLS + col_idx
+                if new_index < len(sorted_data):
+                    sorted_data[new_index] = item
+        for idx, (hall, end_time) in enumerate(sorted_data):
+            if hall and end_time:
+                row_grid = idx // NUM_COLS + 1
+                col_grid = idx % NUM_COLS
+                ax = fig.add_subplot(gs[row_grid, col_grid])
+                for spine in ax.spines.values():
+                    spine.set_visible(True)
+                    spine.set_linestyle((0, (1, 2)))
+                    spine.set_color(BORDER_COLOR)
+                    spine.set_linewidth(0.75)
+                display_text = f"{hall}{end_time}"
+                ax.text(0.5, 0.5, display_text,
+                        fontproperties=get_font_bold(base_fontsize), # 使用 Bold 字体
+                        ha='center', va='center',
+                        transform=ax.transAxes)
+                ax.set_xticks([])
+                ax.set_yticks([])
+                ax.set_facecolor('none')
+        ax_date = fig.add_subplot(gs[0, :])
+        ax_date.text(0.01, 0.5, f"{date_str} {title}",
+                     fontproperties=get_font_bold(base_fontsize * 0.5), # 使用 Bold 字体
+                     color=DATE_COLOR,
+                     ha='left', va='center',
+                     transform=ax_date.transAxes)
+        ax_date.set_axis_off()
+        ax_date.set_facecolor('none')
+        return fig
+
+    fig_for_output = generate_figure()
+    png_buffer = io.BytesIO()
+    fig_for_output.savefig(png_buffer, format='png')
+    png_buffer.seek(0)
+    png_base64 = base64.b64encode(png_buffer.getvalue()).decode()
+    pdf_buffer = io.BytesIO()
+    with PdfPages(pdf_buffer) as pdf:
+        pdf.savefig(fig_for_output)
+    pdf_buffer.seek(0)
+    pdf_base64 = base64.b64encode(pdf_buffer.getvalue()).decode()
+    plt.close(fig_for_output)
+    return {'png': f'data:image/png;base64,{png_base64}', 'pdf': f'data:application/pdf;base64,{pdf_base64}'}
 
 def display_pdf(base64_pdf):
-    """Generates the HTML to embed a PDF in Streamlit."""
+    """在Streamlit中嵌入显示PDF"""
     return f'<iframe src="{base64_pdf}" width="100%" height="800" type="application/pdf"></iframe>'
 
-# --- Streamlit App ---
-st.set_page_config(page_title="LED Screen Schedule Printer", layout="wide")
-st.title("LED Screen Schedule Printer")
+# --- Streamlit 主程��� ---
+st.set_page_config(page_title="影院排期打印工具", layout="wide")
+st.title("影院排期打印工具")
 
-uploaded_file = st.file_uploader("Select the '放映时间核对表.xls' file", accept_multiple_files=False, type=["xls", "xlsx"])
+uploaded_file = st.file_uploader("请上传 '放映时间核对表.xls' 或 '放映场次核对表.xls'",
+                                 type=["xls", "xlsx"])
 
 if uploaded_file:
-    with st.spinner("Processing file, please wait..."):
-        schedule, date_str = process_schedule(uploaded_file)
-        if schedule is not None and not schedule.empty:
-            output = create_print_layout(schedule, date_str)
-            
-            tab1, tab2 = st.tabs(["PDF Preview", "PNG Preview"])
-            
-            with tab1:
-                st.markdown(display_pdf(output['pdf']), unsafe_allow_html=True)
-            
-            with tab2:
-                st.image(output['png'], use_container_width=True)
-        else:
-            st.error("Could not process the file. Please check if the file format and content are correct.")
+    # 根据文件名中的关键字判断使用哪个处理流程
+    if "时间" in uploaded_file.name:
+        st.header("LED屏排片表")
+        with st.spinner("正在处理文件，请稍候..."):
+            schedule, date_str = process_schedule_led(uploaded_file)
+            if schedule is not None and not schedule.empty:
+                output = create_print_layout_led(schedule, date_str)
+                tab1, tab2 = st.tabs(["PDF 预览", "图片预览 (PNG)"])
+                with tab1:
+                    st.markdown(display_pdf(output['pdf']), unsafe_allow_html=True)
+                with tab2:
+                    st.image(output['png'], use_container_width=True)
+            else:
+                st.error("无法处理文件。请检查文件内容和格式是否正确。")
+    elif "场次" in uploaded_file.name:
+        st.header("散场时间快捷打印")
+        part1, part2, date_str = process_schedule_times(uploaded_file)
+        if part1 is not None and part2 is not None:
+            part1_output = create_print_layout_times(part1, "A", date_str)
+            part2_output = create_print_layout_times(part2, "C", date_str)
+            col1, col2 = st.columns(2)
+            with col1:
+                st.subheader("白班 (散场时间 ≤ 17:30)")
+                if part1_output:
+                    tab1_1, tab1_2 = st.tabs(["PDF 预览 ", "图片预览 (PNG) "]) 
+                    with tab1_1:
+                        st.markdown(display_pdf(part1_output['pdf']), unsafe_allow_html=True)
+                    with tab1_2:
+                        st.image(part1_output['png'])
+                else:
+                    st.info("白班没有排期数据。")
+            with col2:
+                st.subheader("晚班 (散场时间 > 17:30)")
+                if part2_output:
+                    tab2_1, tab2_2 = st.tabs(["PDF 预览  ", "图片预览 (PNG)  "])
+                    with tab2_1:
+                        st.markdown(display_pdf(part2_output['pdf']), unsafe_allow_html=True)
+                    with tab2_2:
+                        st.image(part2_output['png'])
+                else:
+                    st.info("晚班没有排期数据。")