Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

data migration from localStorage to browser.storage (chrome.storage) #363

Merged
merged 10 commits into from
Jun 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"smarttabs": true,
"globals" : {
"chrome": true,
"jQuery": true
"jQuery": true,
"browser": true
}
}
9 changes: 7 additions & 2 deletions app/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@
"16": "images/icon2-16.png",
"128": "images/icon2-128.png"
},
"permissions": [],
"permissions": [
"storage",
"activeTab",
"https://github.com/*/*/pull/*"
],
"default_locale": "en",
"background": {
"scripts": [
"scripts/background.js"
]
],
"persistent": true
},
"options_page": "options.html",
"content_scripts": [
Expand Down
47 changes: 42 additions & 5 deletions app/scripts/background.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,48 @@
'use strict';

chrome.runtime.onInstalled.addListener(function (details) {
console.log('previousVersion', details.previousVersion);
// Define browser for cross-browser compatibility
var browser = (typeof browser !== 'undefined') ? browser : chrome;

function migrateLocalStorageToBrowserStorage() {
// Check if localStorage is not null and contains any keys
if (!localStorage || Object.keys(localStorage).length === 0) {
console.log('No localStorage data to migrate.');
return;
}

// Get all localStorage keys
const localStorageKeys = Object.keys(localStorage);
const dataToMigrate = {};

localStorageKeys.forEach((key) => {
dataToMigrate[key] = localStorage.getItem(key);
});

// Store data in broswer.storage
browser.storage.local.set(dataToMigrate, () => {
console.log('Data migrated to browser.storage', dataToMigrate);

// Clear localStorage after migration
localStorage.clear();
});
}

browser.runtime.onInstalled.addListener(function (details) {
if (details.reason === 'install') {
// Handle installation logic
console.log('Extension installed');
} else if (details.reason === 'update') {
console.log('previousVersion', details.previousVersion);
// Handle update logic
migrateLocalStorageToBrowserStorage();
}
});

chrome.runtime.onMessage.addListener(function(request, sender, sendResponse){
if (request.subject === 'localStorage') {
sendResponse({localStorage: localStorage});
browser.runtime.onMessage.addListener(function (request, sender, sendResponse) {
if (request.subject === 'getStorage') {
browser.storage.local.get(null, function (items) {
sendResponse({ storageData: items });
});
return true; // Keep the message channel open for sendResponse
}
});
14 changes: 9 additions & 5 deletions app/scripts/contentscript.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,20 @@
'use strict';

function changeMergeButtonState() {
// Define browser for cross-browser compatibility
var browser = (typeof browser !== 'undefined') ? browser : chrome;

let container = document.querySelector('#js-repo-pjax-container');
let issueTitle = container.querySelector('.js-issue-title')?.textContent;
let buttonMerges = container.querySelectorAll('.merge-message button[data-details-container]');
let buttonMergeOptions = container.querySelectorAll('.merge-message button[data-details-container] + .select-menu-button');
let disabled = false;
let buttonHtml = '';

chrome.runtime.sendMessage({from: 'content', subject: 'localStorage'}, function(response){
browser.runtime.sendMessage({ from: 'content', subject: 'getStorage' }, function (response) {
if (!response) { return; }

let localStorage = response.localStorage;
let storageData = response.storageData;
const wipTitleRegex = /[\[(^](do\s*n[o']?t\s*merge|wip|dnm)[\]):]/i;
const wipTagRegex = /(wip|do\s*not\s*merge|dnm)/i;

Expand All @@ -32,8 +35,8 @@

let buttonMessage = '';

if (localStorage && localStorage.buttonMessage) {
buttonMessage = localStorage.buttonMessage;
if (storageData && storageData.buttonMessage) {
buttonMessage = storageData.buttonMessage;
} else {
buttonMessage = 'WIP! You can\'t merge!';
}
Expand All @@ -56,9 +59,10 @@
buttonMergeOptions = null;
buttonHtml = null;
buttonMessage = null;
localStorage = null;
storageData = null;
isSquashCommits = null;
isWipTag = null;
browser = null;

setTimeout(changeMergeButtonState, 1000);
});
Expand Down
14 changes: 10 additions & 4 deletions app/scripts/options.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
(() => {
'use strict';

// Define browser for cross-browser compatibility
var browser = (typeof browser !== 'undefined') ? browser : chrome;

window.addEventListener('DOMContentLoaded', () => {
document.getElementById('buttonMessage').value = localStorage.buttonMessage;
browser.storage.local.get('buttonMessage', function (result) {
document.getElementById('buttonMessage').value = result.buttonMessage || '';
});

document.getElementById('save_btn').closest('form').addEventListener('submit', e => {
e.preventDefault();
localStorage.buttonMessage = e.target.buttonMessage.value;

window.alert('The options have been saved!');
const buttonMessage = e.target.buttonMessage.value;
browser.storage.local.set({ buttonMessage: buttonMessage }, function () {
window.alert('The options have been saved!');
});
});
});
})();
Loading