Merge pull request #23 from twentyTwo/develop

v0.3.4

Author: twentyTwo

.github/workflows/publish.yml

@@ -9,9 +9,59 @@ on:
   workflow_dispatch:  # Allow manual trigger
 
 jobs:
+  verify-changes:
+    runs-on: ubuntu-latest
+    outputs:
+      should_publish: ${{ steps.check-changes.outputs.should_publish }}
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Fetch all history for all tags and branches
+          
+      - name: Get changed files
+        id: changed-files
+        run: |
+          echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | tr '\n' ' ')" >> $GITHUB_OUTPUT
+          
+      - name: Check version change and file types
+        id: check-changes
+        run: |
+          # Check if package.json version changed
+          VERSION_CHANGED=$(git diff ${{ github.event.before }} ${{ github.event.after }} package.json | grep '+\s*"version"')
+          
+          # Get list of changed files
+          CHANGED_FILES="${{ steps.changed-files.outputs.files }}"
+          
+          # Check if only documentation files were changed
+          DOCS_ONLY=true
+          for file in $CHANGED_FILES; do
+            if [[ ! $file =~ \.(md|txt|doc|docx)$ ]] && [[ ! $file =~ ^docs/ ]]; then
+              DOCS_ONLY=false
+              break
+            fi
+          done
+          
+          # Initialize should_publish as false
+          echo "should_publish=false" >> $GITHUB_OUTPUT
+          
+          if [[ "$DOCS_ONLY" == "true" ]]; then
+            echo "ℹ️ Only documentation files were changed"
+            echo "should_publish=false" >> $GITHUB_OUTPUT
+          elif [[ -z "$VERSION_CHANGED" ]]; then
+            echo "❌ Version in package.json was not updated"
+            echo "should_publish=false" >> $GITHUB_OUTPUT
+          else
+            echo "✅ Version changed and non-documentation files modified"
+            echo "should_publish=true" >> $GITHUB_OUTPUT
+          fi
+
   publish:
+    needs: verify-changes
+    if: needs.verify-changes.outputs.should_publish == 'true'
     runs-on: ubuntu-latest
-    environment: VSC EXT  # Specify the environment where the secret is stored
+    environment: VSC EXT
 
     steps:
       - name: Checkout code
@@ -52,4 +102,4 @@ jobs:
           retention-days: 400  # Maximum retention period allowed by GitHub
 
       - name: Publish to Visual Studio Marketplace
-        run: vsce publish -p "${{ secrets.VSC_PAT }}" 
+        run: vsce publish -p "${{ secrets.VSC_PAT }}"

README.md

@@ -122,6 +122,12 @@ For technical details about development, release process, and internal architect
 
 ## Changelog
 
+### [0.3.4] - 2025-04-19
+ - Handle multi-root workspaces, external files, and virtual files more effectively. 
+ - Added a verify-changes job to check if a version update is required and ensure non-documentation files are modified before publishing. This prevents unnecessary releases.
+ - Introduced a new workflow to automate the creation of beta and production releases, including attaching .vsix files and setting appropriate release metadata.
+ - Added a new technical documentation file outlining the development setup, release process, internal architecture, and testing guidelines for the extension.
+
 ### [0.3.0] - 2025-04-14
 - Added smart activity detection with configurable inactivity timeout
 - Enhanced chart interactivity and responsiveness

package.json

@@ -2,7 +2,7 @@
   "name": "simple-coding-time-tracker",
   "displayName": "Simple Coding Time Tracker",
   "description": "Track and visualize your coding time across projects",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "publisher": "noorashuvo",
   "license": "MIT",
   "icon": "icon-sctt.png",

src/database.ts

@@ -17,6 +17,12 @@ export class Database {
 
     constructor(context: vscode.ExtensionContext) {
         this.context = context;
+        // Log the storage URI path
+        const storagePath = this.context.storageUri?.fsPath;
+        if (storagePath) {
+            console.log('Extension Data Storage Path:', storagePath);
+            //vscode.window.showInformationMessage(`Data is stored at: ${storagePath}`);
+        }
     }
 
     async addEntry(date: Date, project: string, timeSpent: number) {

src/summaryView.ts

@@ -537,7 +537,7 @@ export class SummaryViewProvider implements vscode.WebviewViewProvider {
                             }
                         }
                     };
-
+                    
                     window.addEventListener('message', event => {
                         const message = event.data;
                         if (message.command === 'update') {
@@ -781,7 +781,7 @@ export class SummaryViewProvider implements vscode.WebviewViewProvider {
                             content.innerHTML = '<p>No results found.</p>';
                             return;
                         }
-                    
+
                         // Calculate data for all charts
                         let totalTime = 0;
                         const projectData = {};

src/timeTracker.ts

@@ -149,7 +149,51 @@ export class TimeTracker implements vscode.Disposable {
 
     private getCurrentProject(): string {
         const workspaceFolders = vscode.workspace.workspaceFolders;
-        return workspaceFolders ? workspaceFolders[0].name : 'Unknown Project';
+        if (!workspaceFolders) {
+            return 'Unknown Project';
+        }
+
+        // Get the active text editor
+        const activeEditor = vscode.window.activeTextEditor;
+        if (!activeEditor) {
+            return 'No Active File';
+        }
+
+        // Get workspace information
+        const workspaceName = vscode.workspace.name || 'Default Workspace';
+        const workspaceFolder = vscode.workspace.getWorkspaceFolder(activeEditor.document.uri);
+
+        if (!workspaceFolder) {
+            // File is outside any workspace folder
+            return `External/${this.getExternalProjectName(activeEditor.document.uri)}`;
+        }
+
+        // If we're in a multi-root workspace, prefix with workspace name
+        if (workspaceFolders.length > 1) {
+            return `${workspaceName}/${workspaceFolder.name}`;
+        }
+
+        return workspaceFolder.name;
+    }
+
+    private getExternalProjectName(uri: vscode.Uri): string {
+        // Handle different scenarios for external files
+        if (uri.scheme !== 'file') {
+            return 'Virtual Files';
+        }
+
+        // Get the parent folder name for external files
+        const path = uri.fsPath;
+        const parentFolder = path.split(/[\\/]/);
+        
+        // Remove empty segments and file name
+        const folders = parentFolder.filter(Boolean);
+        if (folders.length >= 2) {
+            // Return "ParentFolder/CurrentFolder"
+            return `${folders[folders.length - 2]}/${folders[folders.length - 1]}`;
+        }
+        
+        return 'Other';
     }
 
     getTodayTotal(): number {