Update app.py

app.py

@@ -57,8 +57,8 @@ def format_seq(n):
     if not isinstance(n, int) or n <= 0:
         return str(n)
     circled_chars = "①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮⑯⑰⑱⑲⑳" \
-                    "㉑㉒㉓㉔㉕㉖㉗㉘㉙㉚㉛㉜㉝㉞㉟" \
-                    "㊱㊲㊳㊴㊵㊶㊷㊸㊹㊺㊻㊼㊽㊾㊿"
+                      "㉑㉒㉓㉔㉕㉖㉗㉘㉙㉚㉛㉜㉝㉞㉟" \
+                      "㊱㊲㊳㊴㊵㊶㊷㊸㊹㊺㊻㊼㊽㊾㊿"
     if 1 <= n <= 50:
         return circled_chars[n - 1]
     return f'({n})'
@@ -117,13 +117,19 @@ def create_print_layout_led(data, date_str):
     A4_width_in, A4_height_in = 8.27, 11.69
     dpi = 300
     total_content_rows = len(data)
-    totalA = total_content_rows + 2
+    
+    # --- 已修改部分：如果数据条数小于25条，则按25条计算行高以防止字体过大 ---
+    layout_rows = max(total_content_rows, 25)
+    totalA = layout_rows + 2
+    # --- 修改结束 ---
+
     row_height = A4_height_in / totalA
     data = data.reset_index(drop=True)
     data['hall_str'] = '$' + data['Hall'].str.replace('号', '') + '^{\#}$'
     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
@@ -143,8 +149,9 @@ def create_print_layout_led(data, date_str):
     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)
+        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_x_starts = {}
@@ -159,29 +166,36 @@ def create_print_layout_led(data, date_str):
             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
+            
             if row['Hall'] != last_hall_drawn:
                 ax.text(col_x_starts['hall'] + col_widths['hall'] / 2, y_center, row['hall_str'],
                         fontproperties=get_font_regular(base_font_size_pt), ha='center', va='center')
                 last_hall_drawn = row['Hall']
+            
             ax.text(col_x_starts['seq'] + col_widths['seq'] / 2, y_center, row['seq_str'],
                     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_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_regular(base_font_size_pt), ha='center', va='center')
+            
             movie_font_size = base_font_size_pt
             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_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
@@ -199,7 +213,9 @@ def create_print_layout_led(data, date_str):
         ax.set_ylim(0, A4_height_in)
         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)
@@ -207,6 +223,7 @@ def create_print_layout_led(data, date_str):
         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
 
 # --- '放映场次核对表' 处理函数 ---
@@ -221,28 +238,36 @@ def process_schedule_times(file):
         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:
@@ -252,6 +277,7 @@ def process_schedule_times(file):
                 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)}")
@@ -275,6 +301,7 @@ def create_print_layout_times(data, title, date_str):
         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)
         
@@ -283,9 +310,11 @@ def create_print_layout_times(data, title, date_str):
             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):
@@ -295,6 +324,7 @@ def create_print_layout_times(data, title, date_str):
                 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
@@ -305,6 +335,7 @@ def create_print_layout_times(data, title, date_str):
                     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 字体
@@ -313,6 +344,7 @@ def create_print_layout_times(data, title, date_str):
                 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 字体
@@ -321,6 +353,7 @@ def create_print_layout_times(data, title, date_str):
                      transform=ax_date.transAxes)
         ax_date.set_axis_off()
         ax_date.set_facecolor('none')
+        
         return fig
 
     fig_for_output = generate_figure()
@@ -328,11 +361,13 @@ def create_print_layout_times(data, title, date_str):
     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}'}
 
@@ -362,12 +397,14 @@ if uploaded_file:
                     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:00)")
@@ -379,6 +416,7 @@ if uploaded_file:
                         st.image(part1_output['png'])
                 else:
                     st.info("白班没有排期数据。")
+
             with col2:
                 st.subheader("晚班 (散场时间 > 17:00)")
                 if part2_output: