codeannex 0.3.1__tar.gz → 0.3.3__tar.gz

{codeannex-0.3.1 → codeannex-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeannex
-Version: 0.3.1
+Version: 0.3.3
 Summary: Generates a professional PDF source code annex with Smart Index, Images and Emoji support.
 License: MIT
 Project-URL: Repository, https://github.com/tanhleno/codeannex

{codeannex-0.3.1 → codeannex-0.3.3}/codeannex/__main__.py

@@ -112,11 +112,25 @@ def main():
             if fp.resolve() in (script_path, output_path): continue
         except: pass
         if not fp.is_file(): continue
+        
         ext = fp.suffix.lower()
-        if ext == ".svg": included += [(fp, "image"), (fp, "text")]
-        elif ext in IMAGE_EXTENSIONS: included.append((fp, "image"))
-        elif ext in BINARY_EXTENSIONS: continue
-        elif classify_file(fp) == "text": included.append((fp, "text"))
+        if ext == ".svg":
+            included += [(fp, "image"), (fp, "text")]
+            continue
+        elif ext in IMAGE_EXTENSIONS:
+            included.append((fp, "image"))
+            continue
+        elif ext in BINARY_EXTENSIONS:
+            rel_path = fp.relative_to(root).as_posix()
+            print(f"⚠️  Skipping binary/unsupported file: {rel_path}")
+            continue
+        
+        file_type = classify_file(fp)
+        if file_type == "text":
+            included.append((fp, "text"))
+        else:
+            rel_path = fp.relative_to(root).as_posix()
+            print(f"⚠️  Skipping binary file: {rel_path}")
 
     if not included:
         print("❌ No compatible files found."); return

{codeannex-0.3.1 → codeannex-0.3.3}/codeannex/core/pdf_builder.py

@@ -133,27 +133,27 @@ class ModernAnnexPDF:
             curr_y = self.config.page_height * 0.45
             
             if project_name:
-                self._dctf(mid_x, curr_y, f"{self.config.repo_label}{project_name}", self.config.normal_font, 14, text_color)
+                display_repo = f"{self.config.repo_label}{project_name}"
+                if self.config.branch_name:
+                    display_repo += f" ({self.config.branch_name})"
+                
+                name_w = self._gsw(display_repo, self.config.normal_font, 14)
+                start_x = mid_x - name_w / 2
+                
+                # Use primary color for project name if it has a link
+                final_color = colors.HexColor(self.config.primary_color) if self.config.repo_url else text_color
+                self._dtf(start_x, curr_y, display_repo, self.config.normal_font, 14, final_color)
+                
+                if self.config.repo_url:
+                    self.c.linkURL(self.config.repo_url, (start_x, curr_y - 2, start_x + name_w, curr_y + 12), relative=0, thickness=0, border=None)
+                
                 curr_y -= 8*mm
             
-            # 4. Technical Metadata (Branch | Commit)
-            tech_items = []
-            if self.config.branch_name:
-                tech_items.append(f"Branch: {self.config.branch_name}")
+            # 4. Technical Metadata (SHA)
             if self.config.commit_sha:
-                tech_items.append(f"Commit: {self.config.commit_sha}")
-            
-            if tech_items:
-                tech_str = "  |  ".join(tech_items)
+                tech_str = f"Commit: {self.config.commit_sha}"
                 self._dctf(mid_x, curr_y, tech_str, self.config.normal_font, 10, colors.HexColor("#6c7086"))
                 curr_y -= 12*mm
-            
-            if self.config.repo_url:
-                url = self.config.repo_url
-                url_w = self._gsw(url, self.config.normal_font, 11)
-                start_x = mid_x - url_w / 2
-                self._dtf(start_x, curr_y, url, self.config.normal_font, 11, colors.HexColor(self.config.primary_color))
-                self.c.linkURL(url, (start_x, curr_y - 2, start_x + url_w, curr_y + 10), relative=0, thickness=0, border=None)
 
     def draw_summary_page(self, files: list):
         self.start_new_page()
@@ -163,7 +163,16 @@ class ModernAnnexPDF:
                       title_font, 16, colors.HexColor(self.config.title_color))
         self.y -= 12*mm
         nested_tree: dict = {"_files": []}
+        
+        # To avoid double entries for SVG (Image + Code)
+        processed_paths = set()
+        unique_files = []
         for fpath, ftype in files:
+            if fpath not in processed_paths:
+                unique_files.append((fpath, ftype))
+                processed_paths.add(fpath)
+
+        for fpath, ftype in unique_files:
             rel = fpath.relative_to(self.project_root)
             curr = nested_tree
             for part in rel.parts[:-1]: curr = curr.setdefault(part, {"_files": []})
@@ -174,10 +183,7 @@ class ModernAnnexPDF:
     def _draw_recursive_summary(self, node: dict, depth: int, path_parts: list, is_last_list: list):
         subdirs = sorted([k for k in node.keys() if k != "_files"], key=str.lower)
         files_in_node = node.get("_files", [])
-        
-        # Subdirectories first, then files (matches the new sort_files logic)
         all_entries = [(d, "dir") for d in subdirs] + [(f, "file") for f in files_in_node]
-        
         indent_step, text_color = 5*mm, colors.HexColor(self.config.normal_text_color)
         for i, (item, type) in enumerate(all_entries):
             is_last = (i == len(all_entries) - 1)
@@ -204,9 +210,9 @@ class ModernAnnexPDF:
             self.y -= 6*mm
             if type == "dir": self._draw_recursive_summary(node[item], depth + 1, path_parts + [item], is_last_list + [is_last])
 
-    def render_text_file(self, fpath: Path, label_suffix=""):
+    def render_text_file(self, fpath: Path):
         rel = fpath.relative_to(self.project_root).as_posix()
-        display_name, bookmark_key = rel + label_suffix, _make_bookmark_key(rel)
+        display_name, bookmark_key = rel, _make_bookmark_key(rel)
         try: content = fpath.read_text(encoding="utf-8", errors="replace")
         except: return
         self._check_space(25*mm)
@@ -224,10 +230,8 @@ class ModernAnnexPDF:
             else:
                 lexer = get_lexer_for_filename(str(fpath), stripnl=False)
         except ClassNotFound:
-            if not self.is_simulation:
-                print(f"ℹ️  Highlighting fallback: No lexer for '{fpath.name}'. Using plain text.")
+            if not self.is_simulation: print(f"ℹ️  Highlighting fallback: No lexer for '{fpath.name}'. Using plain text.")
             lexer = TextLexer(stripnl=False)
-
         self._render_tokens_to_lines(lexer.get_tokens(content or " "), display_name, bookmark_parts, total_parts)
         self.y -= 4*mm
 
@@ -289,20 +293,18 @@ class ModernAnnexPDF:
         if line_num is not None:
             num_str = str(line_num)
             num_char_w = pdfmetrics.stringWidth("0", self.mono_font, self.config.code_font_size)
-            # Increase box size from 0.8 to 0.9 for better legibility
             box_hw = self.config.code_font_size * 0.9
             start_x = self.config.margin_left + GUTTER_W - 2.5*mm - len(num_str) * num_char_w
             for char in num_str:
-                # Improved vertical centering
                 self.c.drawImage(get_digit_sprites()[char], start_x + (num_char_w - box_hw) / 2.0, (self.y - self.config.code_font_size - 1.5) - box_hw * 0.1, width=box_hw, height=box_hw, mask="auto")
                 start_x += num_char_w
         code_x = self.config.get_code_x() + 2*mm
         for chunk, color in v_line:
             code_x = draw_text_with_fallback(self.c, code_x, self.y - self.config.code_font_size - 1, chunk, self.mono_font, self.config.code_font_size, self.emoji_font, color, emoji_description=self.config.emoji_description)
 
-    def render_image_file(self, fpath: Path, label_suffix=""):
+    def render_image_file(self, fpath: Path):
         rel = fpath.relative_to(self.project_root).as_posix()
-        self._check_space(40*mm); self._register_bookmark(rel + label_suffix, _make_bookmark_key(rel)); self._draw_file_header(rel + label_suffix)
+        self._check_space(40*mm); self._register_bookmark(rel, _make_bookmark_key(rel)); self._draw_file_header(rel)
         self._draw_image(fpath)
 
     def _draw_image(self, fpath):
@@ -322,7 +324,7 @@ class ModernAnnexPDF:
             draw_y, block_bottom, block_w = self.y - draw_h - padding, self.y - draw_h - 2*padding, self.config.page_width - self.config.margin_left - self.config.margin_right
             if not self.is_simulation:
                 self.c.setFillColor(colors.HexColor("#ffffff")); self.c.rect(self.config.margin_left, block_bottom, block_w, self.y - block_bottom, fill=1, stroke=0)
-                self.c.setStrokeColor(colors.HexColor("#e6e9ef")); self.c.setLineWidth(0.5); self.c.rect(self.config.margin_left, block_bottom, block_w, self.y - block_bottom, fill=0, stroke=1)
+                self.c.setStrokeColor(colors.HexColor("#e6e9ef")); self.c.setLineWidth(1.0); self.c.rect(self.config.margin_left, block_bottom, block_w, self.y - block_bottom, fill=0, stroke=1)
                 draw_x = self.config.margin_left + (block_w - draw_w) / 2
                 if img is None and png_data: img = PilImage.open(io.BytesIO(png_data))
                 if img: self.c.drawImage(ImageReader(img), draw_x, draw_y, draw_w, draw_h, preserveAspectRatio=True, mask="auto")
@@ -337,7 +339,6 @@ class ModernAnnexPDF:
         self.draw_cover(); self.draw_summary_page(files)
         for i, (fpath, ftype) in enumerate(files):
             if not self.is_simulation: print(f"\r\033[K[{i+1}/{len(files)}] Processing: {fpath.name}", end="")
-            suffix = " (Code)" if ftype == "text" and fpath.suffix.lower() == ".svg" else ""
-            if ftype == "text": self.render_text_file(fpath, label_suffix=suffix)
-            elif ftype == "image": self.render_image_file(fpath, label_suffix=suffix)
+            if ftype == "text": self.render_text_file(fpath)
+            elif ftype == "image": self.render_image_file(fpath)
         if not self.is_simulation: print(); self.c.save()

{codeannex-0.3.1 → codeannex-0.3.3}/codeannex.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeannex
-Version: 0.3.1
+Version: 0.3.3
 Summary: Generates a professional PDF source code annex with Smart Index, Images and Emoji support.
 License: MIT
 Project-URL: Repository, https://github.com/tanhleno/codeannex

{codeannex-0.3.1 → codeannex-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codeannex"
-version = "0.3.1"
+version = "0.3.3"
 description = "Generates a professional PDF source code annex with Smart Index, Images and Emoji support."
 readme = "README.md"
 license = { text = "MIT" }