Skip to content

Migrate to packages.sublimetext.com #1748

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.

Sign up for GitHub

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

Open
deathaxe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate to packages.sublimetext.com #1748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions Package Control.sublime-settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,7 @@
// The repositories from these channels are placed in order after the
// repositories from the "repositories" setting
"channels": [
// channel_v4 for python 3.8 compatible libraries to enable plugins
// to migrate to python 3.8 until packagecontrol.io supports new scheme.
// Note: Must always be located before default channel in the list!
// Repo: https://github.com/packagecontrol/channel
"https://packagecontrol.github.io/channel/channel_v4.json",
// default channel for packages
// Repo: https://github.com/wbond/package_control_channel
"https://packagecontrol.io/channel_v3.json"
"https://packages.sublimetext.com/channel_v4.json"
],

// A list of URLs that contain a packages JSON file or point to a
Expand Down
2 changes: 1 addition & 1 deletion package_control/commands/discover_packages_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ class DiscoverPackagesCommand(sublime_plugin.ApplicationCommand):
"""

def run(self):
sublime.run_command('open_url', {'url': 'https://packagecontrol.io/#discover'})
sublime.run_command('open_url', {'url': 'https://packages.sublimetext.com'})
5 changes: 0 additions & 5 deletions package_control/download_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,6 @@ def update_url(url, debug):
url = url.replace('://nodeload.github.com/', '://codeload.github.com/')
url = re.sub(r'^(https://codeload\.github\.com/[^/#?]+/[^/#?]+/)zipball(/.*)$', '\\1zip\\2', url)

# Fix URLs from old versions of Package Control since we are going to
# remove all packages but Package Control from them to force upgrades
if url == 'https://sublime.wbond.net/repositories.json' or url == 'https://sublime.wbond.net/channel.json':
url = 'https://packagecontrol.io/channel_v3.json'

if debug and url != original_url:
console_write(
'''
Expand Down
15 changes: 8 additions & 7 deletions package_control/package_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@
from .upgraders.git_upgrader import GitUpgrader
from .upgraders.hg_upgrader import HgUpgrader

DEFAULT_CHANNEL = 'https://packages.sublimetext.com/channel_v4.json'
DEFAULT_CHANNEL_ST3 = 'https://packages.sublimetext.com/channel_v3.json'

DEFAULT_CHANNEL = 'https://packagecontrol.io/channel_v3.json'
OLD_DEFAULT_CHANNELS = set([
'https://packagecontrol.io/channel_v3.json',
'https://packagecontrol.io/channel.json',
'https://sublime.wbond.net/channel.json',
'https://sublime.wbond.net/repositories.json'
Expand Down Expand Up @@ -470,6 +472,7 @@ def list_repositories(self):
A list of all available repositories
"""

is_st3 = int(sublime.version()) < 4000
cache_ttl = self.settings.get('cache_length', 300)
channels = self.settings.get('channels', [])
# create copy to prevent backlash to settings object due to being extended
Expand All @@ -479,17 +482,15 @@ def list_repositories(self):
found_default = False
for channel in channels:
channel = channel.strip()

if re.match(r'https?://([^.]+\.)*package-control\.io', channel):
console_write('Removed malicious channel %s' % channel)
continue

if channel in OLD_DEFAULT_CHANNELS:
if channel.lower() in OLD_DEFAULT_CHANNELS:
if found_default:
continue
found_default = True
channel = DEFAULT_CHANNEL

if is_st3 and channel.lower() == DEFAULT_CHANNEL:
channel = DEFAULT_CHANNEL_ST3

# Caches various info from channels for performance
cache_key = channel + '.repositories'
if channel[:8].lower() == "file:///":
Expand Down